From c4f738855a954fb42f9af4bd319346ff480de21a Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Thu, 25 May 2023 17:46:57 +0200
Subject: [PATCH] fix: clipping through BlockApparatusFragile

---
 .../blocks/BlockApparatusFragile.java         | 22 +++++++++++++------
 .../thaummach/blocks/BlockApparatusMetal.java |  4 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java
index 13468be..8af48f8 100644
--- a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java
+++ b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusFragile.java
@@ -27,6 +27,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -180,10 +181,19 @@ public class BlockApparatusFragile extends BlockApparatus {
         }
     }
 
+    @Override
+    @SuppressWarnings("rawtypes")
+    public void addCollisionBoxesToList(
+        World world, int x, int y, int z, AxisAlignedBB bb, List list, Entity e
+    ) {
+        this.setBlockBoundsBasedOnState(world, x, y, z);
+        super.addCollisionBoxesToList(world, x, y, z, bb, list, e);
+    }
+
     @Override
     public void
-    setBlockBoundsBasedOnState(IBlockAccess iblockaccess, int i, int j, int k) {
-        MetaVals md = MetaVals.get(iblockaccess.getBlockMetadata(i, j, k));
+    setBlockBoundsBasedOnState(IBlockAccess iblockaccess, int x, int y, int z) {
+        MetaVals md = MetaVals.get(iblockaccess.getBlockMetadata(x, y, z));
         float w1;
         if (md != MetaVals.CONDUIT && md != MetaVals.CONDUIT_VALVE
             && md != MetaVals.CONDUIT_VALVE_ADVANCED) {
@@ -191,8 +201,6 @@ public class BlockApparatusFragile extends BlockApparatus {
                 if (md == MetaVals.CONDUIT_VALVE) {
                     w1 = 0.0625F;
                     this.setBlockBounds(w1, 0.0F, w1, 1.0F - w1, 1.0F, 1.0F - w1);
-                } else if (md == null) {
-                    this.setBlockBounds(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F);
                 } else {
                     this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
                 }
@@ -207,8 +215,8 @@ public class BlockApparatusFragile extends BlockApparatus {
     }
 
     @Override
-    public AxisAlignedBB getSelectedBoundingBoxFromPool(World w, int i, int j, int k) {
-        MetaVals md = MetaVals.get(w.getBlockMetadata(i, j, k));
+    public AxisAlignedBB getSelectedBoundingBoxFromPool(World w, int x, int y, int z) {
+        MetaVals md = MetaVals.get(w.getBlockMetadata(x, y, z));
         float w1;
         if (md != MetaVals.CONDUIT && md != MetaVals.CONDUIT_VALVE
             && md != MetaVals.CONDUIT_VALVE_ADVANCED) {
@@ -249,7 +257,7 @@ public class BlockApparatusFragile extends BlockApparatus {
             );
         }
 
-        return super.getSelectedBoundingBoxFromPool(w, i, j, k);
+        return super.getSelectedBoundingBoxFromPool(w, x, y, z);
     }
 
     @Override
diff --git a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java
index 29069b5..741d4ae 100644
--- a/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java
+++ b/src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatusMetal.java
@@ -434,8 +434,8 @@ public class BlockApparatusMetal extends BlockApparatus {
 
     @Override
     public void
-    setBlockBoundsBasedOnState(IBlockAccess iblockaccess, int i, int j, int k) {
-        MetaVals md = MetaVals.get(iblockaccess.getBlockMetadata(i, j, k));
+    setBlockBoundsBasedOnState(IBlockAccess iblockaccess, int x, int y, int z) {
+        MetaVals md = MetaVals.get(iblockaccess.getBlockMetadata(x, y, z));
         float t4;
         if (md != MetaVals.GENERATOR && md != MetaVals.BORE) {
             if (md == MetaVals.TANK) {