diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index d54e5d64..f3e50577 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -349,4 +349,8 @@ public abstract class AbstractMachineBlock exte public int getDefaultDisplayMask(World world, int x, int y, int z) { return IWailaInfoProvider.ALL_BITS; } + + protected void setObeliskBounds() { + setBlockBounds(0.11f, 0, 0.11f, 0.91f, 0.48f, 0.91f); + } } diff --git a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java index b68eab7e..7cd703c5 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java +++ b/src/main/java/crazypants/enderio/machine/attractor/BlockAttractor.java @@ -2,15 +2,14 @@ package crazypants.enderio.machine.attractor; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; @@ -27,6 +26,7 @@ public class BlockAttractor extends AbstractMachineBlock { protected BlockAttractor() { super(ModObject.blockAttractor, TileAttractor.class); + setObeliskBounds(); } @Override @@ -105,12 +105,7 @@ public class BlockAttractor extends AbstractMachineBlock { public int getRenderType() { return renderId; } - - @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool(World p_149633_1_, int x, int y, int z) { - return AxisAlignedBB.getBoundingBox(x + 0.1, y, z + 0.1, x + 0.9, y + 0.5, z + 0.9); - } - + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(World world, int x, int y, int z, Random rand) { @@ -128,9 +123,7 @@ public class BlockAttractor extends AbstractMachineBlock { fx.setRBGColorF(0.2f, 0.2f, 0.8f); fx.motionY *= 0.5f; } - } } } - } diff --git a/src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java b/src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java index f2b33f46..3ce4aea6 100644 --- a/src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java +++ b/src/main/java/crazypants/enderio/machine/attractor/ObeliskRenderer.java @@ -143,7 +143,6 @@ public class ObeliskRenderer extends TileEntitySpecialRend public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { BoundingBox bb = BoundingBox.UNIT_CUBE; - TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, null, world != null); Tessellator.instance.addTranslation(x, y, z); 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 45910f4c..24c9e4d4 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/CapBankRenderer.java @@ -46,7 +46,6 @@ public class CapBankRenderer extends TileEntitySpecialRenderer implements ISimpl infoRenderers = new HashMap(); infoRenderers.put(InfoDisplayType.LEVEL_BAR, fillGaugeRenderer); infoRenderers.put(InfoDisplayType.IO, new IoDisplay()); - } //------- Block diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java index 50451da0..87a83358 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/FillGauge.java @@ -9,7 +9,10 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.CapBankType; import crazypants.enderio.machine.capbank.InfoDisplayType; @@ -46,6 +49,7 @@ public class FillGauge implements IInfoRenderer { private float barMinV; FillGauge() { + MinecraftForge.EVENT_BUS.register(this); } @Override @@ -164,6 +168,11 @@ public class FillGauge implements IInfoRenderer { } return false; } + + @SubscribeEvent + public void onTextureRestitch(TextureStitchEvent.Post event) { + createVertexCache(); + } private void createVertexCache() { barIcon = EnderIO.blockCapBank.getFillBarIcon(); diff --git a/src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java b/src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java index 5562b448..7ddd6cb5 100644 --- a/src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java +++ b/src/main/java/crazypants/enderio/machine/spawnguard/BlockSpawnGuard.java @@ -13,10 +13,6 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.attractor.BlockAttractor; -import crazypants.enderio.machine.attractor.ContainerAttractor; -import crazypants.enderio.machine.attractor.GuiAttractor; -import crazypants.enderio.machine.attractor.TileAttractor; public class BlockSpawnGuard extends AbstractMachineBlock { @@ -34,6 +30,7 @@ public class BlockSpawnGuard extends AbstractMachineBlock { protected BlockSpawnGuard() { super(ModObject.blockSpawnGuard, TileSpawnGuard.class); + setObeliskBounds(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/xp/BlockExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/xp/BlockExperienceObelisk.java index c10c9e0e..5aef30c6 100644 --- a/src/main/java/crazypants/enderio/machine/xp/BlockExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/xp/BlockExperienceObelisk.java @@ -2,28 +2,19 @@ package crazypants.enderio.machine.xp; import java.util.Random; -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.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.monitor.ContainerPowerMonitor; -import crazypants.enderio.machine.tank.TileTank; -import crazypants.enderio.xp.XpUtil; public class BlockExperienceObelisk extends AbstractMachineBlock { @@ -37,6 +28,7 @@ public class BlockExperienceObelisk extends AbstractMachineBlock