From 7017786a7cee875409eeb5bb8271fb4007b6d65f Mon Sep 17 00:00:00 2001 From: SuperSoupr <26164930+SuperSoupr@users.noreply.github.com> Date: Sun, 12 Jul 2026 18:45:16 +0300 Subject: [PATCH] CTM integration improvements (#1931) Co-authored-by: Jason Mitchell --- .../prupe/mcpatcher/ctm/BlockOrientation.java | 13 ++++++++-- .../com/prupe/mcpatcher/ctm/CTMUtils.java | 26 +++++++++++++++++-- .../com/prupe/mcpatcher/ctm/ICTMBlock.java | 10 +++++++ .../prupe/mcpatcher/ctm/RenderBlockState.java | 2 ++ .../com/prupe/mcpatcher/ctm/TileOverride.java | 11 +++++--- .../mal/resource/PropertiesFile.java | 22 ++++++++++++---- .../prupe/mcpatcher/mal/tile/TileLoader.java | 23 +++++++++++----- 7 files changed, 87 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/prupe/mcpatcher/ctm/ICTMBlock.java diff --git a/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java b/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java index 5cc8e3f5c..770843713 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/BlockOrientation.java @@ -40,6 +40,7 @@ final class BlockOrientation extends RenderBlockState { private int altMetadata; private int metadataBits; private int renderType; + private boolean iCtmBlock; private int blockFace; private int textureFace; @@ -76,6 +77,11 @@ final class BlockOrientation extends RenderBlockState { return z; } + @Override + public int getMetadata() { + return metadata; + } + @Override public int getBlockFace() { return blockFace; @@ -156,8 +162,8 @@ final class BlockOrientation extends RenderBlockState { @Override public boolean shouldConnectByBlock(Block neighbor, int neighborX, int neighborY, int neighborZ) { - return block == neighbor - && (metadataBits & (1 << blockAccess.getBlockMetadata(neighborX, neighborY, neighborZ))) != 0; + return iCtmBlock ? ((ICTMBlock) block).shouldConnectByBlock(this, neighbor, neighborX, neighborY, neighborZ) + : block == neighbor && (metadataBits & (1 << blockAccess.getBlockMetadata(neighborX, neighborY, neighborZ))) != 0; } @Override @@ -175,6 +181,7 @@ final class BlockOrientation extends RenderBlockState { copy.altMetadata = altMetadata; copy.metadataBits = metadataBits; copy.renderType = renderType; + copy.iCtmBlock = iCtmBlock; copy.blockFace = blockFace; copy.textureFace = textureFace; copy.textureFaceOrig = textureFaceOrig; @@ -203,6 +210,7 @@ final class BlockOrientation extends RenderBlockState { this.z = z; renderType = block.getRenderType(); metadata = altMetadata = blockAccess.getBlockMetadata(x, y, z); + iCtmBlock = block instanceof ICTMBlock; offsetsComputed = false; } @@ -223,6 +231,7 @@ final class BlockOrientation extends RenderBlockState { renderType = block.getRenderType(); blockFace = textureFace = textureFaceOrig = face; this.metadata = metadata; + iCtmBlock = block instanceof ICTMBlock; metadataBits = 1 << metadata; dx = dy = dz = 0; rotateUV = 0; diff --git a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java index 22ef4bdb3..2b1148cf9 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/CTMUtils.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.StampedLock; +import java.util.function.Consumer; import com.github.bsideup.jabel.Desugar; import net.minecraft.block.Block; @@ -34,10 +35,22 @@ public class CTMUtils { public static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM"); - private static class Overrides { + public static class Overrides { private final List all = new ArrayList<>(); private final Map> block = new IdentityHashMap<>(); private final Map> tile = new HashMap<>(); + + public List getAll() { + return all; + } + + public Map> getBlock() { + return block; + } + + public Map> getTile() { + return tile; + } } private static Overrides overrides = new Overrides(); @@ -82,6 +95,8 @@ public class CTMUtils { private static final AtomicInteger texturePackChangeCounter = new AtomicInteger(0); + private static final ArrayList> ctmRegistrationCallbacks = new ArrayList<>(); + static { try { Class.forName(MCPatcherUtils.RENDER_PASS_CLASS) @@ -117,6 +132,9 @@ public class CTMUtils { .listResources(TexturePackAPI.MCPATCHER_SUBDIR + "ctm", ".properties", true)) { registerOverrideWithoutLock(newOverrides, TileOverride.create(resource, tileLoader)); } + for (Consumer callback : ctmRegistrationCallbacks) { + callback.accept(newOverrides); + } } for (ResourceLocation resource : BlendMethod.getAllBlankResources()) { tileLoader.preloadTile(resource, false); @@ -257,7 +275,7 @@ public class CTMUtils { return RenderPassAPI.instance.skipDefaultRendering(block); } - private static void registerOverrideWithoutLock(Overrides overrides, TileOverride override) { + public static void registerOverrideWithoutLock(Overrides overrides, TileOverride override) { if (override != null && !override.isDisabled()) { boolean registered = false; List matchingBlocks = override.getMatchingBlocks(); @@ -308,4 +326,8 @@ public class CTMUtils { private static TileOverrideIterator.Metadata newMetadataIterator() { return new TileOverrideIterator.Metadata(overrides.block, overrides.tile); } + + public static void addCtmRegistrationCallback(Consumer consumer) { + ctmRegistrationCallbacks.add(consumer); + } } diff --git a/src/main/java/com/prupe/mcpatcher/ctm/ICTMBlock.java b/src/main/java/com/prupe/mcpatcher/ctm/ICTMBlock.java new file mode 100644 index 000000000..9bc7b6684 --- /dev/null +++ b/src/main/java/com/prupe/mcpatcher/ctm/ICTMBlock.java @@ -0,0 +1,10 @@ +package com.prupe.mcpatcher.ctm; + +import net.minecraft.block.Block; + +/** + * Implement this interface on blocks that support connected textures to allow them to control if they connect to neighbors or not + */ +public interface ICTMBlock { + boolean shouldConnectByBlock(RenderBlockState renderBlockState, Block neighbor, int neighborX, int neighborY, int neighborZ); +} diff --git a/src/main/java/com/prupe/mcpatcher/ctm/RenderBlockState.java b/src/main/java/com/prupe/mcpatcher/ctm/RenderBlockState.java index 3b0ca782a..011e6ab4e 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/RenderBlockState.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/RenderBlockState.java @@ -109,6 +109,8 @@ abstract public class RenderBlockState { abstract public int getZ(); + abstract public int getMetadata(); + abstract public int getBlockFace(); abstract public int getTextureFace(); diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java index 3d8a1108e..9fb45a114 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java @@ -33,7 +33,7 @@ public abstract class TileOverride implements Comparable { private static final MCLogger logger = MCLogger.getLogger(MCLogger.Category.CONNECTED_TEXTURES, "CTM"); - protected final PropertiesFile properties; + public final PropertiesFile properties; private final String baseFilename; protected final TileLoader tileLoader; protected final int renderPass; @@ -79,7 +79,10 @@ public abstract class TileOverride implements Comparable { if (properties == null) { return null; } + return create(properties, tileLoader); + } + public static TileOverride create(PropertiesFile properties, TileLoader tileLoader) { String method = properties.getString("method", "default") .toLowerCase(); TileOverride override = null; @@ -211,7 +214,7 @@ public abstract class TileOverride implements Comparable { for (int i = 0;; i++) { ResourceLocation resource = TileLoader .parseTileAddress(properties.getResource(), String.valueOf(i), blankResource); - if (!TexturePackAPI.hasResource(resource)) { + if (!TexturePackAPI.hasResource(resource) && !tileLoader.ignoreMissingTextures()) { break; } if (!addIcon(resource)) { @@ -237,7 +240,7 @@ public abstract class TileOverride implements Comparable { .parseTileAddress(properties.getResource(), token, blankResource); if (resource == null) { tileNames.add(null); - } else if (TexturePackAPI.hasResource(resource)) { + } else if (TexturePackAPI.hasResource(resource) || tileLoader.ignoreMissingTextures()) { addIcon(resource); } else { properties.warning("could not find image %s", resource); @@ -252,7 +255,7 @@ public abstract class TileOverride implements Comparable { for (int i = from; i <= to; i++) { ResourceLocation resource = TileLoader .parseTileAddress(properties.getResource(), String.valueOf(i), blankResource); - if (TexturePackAPI.hasResource(resource)) { + if (TexturePackAPI.hasResource(resource) || tileLoader.ignoreMissingTextures()) { addIcon(resource); } else { properties.warning("could not find image %s", resource); diff --git a/src/main/java/com/prupe/mcpatcher/mal/resource/PropertiesFile.java b/src/main/java/com/prupe/mcpatcher/mal/resource/PropertiesFile.java index 989f46363..75ada824f 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/resource/PropertiesFile.java +++ b/src/main/java/com/prupe/mcpatcher/mal/resource/PropertiesFile.java @@ -9,12 +9,12 @@ import net.minecraft.util.ResourceLocation; import com.prupe.mcpatcher.MCLogger; import com.prupe.mcpatcher.MCPatcherUtils; -final public class PropertiesFile { +public class PropertiesFile { - private final MCLogger logger; - private final ResourceLocation resource; - private final String prefix; - private final Properties properties; + protected final MCLogger logger; + protected final ResourceLocation resource; + protected final String prefix; + protected final Properties properties; private int errorCount; public static PropertiesFile get(MCLogger logger, ResourceLocation resource) { @@ -147,4 +147,16 @@ final public class PropertiesFile { return resource.equals(((PropertiesFile) that).resource); } } + + public MCLogger getLogger() { + return logger; + } + + public String getPrefix() { + return prefix; + } + + public Properties getProperties() { + return properties; + } } diff --git a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java index 98ee19b89..092c58df6 100644 --- a/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java +++ b/src/main/java/com/prupe/mcpatcher/mal/tile/TileLoader.java @@ -275,7 +275,7 @@ public class TileLoader { return false; } - private boolean registerOneIcon(TextureMap textureMap, String mapName, Map map) { + protected boolean registerOneIcon(TextureMap textureMap, String mapName, Map map) { ResourceLocation resource = tilesToRegister.iterator() .next(); String name = resource.toString(); @@ -304,6 +304,16 @@ public class TileLoader { return false; } } + TextureAtlasSprite icon = registerIconToMap(textureMap, resource, name); + map.put(name, icon); + iconMap.put(name, icon); + String extra = (width == height ? "" : ", " + (height / width) + " frames"); + subLogger.finer("%s -> %s icon %dx%d%s", name, mapName, width, width, extra); + tilesToRegister.remove(resource); + return true; + } + + protected TextureAtlasSprite registerIconToMap(TextureMap textureMap, ResourceLocation resource, String name) { TextureAtlasSprite icon; if(generatedTiles.contains(resource)){ icon = new GeneratedCTMAtlasSprite(this, textureMap.anisotropicFiltering > 1, name); @@ -311,12 +321,7 @@ public class TileLoader { }else{ icon = (TextureAtlasSprite)textureMap.registerIcon(name); } - map.put(name, icon); - iconMap.put(name, icon); - String extra = (width == height ? "" : ", " + (height / width) + " frames"); - subLogger.finer("%s -> %s icon %dx%d%s", name, mapName, width, width, extra); - tilesToRegister.remove(resource); - return true; + return icon; } public void finish() { @@ -339,4 +344,8 @@ public class TileLoader { public IIcon getIcon(ResourceLocation resource) { return resource == null ? null : getIcon(resource.toString()); } + + public boolean ignoreMissingTextures() { + return false; + } }