From f43fbd4d9f6bf4bd7a2df4000c029228a5d68992 Mon Sep 17 00:00:00 2001 From: Yoshy <60155833+Yoshy2002@users.noreply.github.com> Date: Sat, 25 Apr 2026 22:09:38 +0200 Subject: [PATCH] Fix CTM to not spread to nearby TEs (#1695) --- src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java | 1 + .../java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java | 1 - .../angelica/mixins/early/rendering/MixinRenderBlocks.java | 2 ++ .../early/shaders/MixinTileEntityRendererDispatcher.java | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java index 36140ebe9..0d2f2366b 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java @@ -233,6 +233,7 @@ public class CTMUtils { } public static void reset() { + clearCurrentCompact(); } private static boolean checkFace(int face) { diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java index 2940232f4..964b98edf 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideIterator.java @@ -105,7 +105,6 @@ abstract public class TileOverrideIterator implements Iterator { public TileOverride go(RenderBlockState renderBlockState, IIcon origIcon) { CTMUtils.clearCurrentCompact(); - this.renderBlockState = renderBlockState; renderBlockState.setFilter(null); currentIcon = origIcon; diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java index cb9ecc4b7..0333aff76 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/rendering/MixinRenderBlocks.java @@ -55,11 +55,13 @@ public abstract class MixinRenderBlocks { @Inject(method = "renderBlockByRenderType", at = @At("HEAD")) private void renderingByTypeEnable(CallbackInfoReturnable ci) { + CTMUtils.clearCurrentCompact(); this.isRenderingByType = true; } @Inject(method = "renderBlockByRenderType", at = @At("TAIL")) private void renderingByTypeDisable(CallbackInfoReturnable ci) { + CTMUtils.clearCurrentCompact(); this.isRenderingByType = false; } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinTileEntityRendererDispatcher.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinTileEntityRendererDispatcher.java index 6a99a4ad7..02024d3c5 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinTileEntityRendererDispatcher.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinTileEntityRendererDispatcher.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.mixins.early.shaders; +import com.prupe.mcpatcher.ctm.CTMUtils; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; import net.coderbot.iris.block_rendering.BlockRenderingSettings; @@ -17,6 +18,7 @@ public class MixinTileEntityRendererDispatcher { @Inject(method = "renderTileEntityAt(Lnet/minecraft/tileentity/TileEntity;DDDF)V", at = @At("HEAD")) private void iris$setBlockEntityId(TileEntity te, double x, double y, double z, float partialTicks, CallbackInfo ci) { + CTMUtils.clearCurrentCompact(); if (te == null) { CapturedRenderingState.INSTANCE.setCurrentBlockEntity(0); return; @@ -46,6 +48,7 @@ public class MixinTileEntityRendererDispatcher { @Inject(method = "renderTileEntityAt(Lnet/minecraft/tileentity/TileEntity;DDDF)V", at = @At("RETURN")) private void iris$resetBlockEntityId(TileEntity te, double x, double y, double z, float partialTicks, CallbackInfo ci) { + CTMUtils.clearCurrentCompact(); CapturedRenderingState.INSTANCE.setCurrentBlockEntity(0); } }