From 0e4421f2ceeb29241bbdddf8fed812bb5ac71076 Mon Sep 17 00:00:00 2001 From: kurrycat <44340227+kurrycat2004@users.noreply.github.com> Date: Fri, 8 Nov 2024 00:51:18 +0100 Subject: [PATCH] fix wrong mixin remap values (#726) --- .../angelica/bugfixes/MixinRenderGlobal_DestroyBlock.java | 3 +-- .../angelica/mixins/early/shaders/MixinEntityRenderer.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderGlobal_DestroyBlock.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderGlobal_DestroyBlock.java index 98654dd18..d14e5c50f 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderGlobal_DestroyBlock.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderGlobal_DestroyBlock.java @@ -18,8 +18,7 @@ public class MixinRenderGlobal_DestroyBlock { @Inject( method = "drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;startDrawingQuads()V"), - remap = false + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;startDrawingQuads()V") ) private void iris$beginDrawBlockDamageTexture(Tessellator tessellator, EntityLivingBase entity, float partialTicks, CallbackInfo ci, @Share("lastMin") LocalIntRef lastMin, @Share("lastMag") LocalIntRef lastMag) { TextureInfo info = TextureInfoCache.INSTANCE.getInfo(GLStateManager.getBoundTexture()); diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java index 5499eaa6a..eaecb4b18 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinEntityRenderer.java @@ -46,7 +46,7 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe pipeline.get().beginLevelRendering(); } - @Inject(method = "renderWorld(FJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;dispatchRenderLast(Lnet/minecraft/client/renderer/RenderGlobal;F)V")) + @Inject(method = "renderWorld(FJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;dispatchRenderLast(Lnet/minecraft/client/renderer/RenderGlobal;F)V", remap = false)) private void iris$endLevelRender(float partialTicks, long limitTime, CallbackInfo callback, @Share("pipeline") LocalRef pipeline) { // TODO: Iris final Camera camera = new Camera(mc.renderViewEntity, partialTicks); @@ -109,7 +109,7 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe pipeline.get().setPhase(WorldRenderingPhase.NONE); } - @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V")) + @WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V", remap = false)) private void iris$blockDamageTexture(RenderGlobal instance, Tessellator tessellator, EntityLivingBase entity, float partialTicks, Operation original, @Share("pipeline") LocalRef pipeline) { pipeline.get().setPhase(WorldRenderingPhase.DESTROY); original.call(instance, tessellator, entity, partialTicks);