From 2d39c6b60c86bd6a856bf8a96e096bb08c09bafa Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 21 Mar 2015 04:26:54 -0400 Subject: [PATCH] Selection box of formed telepad contains whole structure, fix render BB --- .../machine/capbank/render/CapBankRenderer.java | 3 ++- .../enderio/teleport/telepad/BlockTelePad.java | 13 ++++++++++++- .../enderio/teleport/telepad/GuiTelePad.java | 2 -- .../enderio/teleport/telepad/TelePadRenderer.java | 3 +++ .../enderio/teleport/telepad/TileTelePad.java | 13 +++++++++++++ src/main/java/crazypants/render/CubeRenderer.java | 2 +- 6 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java index 2574c299..e238e8aa 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -115,6 +115,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl tes.startDrawingQuads(); tes.setColorRGBA_F(1, 1, 1, 1); + tes.addTranslation(0, -0.1f, 0); renderBorder(null, 0, 0, 0, item.getItemDamage()); tes.draw(); @@ -130,7 +131,7 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); // key = new GaugeKey(ForgeDirection.EAST, FillGauge.Type.SINGLE); // fillGaugeRenderer.doRender(nw, RenderUtil.BRIGHTNESS_MAX, gi, key); - + tes.addTranslation(0, 0.1f, 0); } private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java index 3815d712..f5c39229 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java @@ -6,6 +6,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -78,7 +79,17 @@ public class BlockTelePad extends BlockTravelAnchor { public int getRenderType() { return renderId; } - + + @Override + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + AxisAlignedBB bb = super.getSelectedBoundingBoxFromPool(world, x, y, z); + TileTelePad te = (TileTelePad) world.getTileEntity(x, y, z); + if(!te.inNetwork()) { + return bb; + } + return te.getBoundingBox(); + } + @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block changedTo) { super.onNeighborBlockChange(world, x, y, z, changedTo); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index cd13570f..8394b2c0 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -3,7 +3,6 @@ package crazypants.enderio.teleport.telepad; import java.awt.Rectangle; import java.util.List; -import joptsimple.internal.Strings; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -21,7 +20,6 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.TextFieldEIO; -import crazypants.enderio.gui.TextFieldEIO.ICharFilter; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiContainerBase; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index 006ec5b5..eb74aca1 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -5,6 +5,7 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.model.obj.GroupObject; @@ -54,6 +55,8 @@ public class TelePadRenderer extends TechneModelRenderer { @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + Tessellator.instance.startDrawingQuads(); CubeRenderer.render(block, metadata); + Tessellator.instance.draw(); } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index f188f22b..e473ab10 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -332,6 +332,19 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei return toTeleport.peek(); } + public AxisAlignedBB getBoundingBox() { + if(!inNetwork()) { + return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + } + TileTelePad master = getMaster(); + return AxisAlignedBB.getBoundingBox(master.xCoord - 1, master.yCoord, master.zCoord - 1, master.xCoord + 2, master.yCoord + 1, master.zCoord + 2); + } + + @Override + public AxisAlignedBB getRenderBoundingBox() { + return getBoundingBox(); + } + /* IProgressTile */ @Override diff --git a/src/main/java/crazypants/render/CubeRenderer.java b/src/main/java/crazypants/render/CubeRenderer.java index 6ef41cf3..48c4f571 100644 --- a/src/main/java/crazypants/render/CubeRenderer.java +++ b/src/main/java/crazypants/render/CubeRenderer.java @@ -24,7 +24,7 @@ public final class CubeRenderer { for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { icons[dir.ordinal()] = block.getIcon(dir.ordinal(), meta); } - render(BoundingBox.UNIT_CUBE, icons, xForm, true); + render(BoundingBox.UNIT_CUBE.translate(0, -0.1f, 0), icons, xForm, true); } public static void render(BoundingBox bb, IIcon tex) {