From bb6b84d255c3173d59a981d5d31876ed5eaabc5f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 21 May 2015 14:54:52 -0400 Subject: [PATCH] Improve invpanel bounds math and clean up its code --- src/main/java/crazypants/enderio/BlockEio.java | 14 ++++++++++++++ .../machine/invpanel/BlockInventoryPanel.java | 10 +++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index 192149f3..b7b60af8 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; @@ -180,4 +181,17 @@ public abstract class BlockEio extends Block { } } + // Because the vanilla method takes floats... + public void setBlockBounds(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + this.minX = minX; + this.minY = minY; + this.minZ = minZ; + this.maxX = maxX; + this.maxY = maxY; + this.maxZ = maxZ; + } + + public void setBlockBounds(AxisAlignedBB bb) { + setBlockBounds(bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); + } } diff --git a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java index f7136458..eeb2eff3 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java @@ -90,15 +90,19 @@ public class BlockInventoryPanel extends AbstractMachineBlock