port 90% done for 1.21.11

Author: isXander

build.gradle.kts

@@ -141,6 +141,17 @@ stonecutter {
     dependencies {
         put("fapi", (findProperty("deps.fabricApi")?.toString() ?: "0.0.0"))
     }
+
+    replacements {
+        string {
+            direction = eval(current.version, ">=1.21.11")
+            replace("ResourceLocation", "Identifier")
+        }
+        string {
+            direction = eval(current.version, ">=1.21.11")
+            replace("import net.minecraft.Util;", "import net.minecraft.util.Util;")
+        }
+    }
 }
 
 dependencies {

gradle.properties

@@ -8,7 +8,7 @@ curseforgeSlug=yacl
 curseforgeId=667299
 githubProject=isXander/YetAnotherConfigLib
 
-deps.fabricLoader=0.17.0
+deps.fabricLoader=0.17.3
 deps.imageio=3.12.0
 deps.quiltParsers=0.2.1
 deps.fabricLangKotlin=1.12.3+kotlin.2.0.21

settings.gradle.kts

@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-    id("dev.kikugie.stonecutter") version "0.7.6"
+    id("dev.kikugie.stonecutter") version "0.7.11"
 }
 
 stonecutter {
@@ -19,11 +19,12 @@ stonecutter {
     create(rootProject) {
         fun mc(mcVersion: String, name: String = mcVersion, loaders: Iterable<String>) {
             for (loader in loaders) {
-                vers("$name-$loader", mcVersion)
+                version("$name-$loader", mcVersion)
             }
         }
 
-        mc("1.21.9", loaders = listOf("fabric", "neoforge"))
+        mc("1.21.11", loaders = listOf("fabric"))
+        mc("1.21.10", loaders = listOf("fabric", "neoforge"))
         mc("1.21.6", loaders = listOf("fabric", "neoforge"))
         mc("1.21.5", loaders = listOf("fabric", "neoforge"))
         mc("1.21.4", loaders = listOf("fabric", "neoforge"))

src/main/java/dev/isxander/yacl3/api/OptionDescription.java

@@ -4,7 +4,7 @@
 import dev.isxander.yacl3.impl.OptionDescriptionImpl;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import java.nio.file.Path;
 import java.util.Collection;
@@ -29,7 +29,7 @@ public interface OptionDescription {
      * Usually, the image renderers are constructed asynchronously, so this method returns a {@link CompletableFuture}.
      * <p>
      * Image renderers are cached throughout the whole lifecycle of the game, and should not be generated more than once
-     * per image. See {@link ImageRenderer#getOrMakeAsync(ResourceLocation, Supplier)} for implementation details.
+     * per image. See {@link ImageRenderer#getOrMakeAsync(Identifier, Supplier)} for implementation details.
      */
     CompletableFuture<Optional<ImageRenderer>> image();
 
@@ -76,7 +76,7 @@ interface Builder {
          * @param height the height of the texture
          * @return this builder
          */
-        Builder image(ResourceLocation image, int width, int height);
+        Builder image(Identifier image, int width, int height);
 
         /**
          * Sets a static image to display with the description. This is backed by a regular minecraft resource
@@ -91,7 +91,7 @@ interface Builder {
          * @param textureHeight the height of whole texture file
          * @return this builder
          */
-        Builder image(ResourceLocation image, float u, float v, int width, int height, int textureWidth, int textureHeight);
+        Builder image(Identifier image, float u, float v, int width, int height, int textureWidth, int textureHeight);
 
         /**
          * Sets a static image to display with the description. This is backed by a file on disk.
@@ -101,7 +101,7 @@ interface Builder {
          * @param uniqueLocation the unique identifier for the image, used for caching and resource manager registrar
          * @return this builder
          */
-        Builder image(Path path, ResourceLocation uniqueLocation);
+        Builder image(Path path, Identifier uniqueLocation);
 
         /**
          * Sets a static OR ANIMATED webP image to display with the description. This is backed by a regular minecraft resource
@@ -110,7 +110,7 @@ interface Builder {
          * @param image the location of the image to display from the resource manager
          * @return this builder
          */
-        Builder webpImage(ResourceLocation image);
+        Builder webpImage(Identifier image);
 
         /**
          * Sets a static OR ANIMATED webP image to display with the description. This is backed by a file on disk.
@@ -120,15 +120,15 @@ interface Builder {
          * @param uniqueLocation the unique identifier for the image, used for caching and resource manager registrar
          * @return this builder
          */
-        Builder webpImage(Path path, ResourceLocation uniqueLocation);
+        Builder webpImage(Path path, Identifier uniqueLocation);
 
         /**
          * Sets a custom image renderer to display with the description.
          * This is useful for rendering other abstract things relevant to your mod.
          * <p>
          * However, <strong>THIS IS NOT API SAFE!</strong> As part of the gui package, things
          * may change that could break compatibility with future versions of YACL.
-         * A helpful utility (that is also not API safe) is {@link dev.isxander.yacl3.gui.image.ImageRendererManager#registerOrGetImage(ResourceLocation, Supplier)}
+         * A helpful utility (that is also not API safe) is {@link dev.isxander.yacl3.gui.image.ImageRendererManager#registerOrGetImage(Identifier, Supplier)}
          * which will cache the image renderer for the whole game lifecycle and construct it asynchronously to the render thread.
          * @param image the image renderer to display
          * @return this builder
@@ -141,7 +141,7 @@ interface Builder {
          * <p>
          * However, <strong>THIS IS NOT API SAFE!</strong> As part of the gui package, things
          * may change that could break compatibility with future versions of YACL.
-         * A helpful utility (that is also not API safe) is {@link dev.isxander.yacl3.gui.image.ImageRendererManager#registerOrGetImage(ResourceLocation, Supplier)}
+         * A helpful utility (that is also not API safe) is {@link dev.isxander.yacl3.gui.image.ImageRendererManager#registerOrGetImage(Identifier, Supplier)}
          * which will cache the image renderer for the whole game lifecycle and construct it asynchronously to the render thread.
          * @param image the image renderer to display
          * @return this builder
@@ -158,7 +158,7 @@ default Builder customImage(ImageRenderer image) {
          * @return this builder
          */
         @Deprecated
-        Builder gifImage(ResourceLocation image);
+        Builder gifImage(Identifier image);
 
         /**
          * Sets an animated GIF image to display with the description. This is backed by a file on disk.
@@ -169,7 +169,7 @@ default Builder customImage(ImageRenderer image) {
          * @return this builder
          */
         @Deprecated
-        Builder gifImage(Path path, ResourceLocation uniqueLocation);
+        Builder gifImage(Path path, Identifier uniqueLocation);
 
         OptionDescription build();
     }

src/main/java/dev/isxander/yacl3/config/GsonConfigInstance.java

@@ -33,7 +33,7 @@
  * {@code
  * public class MyConfig {
  *     public static ConfigClassHandler<MyConfig> HANDLER = ConfigClassHandler.createBuilder(MyConfig.class)
- *             .id(new ResourceLocation("modid", "config"))
+ *             .id(new Identifier("modid", "config"))
  *             .serializer(config -> GsonConfigSerializerBuilder.create(config)
  *                     .setPath(FabricLoader.getInstance().getConfigDir().resolve("my_mod.json")
  *                     .build())

src/main/java/dev/isxander/yacl3/config/v2/api/ConfigClassHandler.java

@@ -2,7 +2,7 @@
 
 import dev.isxander.yacl3.api.YetAnotherConfigLib;
 import dev.isxander.yacl3.config.v2.impl.ConfigClassHandlerImpl;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import java.util.function.Function;
 
@@ -40,7 +40,7 @@ public interface ConfigClassHandler<T> {
     /**
      * The unique identifier of this config handler.
      */
-    ResourceLocation id();
+    Identifier id();
 
     /**
      * Auto-generates a GUI for this config class.
@@ -93,7 +93,7 @@ interface Builder<T> {
          *
          * @return this builder
          */
-        Builder<T> id(ResourceLocation id);
+        Builder<T> id(Identifier id);
 
         /**
          * The function to create the serializer for this config class.

src/main/java/dev/isxander/yacl3/config/v2/api/autogen/CustomImage.java

@@ -22,7 +22,7 @@
 @Target(ElementType.FIELD)
 public @interface CustomImage {
     /**
-     * The resource path to the image, a {@link net.minecraft.resources.ResourceLocation}
+     * The resource path to the image, a {@link net.minecraft.resources.Identifier}
      * is constructed with the namespace being the modid of the config, and the path being
      * this value.
      * <p>

src/main/java/dev/isxander/yacl3/config/v2/api/autogen/SimpleOptionFactory.java

@@ -14,7 +14,7 @@
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.annotation.Annotation;
@@ -91,7 +91,7 @@ protected OptionDescription.Builder description(T value, A annotation, ConfigFie
                 builder.customImage(imageFactory.createImage(value, field, storage).thenApply(Optional::of));
             } else if (!imageOverride.value().isEmpty()) {
                 String path = imageOverride.value();
-                ResourceLocation imageLocation = YACLPlatform.rl(field.parent().id().getNamespace(), path);
+                Identifier imageLocation = YACLPlatform.rl(field.parent().id().getNamespace(), path);
                 String extension = path.substring(path.lastIndexOf('.') + 1);
 
                 switch (extension) {
@@ -106,7 +106,7 @@ protected OptionDescription.Builder description(T value, A annotation, ConfigFie
         } else {
             String imagePath = "textures/yacl3/" + field.parent().id().getPath() + "/" + field.access().name() + ".webp";
             imagePath = imagePath.toLowerCase().replaceAll("[^a-z0-9/._:-]", "_");
-            ResourceLocation imageLocation = YACLPlatform.rl(field.parent().id().getNamespace(), imagePath);
+            Identifier imageLocation = YACLPlatform.rl(field.parent().id().getNamespace(), imagePath);
             if (Minecraft.getInstance().getResourceManager().getResource(imageLocation).isPresent()) {
                 builder.webpImage(imageLocation);
             }

src/main/java/dev/isxander/yacl3/config/v2/impl/ConfigClassHandlerImpl.java

@@ -11,7 +11,7 @@
 import dev.isxander.yacl3.impl.utils.YACLConstants;
 import dev.isxander.yacl3.platform.YACLPlatform;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.apache.commons.lang3.Validate;
 
 import java.lang.reflect.Constructor;
@@ -25,7 +25,7 @@
 
 public class ConfigClassHandlerImpl<T> implements ConfigClassHandler<T> {
     private final Class<T> configClass;
-    private final ResourceLocation id;
+    private final Identifier id;
     private final boolean supportsAutoGen;
     private final ConfigSerializer<T> serializer;
     private final ConfigFieldImpl<?>[] fields;
@@ -34,7 +34,7 @@ public class ConfigClassHandlerImpl<T> implements ConfigClassHandler<T> {
     private final T defaults;
     private final Constructor<T> noArgsConstructor;
 
-    public ConfigClassHandlerImpl(Class<T> configClass, ResourceLocation id, Function<ConfigClassHandler<T>, ConfigSerializer<T>> serializerFactory) {
+    public ConfigClassHandlerImpl(Class<T> configClass, Identifier id, Function<ConfigClassHandler<T>, ConfigSerializer<T>> serializerFactory) {
         this.configClass = configClass;
         this.id = id;
         this.supportsAutoGen = id != null && YACLPlatform.getEnvironment().isClient();
@@ -98,7 +98,7 @@ public ConfigFieldImpl<?>[] fields() {
     }
 
     @Override
-    public ResourceLocation id() {
+    public Identifier id() {
         return this.id;
     }
 
@@ -244,15 +244,15 @@ private void detectOldAnnotation(Field[] fields) {
 
     public static class BuilderImpl<T> implements Builder<T> {
         private final Class<T> configClass;
-        private ResourceLocation id;
+        private Identifier id;
         private Function<ConfigClassHandler<T>, ConfigSerializer<T>> serializerFactory;
 
         public BuilderImpl(Class<T> configClass) {
             this.configClass = configClass;
         }
 
         @Override
-        public Builder<T> id(ResourceLocation id) {
+        public Builder<T> id(Identifier id) {
             this.id = id;
             return this;
         }

src/main/java/dev/isxander/yacl3/config/v2/impl/autogen/ListGroupImpl.java

@@ -12,7 +12,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.Constructor;
@@ -57,7 +57,7 @@ private OptionDescription description(ConfigField<List<T>> field) {
 
         String imagePath = "textures/yacl3/" + field.parent().id().getPath() + "/" + field.access().name() + ".webp";
         imagePath = imagePath.toLowerCase().replaceAll("[^a-z0-9/._:-]", "_");
-        ResourceLocation imageLocation = YACLPlatform.rl(field.parent().id().getNamespace(), imagePath);
+        Identifier imageLocation = YACLPlatform.rl(field.parent().id().getNamespace(), imagePath);
         if (Minecraft.getInstance().getResourceManager().getResource(imageLocation).isPresent()) {
             builder.webpImage(imageLocation);
         }