Fix compatibility with non-Create CT mods

copycats-plus · Jan 19, 2025 · d3d78f5 · d3d78f5
1 parent 1dd496c
commit d3d78f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java b/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java
@@ -319,6 +319,10 @@ default void playerWillDestroy(Level level, BlockPos pos, BlockState state, Play
 
     static BlockState getAppearance(ICopycatBlock block, BlockState state, BlockAndTintGetter level, BlockPos pos, Direction side,
                                     BlockState queryState, BlockPos queryPos) {
+        // queryState is inconsistent between different CT mods
+        // our assumption is that queryState refers to the true block state (copycat), not the material
+        queryState = level.getBlockState(queryPos);
+
         if (block.isIgnoredConnectivitySide(level, state, side, pos, queryPos, queryState))
             return state;
 

diff --git a/...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java b/...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java
@@ -393,6 +393,10 @@ default void fillEmptyParts(Level level, BlockPos pos, BlockState state, BlockSt
 
     static BlockState getAppearance(IMultiStateCopycatBlock block, BlockState state, BlockAndTintGetter level, BlockPos pos, Direction side,
                                     BlockState queryState, BlockPos queryPos) {
+        // queryState is inconsistent between different CT mods
+        // our assumption is that queryState refers to the true block state (copycat), not the material
+        queryState = level.getBlockState(queryPos);
+
         BlockAndTintGetter reader = Mods.ATHENA.runIfInstalled(() -> () -> AthenaCompat.unwrapAthenaGetter(level)).orElse(level);
 
         if (reader instanceof ScaledBlockAndTintGetter scaledLevel && state.getBlock() instanceof IMultiStateCopycatBlock) {