Compact CTM Fix (#1640)

This commit is contained in:
Jason Mitchell authored and GitHub committed 2026-04-03 16:48:08 -07:00
1 parent bbf83db379
commit 8d53e25e0a
3 files changed
+25 -23

No files matched your search

@@ -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);
@@ -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;
}
}
}