diff --git a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java index a98ebf0bb..d68a82f43 100644 --- a/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java +++ b/src/main/java/com/prupe/mcpatcher/ctm/TileOverride.java @@ -46,6 +46,7 @@ public abstract class TileOverride implements Comparable { private final List matchBlocks; private final Set matchTiles; private final List connectBlocks; + private final List abuttingBlocks; private final BlockFaceMatcher faceMatcher; private final int connectType; private final boolean innerSeams; @@ -164,7 +165,7 @@ public abstract class TileOverride implements Comparable { matchTiles.add(baseFilename); } connectBlocks = getBlockList(properties.getString("connectBlocks", ""), properties.getString("connectMetadata", "")); - + abuttingBlocks = getBlockList(properties.getString("abuttingBlocks", ""), properties.getString("abuttingMetaData", "")); faceMatcher = BlockFaceMatcher.create(properties.getString("faces", "")); String connectType1 = properties.getString("connect", "") @@ -499,6 +500,9 @@ public abstract class TileOverride implements Comparable { if (faceMatcher != null && !faceMatcher.match(renderBlockState)) { return null; } + if (!abuttingBlocks.isEmpty() && !matchesAbuttingBlock(blockAccess, x,y,z, renderBlockState.getBlockFace())) { + return null; + } if (height != null && !height.get(y)) { return null; } @@ -508,6 +512,22 @@ public abstract class TileOverride implements Comparable { return getTileWorld_Impl(renderBlockState, origIcon); } + private boolean matchesAbuttingBlock(IBlockAccess blockAccess, int x, int y, int z, int blockFace) { + if (blockFace < 0) { + return false; + } + int[] normal = NORMALS[blockFace]; + x += normal[0]; + y += normal[1]; + z += normal[2]; + for (BlockStateMatcher matcher : abuttingBlocks) { + if (matcher.match(blockAccess, x, y , z)) { + return true; + } + } + return false; + } + public final IIcon getTileHeld(RenderBlockState renderBlockState, IIcon origIcon) { if (icons == null) { properties.error("no images loaded, disabling");