Prevent animated texture mixin from early-cancelling method call to a…

…llow for other mixins to run if needed
fnc-test · Sep 20, 2023 · 70c1e08 · 70c1e08
1 parent 44380d6
commit 70c1e08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Fabric/src/main/java/software/bernie/geckolib/mixins/fabric/TextureManagerMixin.java b/Fabric/src/main/java/software/bernie/geckolib/mixins/fabric/TextureManagerMixin.java
@@ -19,7 +19,7 @@ public abstract class TextureManagerMixin {
 
 	@Shadow public abstract void register(ResourceLocation resourceLocation, AbstractTexture abstractTexture);
 
-	@Inject(method = "getTexture(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/texture/AbstractTexture;", at = @At("HEAD"), cancellable = true)
+	@Inject(method = "getTexture(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/texture/AbstractTexture;", at = @At("HEAD"))
 	private void wrapAnimatableTexture(ResourceLocation path, CallbackInfoReturnable<AbstractTexture> callback) {
 		AbstractTexture existing = this.byPath.get(path);
 
@@ -28,7 +28,5 @@ private void wrapAnimatableTexture(ResourceLocation path, CallbackInfoReturnable
 
 			register(path, existing);
 		}
-
-		callback.setReturnValue(existing);
 	}
 }
diff --git a/Forge/src/main/java/software/bernie/geckolib/mixin/client/TextureManagerMixin.java b/Forge/src/main/java/software/bernie/geckolib/mixin/client/TextureManagerMixin.java
@@ -19,7 +19,7 @@ public abstract class TextureManagerMixin {
 
 	@Shadow public abstract void register(ResourceLocation resourceLocation, AbstractTexture abstractTexture);
 
-	@Inject(method = "getTexture(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/texture/AbstractTexture;", at = @At("HEAD"), cancellable = true)
+	@Inject(method = "getTexture(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/texture/AbstractTexture;", at = @At("HEAD"))
 	private void wrapAnimatableTexture(ResourceLocation path, CallbackInfoReturnable<AbstractTexture> callback) {
 		AbstractTexture existing = this.byPath.get(path);
 
@@ -28,7 +28,5 @@ private void wrapAnimatableTexture(ResourceLocation path, CallbackInfoReturnable
 
 			register(path, existing);
 		}
-
-		callback.setReturnValue(existing);
 	}
 }