Some additional solid checks (#713)

Check if not replaceable/no collision for solidness too
ldtteam · Dec 8, 2024 · 6abb52d · 6abb52d
1 parent e077e0c
commit 6abb52d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ javaVersion=21
 useJavaToolChains=true
 
 #The currently running forge.
-forgeVersion=21.1.72
+forgeVersion=21.1.84
 
 fmlRange=[4,)
 forgeRange=[21.0.143,)

diff --git a/src/main/java/com/ldtteam/structurize/util/BlockUtils.java b/src/main/java/com/ldtteam/structurize/util/BlockUtils.java
@@ -110,7 +110,7 @@ public static void checkOrInit()
         {
             BuiltInRegistries.BLOCK.stream()
                 .filter(BlockUtils::canBlockSurviveWithoutSupport)
-                .filter(block -> !block.defaultBlockState().isAir() && !(block instanceof LiquidBlock) && !block.builtInRegistryHolder().is(ModTags.WEAK_SOLID_BLOCKS))
+                .filter(block -> !block.defaultBlockState().canBeReplaced() && block.hasCollision && !block.defaultBlockState().isAir() && !(block instanceof LiquidBlock) && !block.builtInRegistryHolder().is(ModTags.WEAK_SOLID_BLOCKS))
                 .forEach(trueSolidBlocks::add);
         }
     }
@@ -802,6 +802,11 @@ public static boolean isWeakSolidBlock(final BlockState blockState)
             return blockState.isRandomlyTicking();
         }
 
+        if (blockState.canBeReplaced() || !blockState.getBlock().hasCollision)
+        {
+            return false;
+        }
+
         final Block block = blockState.getBlock();
         return block.builtInRegistryHolder().is(ModTags.WEAK_SOLID_BLOCKS) && canBlockSurviveWithoutSupport(block);
     }

diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
@@ -25,3 +25,5 @@ public net.minecraft.client.KeyMapping clickCount
 # itemHandler
 public net.minecraft.world.entity.decoration.GlowItemFrame getFrameItemStack()Lnet/minecraft/world/item/ItemStack;
 public net.minecraft.world.entity.decoration.ItemFrame getFrameItemStack()Lnet/minecraft/world/item/ItemStack;
+
+public net.minecraft.world.level.block.state.BlockBehaviour hasCollision # hasCollision