diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index f92f95514..56f3e075a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -22,19 +22,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderBin extends TileEntitySpecialRenderer +public class RenderBin extends TileEntitySpecialRenderer { private final RenderBlocks renderBlocks = new RenderBlocks(); private final RenderItem renderItem = (RenderItem)RenderManager.instance.getEntityClassRenderObject(EntityItem.class); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityBin)tileEntity, x, y, z, partialTick); - } - - @SuppressWarnings("incomplete-switch") - private void renderAModelAt(TileEntityBin tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityBin tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity instanceof TileEntityBin) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 2ede54600..cbe9d2011 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderChargepad extends TileEntitySpecialRenderer +public class RenderChargepad extends TileEntitySpecialRenderer { private ModelChargepad model = new ModelChargepad(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityChargepad)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityChargepad tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityChargepad tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 7d02fd1a9..e9c72c165 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -14,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer +public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { private ModelChemicalCrystallizer model = new ModelChemicalCrystallizer(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityChemicalCrystallizer)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityChemicalCrystallizer tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityChemicalCrystallizer tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index c272ab09a..2e8a0c8dd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer +public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer { private ModelChemicalDissolutionChamber model = new ModelChemicalDissolutionChamber(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityChemicalDissolutionChamber)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityChemicalDissolutionChamber tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityChemicalDissolutionChamber tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java index 8685ed7cc..3cfed2c73 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java @@ -19,7 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -public class RenderChemicalInfuser extends TileEntitySpecialRenderer +public class RenderChemicalInfuser extends TileEntitySpecialRenderer { private ModelChemicalInfuser model = new ModelChemicalInfuser(); @@ -28,13 +28,7 @@ public class RenderChemicalInfuser extends TileEntitySpecialRenderer private Map> cachedGasses = new HashMap>(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityChemicalInfuser)tileEntity, x, y, z, partialTick); - } - - @SuppressWarnings("incomplete-switch") - private void renderAModelAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick, int destroyStage) { render(false, x, y, z, tileEntity); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 1b23615e5..2e0da9ddb 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -19,7 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -public class RenderChemicalOxidizer extends TileEntitySpecialRenderer +public class RenderChemicalOxidizer extends TileEntitySpecialRenderer { private ModelChemicalOxidizer model = new ModelChemicalOxidizer(); @@ -28,12 +28,7 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer private Map> cachedGasses = new HashMap>(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityChemicalOxidizer)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick, int destroyStage) { render(false, x, y, z, tileEntity); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java index c3e61a58e..dbacfa1f0 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java @@ -10,17 +10,12 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -public class RenderChemicalWasher extends TileEntitySpecialRenderer +public class RenderChemicalWasher extends TileEntitySpecialRenderer { private ModelChemicalWasher model = new ModelChemicalWasher(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityChemicalWasher)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityChemicalWasher tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityChemicalWasher tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 2189f6ad4..05fb35f40 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderConfigurableMachine extends TileEntitySpecialRenderer +public class RenderConfigurableMachine extends TileEntitySpecialRenderer { private Minecraft mc = FMLClientHandler.instance().getClient(); @@ -41,16 +41,10 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer } @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((ISideConfiguration)tileEntity, x, y, z, partialTick); - } - - public void renderAModelAt(ISideConfiguration configurable, double x, double y, double z, float partialTick) + public void renderTileEntityAt(S configurable, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); - TileEntity tileEntity = (TileEntity)configurable; EntityPlayer player = mc.thePlayer; World world = mc.thePlayer.worldObj; ItemStack itemStack = player.getCurrentEquippedItem(); @@ -62,12 +56,12 @@ public class RenderConfigurableMachine extends TileEntitySpecialRenderer int yPos = MathHelper.floor_double(pos.blockY); int zPos = MathHelper.floor_double(pos.blockZ); - Coord4D obj = new Coord4D(xPos, yPos, zPos, tileEntity.getWorldObj().provider.dimensionId); + Coord4D obj = new Coord4D(xPos, yPos, zPos, configurable.getWorldObj().provider.dimensionId); TransmissionType type = ((ItemConfigurator)itemStack.getItem()).getState(itemStack).getTransmission(); if(configurable.getConfig().supports(type)) { - if(xPos == tileEntity.xCoord && yPos == tileEntity.yCoord && zPos == tileEntity.zCoord) + if(xPos == configurable.xCoord && yPos == configurable.yCoord && zPos == configurable.zCoord) { EnumColor color = configurable.getConfig().getOutput(type, pos.sideHit, configurable.getOrientation()).color; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java index 24fc8b6c4..66df2c0b7 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDigitalMiner.java @@ -14,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderDigitalMiner extends TileEntitySpecialRenderer +public class RenderDigitalMiner extends TileEntitySpecialRenderer { private ModelDigitalMiner model = new ModelDigitalMiner(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityDigitalMiner)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityDigitalMiner tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityDigitalMiner tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java index 56e297e51..03ff92d2d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -24,18 +24,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderDynamicTank extends TileEntitySpecialRenderer +public class RenderDynamicTank extends TileEntitySpecialRenderer { private static Map> cachedCenterFluids = new HashMap>(); private static Map> cachedValveFluids = new HashMap>(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityDynamicTank)tileEntity, x, y, z, partialTick); - } - - public void renderAModelAt(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityDynamicTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity.clientHasStructure && tileEntity.isRendering && tileEntity.structure != null && tileEntity.structure.fluidStored != null && tileEntity.structure.fluidStored.amount != 0) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java index 835b662b7..45dab924d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricChest.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderElectricChest extends TileEntitySpecialRenderer +public class RenderElectricChest extends TileEntitySpecialRenderer { private ModelChest model = new ModelChest(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityElectricChest)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityElectricChest tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityElectricChest tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y + 1.0F, (float)z); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 19f31a938..09496a08b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderElectricPump extends TileEntitySpecialRenderer +public class RenderElectricPump extends TileEntitySpecialRenderer { private ModelElectricPump model = new ModelElectricPump(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityElectricPump)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityElectricPump tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityElectricPump tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index e22294e6a..da7a26e85 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer +public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { private ModelElectrolyticSeparator model = new ModelElectrolyticSeparator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityElectrolyticSeparator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityElectrolyticSeparator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityElectrolyticSeparator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 5a07c1d7e..ed12e753b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -17,18 +17,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderEnergyCube extends TileEntitySpecialRenderer +public class RenderEnergyCube extends TileEntitySpecialRenderer { private ModelEnergyCube model = new ModelEnergyCube(); private ModelEnergyCore core = new ModelEnergyCore(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityEnergyCube)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityEnergyCube tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityEnergyCube tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java index dc6a87588..1440e614a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidicPlenisher.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderFluidicPlenisher extends TileEntitySpecialRenderer +public class RenderFluidicPlenisher extends TileEntitySpecialRenderer { private ModelFluidicPlenisher model = new ModelFluidicPlenisher(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityFluidicPlenisher)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityFluidicPlenisher tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityFluidicPlenisher tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 4ff5cef35..0f7e47057 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderGasTank extends TileEntitySpecialRenderer +public class RenderGasTank extends TileEntitySpecialRenderer { private ModelGasTank model = new ModelGasTank(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityGasTank)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java index fa9e5220d..c00e804bc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaser.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderLaser extends TileEntitySpecialRenderer +public class RenderLaser extends TileEntitySpecialRenderer { private ModelLaser model = new ModelLaser(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityLaser)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityLaser tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityLaser tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java index 0456b81d6..285a4f83a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java @@ -14,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderLaserAmplifier extends TileEntitySpecialRenderer +public class RenderLaserAmplifier extends TileEntitySpecialRenderer { private ModelLaserAmplifier model = new ModelLaserAmplifier(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityLaserAmplifier)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityLaserAmplifier tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityLaserAmplifier tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java index 6c154f603..6a1cc2e35 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java @@ -11,17 +11,12 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -public class RenderLaserTractorBeam extends TileEntitySpecialRenderer +public class RenderLaserTractorBeam extends TileEntitySpecialRenderer { private ModelLaserAmplifier model = new ModelLaserAmplifier(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityLaserTractorBeam)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityLaserTractorBeam tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityLaserTractorBeam tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 38aa8d385..8ef5d90de 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderLogisticalSorter extends TileEntitySpecialRenderer +public class RenderLogisticalSorter extends TileEntitySpecialRenderer { private ModelLogisticalSorter model = new ModelLogisticalSorter(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityLogisticalSorter)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityLogisticalSorter tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityLogisticalSorter tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index 3fa182d1f..af08188c2 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -14,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderMetallurgicInfuser extends TileEntitySpecialRenderer +public class RenderMetallurgicInfuser extends TileEntitySpecialRenderer { private ModelMetallurgicInfuser model = new ModelMetallurgicInfuser(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityMetallurgicInfuser)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityMetallurgicInfuser tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityMetallurgicInfuser tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java index 9d5898e1c..589d6a2f1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderObsidianTNT.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderObsidianTNT extends TileEntitySpecialRenderer +public class RenderObsidianTNT extends TileEntitySpecialRenderer { private ModelObsidianTNT model = new ModelObsidianTNT(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityObsidianTNT)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityObsidianTNT tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityObsidianTNT tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java b/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java index 4e796a436..917fed995 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderOredictionificator.java @@ -13,17 +13,12 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderOredictionificator extends TileEntitySpecialRenderer +public class RenderOredictionificator extends TileEntitySpecialRenderer { private ModelMetallurgicInfuser model = new ModelMetallurgicInfuser(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityOredictionificator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityOredictionificator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityOredictionificator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java index f53de591b..bbc09f625 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPortableTank.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderPortableTank extends TileEntitySpecialRenderer +public class RenderPortableTank extends TileEntitySpecialRenderer { private static Map cachedCenterFluids = new HashMap(); private static Map cachedValveFluids = new HashMap(); @@ -31,12 +31,7 @@ public class RenderPortableTank extends TileEntitySpecialRenderer private ModelPortableTank model = new ModelPortableTank(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityPortableTank)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityPortableTank tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityPortableTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { Fluid fluid = tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid() : null; render(fluid, tileEntity.prevScale, tileEntity.isActive, tileEntity.valve > 0 ? tileEntity.valveFluid : null, x, y, z); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java index 433e9ea19..62202f93a 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java @@ -14,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer +public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer { private ModelPressurizedReactionChamber model = new ModelPressurizedReactionChamber(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityPRC)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityPRC tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityPRC tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index ad888c9e6..d1f75f4a1 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -4,6 +4,7 @@ import mekanism.client.model.ModelRotaryCondensentrator; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -13,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer +public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { private ModelRotaryCondensentrator model = new ModelRotaryCondensentrator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityRotaryCondensentrator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntityRotaryCondensentrator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityRotaryCondensentrator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java index 7950cdb21..75cd42a55 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSalinationController.java @@ -22,17 +22,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderSalinationController extends TileEntitySpecialRenderer +public class RenderSalinationController extends TileEntitySpecialRenderer { private static Map> cachedCenterFluids = new HashMap>(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntitySolarEvaporationController)tileEntity, x, y, z, partialTick); - } - - public void renderAModelAt(TileEntitySolarEvaporationController tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntitySolarEvaporationController tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity.structured && tileEntity.inputTank.getFluid() != null) { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index 7f1061831..66d12a616 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -14,17 +14,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class RenderSeismicVibrator extends TileEntitySpecialRenderer +public class RenderSeismicVibrator extends TileEntitySpecialRenderer { private ModelSeismicVibrator model = new ModelSeismicVibrator(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntitySeismicVibrator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntitySeismicVibrator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntitySeismicVibrator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java index 73f673a73..31c87d33f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -1,13 +1,15 @@ package mekanism.client.render.tileentity; +import java.io.IOException; + import mekanism.common.tile.TileEntitySolarNeutronActivator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.obj.OBJLoader; import org.lwjgl.opengl.GL11; @@ -15,22 +17,22 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer +public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer { - private IModelCustom model; + private IModel model; public RenderSolarNeutronActivator() { - model = AdvancedModelLoader.loadModel(MekanismUtils.getResource(ResourceType.MODEL, "solar_tri.obj")); + try + { + model = OBJLoader.instance.loadModel(MekanismUtils.getResource(ResourceType.MODEL, "solar_tri.obj")); + } + catch(IOException e) + {} } @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntitySolarNeutronActivator)tileEntity, x, y, z, partialTick); - } - - private void renderAModelAt(TileEntitySolarNeutronActivator tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntitySolarNeutronActivator tileEntity, double x, double y, double z, float partialTick, int destroyStage) { GL11.glPushMatrix(); GL11.glTranslatef((float)x+0.5F, (float)y, (float)z+0.5F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 0c7790a73..5a4dce263 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -18,17 +18,12 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -public class RenderTeleporter extends TileEntitySpecialRenderer +public class RenderTeleporter extends TileEntitySpecialRenderer { private HashMap cachedOverlays = new HashMap(); @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) - { - renderAModelAt((TileEntityTeleporter)tileEntity, x, y, z, partialTick); - } - - public void renderAModelAt(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick) + public void renderTileEntityAt(TileEntityTeleporter tileEntity, double x, double y, double z, float partialTick, int destroyStage) { if(tileEntity.shouldRender) {