Update to 1.21.5

FoundationGames · FoundationGames · commit 4292aa25a1bb · 2025-06-21T17:11:08.000-07:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.14
 loom_version=1.10-SNAPSHOT
 
 # Fabric API
-fabric_version=0.119.3+1.21.4
+fabric_version=0.127.1+1.21.5
 
-mod_version = 0.6.1+1.21.4
+mod_version = 0.6.1+1.21.5
 maven_group = io.github.foundationgames
 archives_base_name = animatica
 	
diff --git a/src/main/java/io/github/foundationgames/animatica/Animatica.java b/src/main/java/io/github/foundationgames/animatica/Animatica.java
@@ -3,7 +3,6 @@
 import io.github.foundationgames.animatica.animation.AnimationLoader;
 import io.github.foundationgames.animatica.config.AnimaticaConfig;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
@@ -18,8 +17,6 @@ public class Animatica implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        ClientTickEvents.START_CLIENT_TICK.register(client -> AnimationLoader.INSTANCE.tickTextures());
-
         ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(AnimationLoader.INSTANCE);
     }
 
diff --git a/src/main/java/io/github/foundationgames/animatica/animation/AnimatedTexture.java b/src/main/java/io/github/foundationgames/animatica/animation/AnimatedTexture.java
@@ -6,6 +6,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.texture.TextureTickListener;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -19,8 +20,9 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Supplier;
 
-public class AnimatedTexture extends NativeImageBackedTexture {
+public class AnimatedTexture extends NativeImageBackedTexture implements TextureTickListener {
     public static final ExecutorService EXECUTORS = Executors.newFixedThreadPool(4);
 
     public final Animation[] anims;
@@ -31,22 +33,20 @@ public class AnimatedTexture extends NativeImageBackedTexture {
 
     public static Optional<AnimatedTexture> tryCreate(ResourceManager resources, Identifier targetTexId, List<AnimationMeta> anims) {
         try (var targetTexResource = resources.getResourceOrThrow(targetTexId).getInputStream()) {
-            return Optional.of(new AnimatedTexture(resources, anims, NativeImage.read(targetTexResource)));
+            return Optional.of(new AnimatedTexture(targetTexId::toString, resources, anims, NativeImage.read(targetTexResource)));
         } catch (IOException e) { Animatica.LOG.error(e); }
 
         return Optional.empty();
     }
 
-    public AnimatedTexture(ResourceManager resources, List<AnimationMeta> metas, NativeImage image) throws IOException {
-        super(new NativeImage(image.getFormat(), image.getWidth(), image.getHeight(), true));
+    public AnimatedTexture(Supplier<String> name, ResourceManager resources, List<AnimationMeta> metas, NativeImage image) throws IOException {
+        super(name, image.getWidth(), image.getHeight(), true);
 
         this.anims = new Animation[metas.size()];
         for (int i = 0; i < metas.size(); i++) {
             this.anims[i] = new Animation(metas.get(i), resources);
         }
         this.original = image;
-        this.setClamp(false);
-        this.setFilter(false, false);
 
         updateAndDraw(this.getImage(), true, MinecraftClient.getInstance());
         this.upload();
@@ -91,7 +91,7 @@ public void updateAndDraw(NativeImage image, boolean force, Executor exec) {
         if (changed || force) {
             // Skip if still waiting for a frame to finish
             if (this.getFrameWaitingOn() == null) {
-                this.frameWaitingOn = CompletableFuture.supplyAsync(() -> {
+                this.frameWaitingOn = CompletableFuture.runAsync(() -> {
                     image.copyFrom(this.original);
 
                     Phase phase;
@@ -103,8 +103,6 @@ public void updateAndDraw(NativeImage image, boolean force, Executor exec) {
                             TextureUtil.copy(anim.sourceTexture, 0, phase.v, anim.width, anim.height, image, anim.targetX, anim.targetY);
                         }
                     }
-
-                    return null;
                 }, exec).thenAccept(v -> MinecraftClient.getInstance().execute(this::upload));
             }
         }
@@ -115,6 +113,7 @@ public void updateAndDraw(NativeImage image, boolean force, Executor exec) {
         frame++;
     }
 
+    @Override
     public void tick() {
         this.updateAndDraw(this.getImage(), false, EXECUTORS);
     }
diff --git a/src/main/java/io/github/foundationgames/animatica/animation/AnimationLoader.java b/src/main/java/io/github/foundationgames/animatica/animation/AnimationLoader.java
@@ -1,24 +1,21 @@
 package io.github.foundationgames.animatica.animation;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.foundationgames.animatica.Animatica;
 import io.github.foundationgames.animatica.util.Flags;
 import io.github.foundationgames.animatica.util.exception.PropertyParseException;
-import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 import java.util.function.BiConsumer;
 
 public final class AnimationLoader implements SimpleSynchronousResourceReloadListener {
@@ -31,8 +28,7 @@ public final class AnimationLoader implements SimpleSynchronousResourceReloadLis
 
     public static final AnimationLoader INSTANCE = new AnimationLoader();
 
-    private final Int2IntMap animationIds = new Int2IntOpenHashMap();
-    private final Set<AnimatedTexture> animatedTextures = new HashSet<>();
+    private final Map<Identifier, Identifier> animationIds = new HashMap<>();
 
     private AnimationLoader() {
     }
@@ -43,22 +39,8 @@ private static void findAllMCPAnimations(ResourceManager manager, BiConsumer<Ide
         }
     }
 
-    public boolean isAnimated(int glId) {
-        return animationIds.containsKey(glId);
-    }
-
-    public int getAnimationId(int glId) {
-        return animationIds.get(glId);
-    }
-
-    public void tickTextures() {
-        if (!RenderSystem.isOnRenderThread()) {
-            RenderSystem.recordRenderCall(this::tickTextures);
-        } else {
-            for (var texture : animatedTextures) {
-                texture.tick();
-            }
-        }
+    public @Nullable Identifier getAnimationId(Identifier id) {
+        return animationIds.get(id);
     }
 
     @Override
@@ -68,7 +50,6 @@ public Identifier getFabricId() {
 
     @Override
     public void reload(ResourceManager manager) {
-        this.animatedTextures.clear();
         this.animationIds.clear();
 
         if (!Animatica.CONFIG.animatedTextures) {
@@ -99,16 +80,9 @@ public void reload(ResourceManager manager) {
         for (var targetId : animations.keySet()) {
             AnimatedTexture.tryCreate(manager, targetId, animations.get(targetId))
                     .ifPresent(tex -> {
-                        var textures = MinecraftClient.getInstance().getTextureManager();
-                        var tgt = textures.getTexture(targetId);
-
-                        if (tgt != null) {
-                            textures.registerTexture(
-                                    Identifier.of(targetId.getNamespace(), targetId.getPath() + "-anim"), tex);
-
-                            this.animatedTextures.add(tex);
-                            this.animationIds.put(tgt.getGlId(), tex.getGlId());
-                        }
+                        var animId = Identifier.of(targetId.getNamespace(), targetId.getPath() + "-anim");
+                        this.animationIds.put(targetId, animId);
+                        MinecraftClient.getInstance().getTextureManager().registerTexture(animId, tex);
                     });
         }
 
diff --git a/src/main/java/io/github/foundationgames/animatica/mixin/IdentifierMixin.java b/src/main/java/io/github/foundationgames/animatica/mixin/IdentifierMixin.java
@@ -6,7 +6,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 // Allows invalid characters in paths to support packs with extremely outdated formatting (because OptiFine does too)
diff --git a/src/main/java/io/github/foundationgames/animatica/mixin/RenderSystemMixin.java b/src/main/java/io/github/foundationgames/animatica/mixin/RenderSystemMixin.java
diff --git a/src/main/java/io/github/foundationgames/animatica/mixin/TextureManagerMixin.java b/src/main/java/io/github/foundationgames/animatica/mixin/TextureManagerMixin.java
@@ -0,0 +1,23 @@
+package io.github.foundationgames.animatica.mixin;
+
+import io.github.foundationgames.animatica.Animatica;
+import io.github.foundationgames.animatica.animation.AnimationLoader;
+import net.minecraft.client.texture.TextureManager;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+@Mixin(TextureManager.class)
+public class TextureManagerMixin {
+    @ModifyVariable(method = "getTexture", at = @At("HEAD"), index = 1, argsOnly = true)
+    private Identifier animatica$replaceWithAnimatedTexture(Identifier old) {
+        if (Animatica.CONFIG.animatedTextures) {
+            var anim = AnimationLoader.INSTANCE.getAnimationId(old);
+            if (anim != null) {
+                return anim;
+            }
+        }
+        return old;
+    }
+}
diff --git a/src/main/resources/animatica.mixins.json b/src/main/resources/animatica.mixins.json
@@ -6,7 +6,7 @@
   "client": [
     "IdentifierMixin",
     "NativeImageAccessor",
-    "RenderSystemMixin",
+    "TextureManagerMixin",
     "VideoOptionsScreenMixin"
   ],
   "injectors": {
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -28,7 +28,7 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": "*",
-    "minecraft": ">=1.21.4",
+    "minecraft": ">=1.21.5",
     "java": ">=21"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`"depends": {`
`29`	`29`	`"fabricloader": ">=0.11.3",`
`30`	`30`	`"fabric": "*",`
`31`		`- "minecraft": ">=1.21.4",`
	`31`	`+ "minecraft": ">=1.21.5",`
`32`	`32`	`"java": ">=21"`
`33`	`33`	`}`
`34`	`34`	`}`