From 8d53e25e0a7df09ce900f1f534f474a6e030aedb Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Fri, 3 Apr 2026 16:48:08 -0700 Subject: [PATCH] Compact CTM Fix (#1640) --- .../ctm/CompactCtmQuadProcessor.java | 20 +++++++++++++++---- .../prupe/mcpatcher/ctm/TileOverrideImpl.java | 14 +++++++------ .../early/rendering/MixinRenderBlocks.java | 14 +------------ 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CompactCtmQuadProcessor.java b/src/main/java/com/prupe/mcpatcher/ctm/CompactCtmQuadProcessor.java index de84fbb76..ea324a9ab 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/CompactCtmQuadProcessor.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/CompactCtmQuadProcessor.java @@ -79,7 +79,7 @@ public final class CompactCtmQuadProcessor { private final IIcon[] sprites; private final CompactConnectingCtmProperties props; - public CompactCtmQuadProcessor(IIcon[] sprites, CompactConnectingCtmProperties props) { + CompactCtmQuadProcessor(IIcon[] sprites, CompactConnectingCtmProperties props) { this.sprites = new IIcon[5]; if (sprites != null) { System.arraycopy(sprites, 0, this.sprites, 0, Math.min(sprites.length, this.sprites.length)); @@ -93,14 +93,15 @@ public final class CompactCtmQuadProcessor { int ctmIndex = CTM_47_BY_CONNECTIONS[connections & 0xFF]; IIcon replacement = getReplacementIcon(ctmIndex); if (replacement != null) { - rb.overrideBlockTexture = replacement; - return false; + renderWholeFace(rb, world, x, y, z, face, replacement); + return true; } if (connections == 0 || connections == 0xFF) { IIcon sprite = sprites[getCompactSpriteIndex(connections)]; if (sprite != null) { - rb.overrideBlockTexture = sprite; + renderWholeFace(rb, world, x, y, z, face, sprite); + return true; } return false; } @@ -171,6 +172,17 @@ public final class CompactCtmQuadProcessor { rb.setRenderBounds(minX, minY, minZ, maxX, maxY, maxZ); } + private void renderWholeFace(RenderBlocks rb, IBlockAccess world, int x, int y, int z, int face, IIcon icon) { + Block block = world.getBlock(x, y, z); + IIcon saved = rb.overrideBlockTexture; + rb.overrideBlockTexture = icon; + try { + renderFace(rb, block, x, y, z, face, icon); + } finally { + rb.overrideBlockTexture = saved; + } + } + private void renderFace(RenderBlocks rb, Block block, int x, int y, int z, int face, IIcon icon) { boolean originalFlip = rb.field_152631_f; rb.field_152631_f = (face == 2 || face == 5); diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java index a7f6938d9..982023313 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverrideImpl.java @@ -485,6 +485,7 @@ public class TileOverrideImpl { final public static class CTMCompact extends TileOverride { private final CompactConnectingCtmProperties properties; + private volatile CompactCtmQuadProcessor processor; CTMCompact(PropertiesFile propertiesFile, TileLoader tileLoader) { super(propertiesFile, tileLoader); @@ -516,12 +517,13 @@ public class TileOverrideImpl { return icons.length > 0 ? icons[0] : origIcon; } - public CompactConnectingCtmProperties getCtmProperties() { - return properties; - } - - public IIcon[] getIcons() { - return icons; + public CompactCtmQuadProcessor getProcessor() { + CompactCtmQuadProcessor p = this.processor; + if (p == null) { + p = new CompactCtmQuadProcessor(icons, properties); + this.processor = p; + } + return p; } } } 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 5b576116f..cb9ecc4b7 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 @@ -8,7 +8,6 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; import com.prupe.mcpatcher.ctm.CTMUtils; import com.prupe.mcpatcher.ctm.CompactCtmQuadProcessor; -import com.prupe.mcpatcher.ctm.TileOverride; import com.prupe.mcpatcher.ctm.TileOverrideImpl; import cpw.mods.fml.client.registry.RenderingRegistry; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; @@ -32,7 +31,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; @Mixin(RenderBlocks.class) public abstract class MixinRenderBlocks { @@ -190,22 +188,13 @@ public abstract class MixinRenderBlocks { @Unique private boolean compactCtmRendering = false; - @Unique - private CompactCtmQuadProcessor compactCtmProcessor; - @Unique private CompactCtmQuadProcessor getCompactProcessor() { TileOverrideImpl.CTMCompact compact = CTMUtils.getCurrentCompact(); if (compact == null) { return null; } - if (this.compactCtmProcessor == null) { - this.compactCtmProcessor = new CompactCtmQuadProcessor( - compact.getIcons(), - compact.getCtmProperties() - ); - } - return this.compactCtmProcessor; + return compact.getProcessor(); } private void handleCompactCtmFace(int face, Block block, double x, double y, double z, IIcon icon, CallbackInfo ci) { @@ -275,7 +264,6 @@ public abstract class MixinRenderBlocks { @Inject(method = "renderStandardBlock(Lnet/minecraft/block/Block;III)Z", at = @At("RETURN")) private void compactCtm_resetAfterBlock(Block block, int x, int y, int z, CallbackInfoReturnable cir) { - this.compactCtmProcessor = null; CTMUtils.clearCurrentCompact(); } }