From 16c7dc92afbf7e0c93a2c2876e8fe1e02edd88f4 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 27 Apr 2016 19:08:01 -0400 Subject: [PATCH] More rendering fixes --- .../model/ModelElectrolyticSeparator.java | 204 +++++++++--------- .../common/tile/TileEntitySecurityDesk.java | 10 + .../tile/TileEntitySeismicVibrator.java | 10 + .../tile/TileEntitySolarNeutronActivator.java | 10 + 4 files changed, 132 insertions(+), 102 deletions(-) diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index c01a48f45..f424ca347 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -31,108 +31,108 @@ public class ModelElectrolyticSeparator extends ModelBase textureWidth = 128; textureHeight = 64; - tank2 = new ModelRenderer(this, 64, 0); - tank2.addBox(0F, 0F, 0F, 7, 10, 7); - tank2.setRotationPoint(1F, 10F, 1F); - tank2.setTextureSize(128, 64); - tank2.mirror = true; - setRotation(tank2, 0F, 0F, 0F); - tank1 = new ModelRenderer(this, 0, 20); - tank1.addBox(0F, 0F, 0F, 8, 12, 16); - tank1.setRotationPoint(-8F, 8F, -8F); - tank1.setTextureSize(128, 64); - tank1.mirror = true; - setRotation(tank1, 0F, 0F, 0F); - tank3 = new ModelRenderer(this, 64, 0); - tank3.addBox(0F, 0F, 0F, 7, 10, 7); - tank3.setRotationPoint(1F, 10F, -8F); - tank3.setTextureSize(128, 64); - tank3.mirror = true; - setRotation(tank3, 0F, 0F, 0F); - tube6 = new ModelRenderer(this, 0, 0); - tube6.addBox(0F, 0F, 0F, 1, 1, 1); - tube6.setRotationPoint(4F, 9F, 4F); - tube6.setTextureSize(128, 64); - tube6.mirror = true; - setRotation(tube6, 0F, 0F, 0F); - tube5 = new ModelRenderer(this, 0, 0); - tube5.addBox(0F, 0F, 0F, 1, 1, 1); - tube5.setRotationPoint(4F, 9F, -5F); - tube5.setTextureSize(128, 64); - tube5.mirror = true; - setRotation(tube5, 0F, 0F, 0F); - tube4 = new ModelRenderer(this, 0, 48); - tube4.addBox(0F, 0F, 0F, 1, 1, 10); - tube4.setRotationPoint(4F, 8F, -5F); - tube4.setTextureSize(128, 64); - tube4.mirror = true; - setRotation(tube4, 0F, 0F, 0F); - tube3 = new ModelRenderer(this, 0, 0); - tube3.addBox(0F, 0F, 0F, 1, 3, 1); - tube3.setRotationPoint(4F, 9F, -0.5F); - tube3.setTextureSize(128, 64); - tube3.mirror = true; - setRotation(tube3, 0F, 0F, 0F); - tube2 = new ModelRenderer(this, 0, 0); - tube2.addBox(-4F, -1F, 0F, 4, 1, 1); - tube2.setRotationPoint(5F, 12F, -0.5F); - tube2.setTextureSize(128, 64); - tube2.mirror = true; - setRotation(tube2, 0F, 0F, -0.5235988F); - tube1 = new ModelRenderer(this, 0, 0); - tube1.addBox(-3F, -1F, 0F, 3, 1, 1); - tube1.setRotationPoint(1.5F, 14F, -0.5F); - tube1.setTextureSize(128, 64); - tube1.mirror = true; - setRotation(tube1, 0F, 0F, 0F); - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 16, 4, 16); - base.setRotationPoint(-8F, 20F, -8F); - base.setTextureSize(128, 64); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - portToggle1 = new ModelRenderer(this, 48, 20); - portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); - portToggle1.setRotationPoint(-8.01F, 12F, -4F); - portToggle1.setTextureSize(128, 64); - portToggle1.mirror = true; - setRotation(portToggle1, 0F, 0F, 0F); - portToggle2a = new ModelRenderer(this, 48, 20); - portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); - portToggle2a.setRotationPoint(7.01F, 12F, -4F); - portToggle2a.setTextureSize(128, 64); - portToggle2a.mirror = true; - setRotation(portToggle2a, 0F, 0F, 0F); - portToggle2b = new ModelRenderer(this, 0, 4); - portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); - portToggle2b.setRotationPoint(5F, 13F, -1F); - portToggle2b.setTextureSize(128, 64); - portToggle2b.mirror = true; - setRotation(portToggle2b, 0F, 0F, 0F); - portToggle3a = new ModelRenderer(this, 66, 20); - portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); - portToggle3a.setRotationPoint(-4F, 12F, -8.01F); - portToggle3a.setTextureSize(128, 64); - portToggle3a.mirror = true; - setRotation(portToggle3a, 0F, 0F, 0F); - portToggle3b = new ModelRenderer(this, 0, 4); - portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); - portToggle3b.setRotationPoint(0F, 13F, -7F); - portToggle3b.setTextureSize(128, 64); - portToggle3b.mirror = true; - setRotation(portToggle3b, 0F, 0F, 0F); - portToggle4a = new ModelRenderer(this, 66, 20); - portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); - portToggle4a.setRotationPoint(-4F, 12F, 7.01F); - portToggle4a.setTextureSize(128, 64); - portToggle4a.mirror = true; - setRotation(portToggle4a, 0F, 0F, 0F); - portToggle4b = new ModelRenderer(this, 0, 4); - portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); - portToggle4b.setRotationPoint(0F, 13F, 5F); - portToggle4b.setTextureSize(128, 64); - portToggle4b.mirror = true; - setRotation(portToggle4b, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 64, 0); + tank2.addBox(0F, 0F, 0F, 7, 10, 7); + tank2.setRotationPoint(1F, 10F, 1F); + tank2.setTextureSize(128, 64); + tank2.mirror = true; + setRotation(tank2, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 20); + tank1.addBox(0F, 0F, 0F, 8, 12, 16); + tank1.setRotationPoint(-8F, 8F, -8F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 64, 0); + tank3.addBox(0F, 0F, 0F, 7, 10, 7); + tank3.setRotationPoint(1F, 10F, -8F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 1, 1, 1); + tube6.setRotationPoint(4F, 9F, 4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 1, 1, 1); + tube5.setRotationPoint(4F, 9F, -5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 48); + tube4.addBox(0F, 0F, 0F, 1, 1, 10); + tube4.setRotationPoint(4F, 8F, -5F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 1, 3, 1); + tube3.setRotationPoint(4F, 9F, -0.5F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(-4F, -1F, 0F, 4, 1, 1); + tube2.setRotationPoint(5F, 12F, -0.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, -0.5235988F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(-3F, -1F, 0F, 3, 1, 1); + tube1.setRotationPoint(1.5F, 14F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 48, 36); + portToggle1.addBox(0F, 0F, 0F, 1, 10, 10); + portToggle1.setRotationPoint(-8.01F, 11F, -5F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2a = new ModelRenderer(this, 48, 20); + portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2a.setRotationPoint(7.01F, 12F, -4F); + portToggle2a.setTextureSize(128, 64); + portToggle2a.mirror = true; + setRotation(portToggle2a, 0F, 0F, 0F); + portToggle2b = new ModelRenderer(this, 0, 4); + portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); + portToggle2b.setRotationPoint(5F, 13F, -1F); + portToggle2b.setTextureSize(128, 64); + portToggle2b.mirror = true; + setRotation(portToggle2b, 0F, 0F, 0F); + portToggle3a = new ModelRenderer(this, 66, 20); + portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle3a.setRotationPoint(-4F, 12F, -8.01F); + portToggle3a.setTextureSize(128, 64); + portToggle3a.mirror = true; + setRotation(portToggle3a, 0F, 0F, 0F); + portToggle3b = new ModelRenderer(this, 0, 4); + portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle3b.setRotationPoint(0F, 13F, -7F); + portToggle3b.setTextureSize(128, 64); + portToggle3b.mirror = true; + setRotation(portToggle3b, 0F, 0F, 0F); + portToggle4a = new ModelRenderer(this, 66, 20); + portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle4a.setRotationPoint(-4F, 12F, 7.01F); + portToggle4a.setTextureSize(128, 64); + portToggle4a.mirror = true; + setRotation(portToggle4a, 0F, 0F, 0F); + portToggle4b = new ModelRenderer(this, 0, 4); + portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle4b.setRotationPoint(0F, 13F, 5F); + portToggle4b.setTextureSize(128, 64); + portToggle4b.mirror = true; + setRotation(portToggle4b, 0F, 0F, 0F); } public void render(float size) diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 17e1d5fcc..6ed44da31 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -17,7 +17,10 @@ import mekanism.common.security.SecurityFrequency; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntitySecurityDesk extends TileEntityContainerBlock implements IBoundingBlock { @@ -300,4 +303,11 @@ public class TileEntitySecurityDesk extends TileEntityContainerBlock implements return null; } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 748369efb..67aec404f 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -21,7 +21,10 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile, IBoundingBlock { @@ -233,4 +236,11 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); worldObj.setBlockToAir(xCoord, yCoord, zCoord); } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } } diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index 7107ee178..2af70377c 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -29,8 +29,11 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock implements IRedstoneControl, IBoundingBlock, IGasHandler, ITubeConnection, IActiveState, ISustainedData, ITankManager, ISecurityTile { @@ -410,4 +413,11 @@ public class TileEntitySolarNeutronActivator extends TileEntityContainerBlock im { return securityComponent; } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() + { + return INFINITE_EXTENT_AABB; + } }