From 03eeec9d23d39dbebb4c2d985b9d9947aee396d2 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:09:59 +0200 Subject: [PATCH] Re-enable remapping for certain mixins --- .../angelica/mixins/early/renderer/MixinEntityRenderer.java | 1 - .../angelica/mixins/early/renderer/MixinSimpleTexture.java | 3 +-- .../angelica/mixins/early/renderer/MixinTextureClock.java | 3 +-- .../angelica/mixins/early/renderer/MixinTextureCompass.java | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinEntityRenderer.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinEntityRenderer.java index 7eef9c69c..af1489778 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinEntityRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinEntityRenderer.java @@ -37,7 +37,6 @@ public abstract class MixinEntityRenderer { shift = At.Shift.BEFORE, target = "Lnet/minecraft/client/settings/GameSettings;thirdPersonView:I", ordinal = 1), - cancellable = true) public void angelica$checkCompositeRendered(float p_78476_1_, int p_78476_2_, CallbackInfo ci) { if (!Shaders.isCompositeRendered) { diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinSimpleTexture.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinSimpleTexture.java index 2006cb988..889f12aa2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinSimpleTexture.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinSimpleTexture.java @@ -32,8 +32,7 @@ public class MixinSimpleTexture extends AbstractTexture { method = "loadTexture(Lnet/minecraft/client/resources/IResourceManager;)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureImageAllocate(ILjava/awt/image/BufferedImage;ZZ)I", - remap = false)) + target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureImageAllocate(ILjava/awt/image/BufferedImage;ZZ)I")) private int angelica$loadTexture(int textureID, BufferedImage bufferedImage, boolean flag, boolean flag1) { ShadersTex.loadSimpleTexture( textureID, diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java index 52ae168d2..fcda7bd0d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureClock.java @@ -15,8 +15,7 @@ public class MixinTextureClock { method = "updateAnimation()V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureMipmap([[IIIIIZZ)V", - remap = false)) + target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureMipmap([[IIIIIZZ)V")) private void angelica$updateAnimation(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp) { ShadersTex.uploadTexSub(data, width, height, xoffset, yoffset, linear, clamp); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java index 390d9c1bc..174bdf775 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/renderer/MixinTextureCompass.java @@ -15,8 +15,7 @@ public class MixinTextureCompass { method = "updateCompass(Lnet/minecraft/world/World;DDDZZ)V", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureMipmap([[IIIIIZZ)V", - remap = false)) + target = "Lnet/minecraft/client/renderer/texture/TextureUtil;uploadTextureMipmap([[IIIIIZZ)V")) private void angelica$updateCompass(int[][] data, int width, int height, int xoffset, int yoffset, boolean linear, boolean clamp) { ShadersTex.uploadTexSub(data, width, height, xoffset, yoffset, linear, clamp);