From 5ca5288736c345a14b25605070ccc95ececcd1a1 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 23 May 2016 00:39:34 +0100 Subject: [PATCH] Properly generify some things --- src/main/java/mekanism/client/ClientProxy.java | 2 +- .../render/transmitter/RenderLogisticalTransporter.java | 5 ++--- .../client/render/transmitter/RenderMechanicalPipe.java | 5 ++--- .../client/render/transmitter/RenderPressurizedTube.java | 6 ++---- .../render/transmitter/RenderThermodynamicConductor.java | 6 ++---- .../client/render/transmitter/RenderTransmitterBase.java | 2 +- .../client/render/transmitter/RenderUniversalCable.java | 6 ++---- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index abcfa8651..277e156d4 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -318,7 +318,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); - ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); + ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); ClientRegistry.registerTileEntity(TileEntityBoilerCasing.class, "BoilerCasing", new RenderThermoelectricBoiler()); ClientRegistry.registerTileEntity(TileEntityBoilerValve.class, "BoilerValve", new RenderThermoelectricBoiler()); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index 47d2c796d..9b68dda36 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -31,7 +31,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -public class RenderLogisticalTransporter extends RenderTransmitterBase +public class RenderLogisticalTransporter extends RenderTransmitterBase { private ModelTransporterBox modelBox = new ModelTransporterBox(); @@ -51,9 +51,8 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase } @Override - public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + public void renderMultipartAt(PartLogisticalTransporter transporter, double x, double y, double z, float partialTick, int destroyStage) { - PartLogisticalTransporter transporter = (PartLogisticalTransporter)multipart; GL11.glPushMatrix(); //possibly TODO diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 376b602e0..dcd2187c2 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -19,7 +19,7 @@ import net.minecraftforge.fluids.Fluid; import org.lwjgl.opengl.GL11; -public class RenderMechanicalPipe extends RenderTransmitterBase +public class RenderMechanicalPipe extends RenderTransmitterBase { private static HashMap> cachedLiquids = new HashMap>(); @@ -33,9 +33,8 @@ public class RenderMechanicalPipe extends RenderTransmitterBase } @Override - public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + public void renderMultipartAt(PartMechanicalPipe pipe, double x, double y, double z, float partialTick, int destroyStage) { - PartMechanicalPipe pipe = (PartMechanicalPipe)multipart; float targetScale; if(pipe.getTransmitter().hasTransmitterNetwork()) diff --git a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java index 678e38ae5..22da53299 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; -public class RenderPressurizedTube extends RenderTransmitterBase +public class RenderPressurizedTube extends RenderTransmitterBase { public RenderPressurizedTube() { @@ -18,10 +18,8 @@ public class RenderPressurizedTube extends RenderTransmitterBase } @Override - public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + public void renderMultipartAt(PartPressurizedTube tube, double x, double y, double z, float partialTick, int destroyStage) { - PartPressurizedTube tube = (PartPressurizedTube)multipart; - if(!tube.getTransmitter().hasTransmitterNetwork() || tube.getTransmitter().getTransmitterNetwork().refGas == null || tube.getTransmitter().getTransmitterNetwork().gasScale == 0) { return; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java index 733710825..f98d7b25b 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; -public class RenderThermodynamicConductor extends RenderTransmitterBase +public class RenderThermodynamicConductor extends RenderTransmitterBase { public RenderThermodynamicConductor() { @@ -18,10 +18,8 @@ public class RenderThermodynamicConductor extends RenderTransmitterBase } @Override - public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + public void renderMultipartAt(PartThermodynamicConductor transmitter, double x, double y, double z, float partialTick, int destroyStage) { - PartThermodynamicConductor transmitter = (PartThermodynamicConductor)multipart; - push(); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldRenderer = tessellator.getWorldRenderer(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java index 254f0ab20..d459fcb3a 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java @@ -25,7 +25,7 @@ import org.lwjgl.opengl.GL11; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; -public abstract class RenderTransmitterBase extends MultipartSpecialRenderer +public abstract class RenderTransmitterBase extends MultipartSpecialRenderer { private static OBJModel contentsModel; private static Map contentsMap = new HashMap(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index c288808fa..baa31ed96 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; -public class RenderUniversalCable extends RenderTransmitterBase +public class RenderUniversalCable extends RenderTransmitterBase { public RenderUniversalCable() { @@ -18,10 +18,8 @@ public class RenderUniversalCable extends RenderTransmitterBase } @Override - public void renderMultipartAt(IMultipart multipart, double x, double y, double z, float partialTick, int destroyStage) + public void renderMultipartAt(PartUniversalCable cable, double x, double y, double z, float partialTick, int destroyStage) { - PartUniversalCable cable = (PartUniversalCable)multipart; - if(cable.currentPower == 0) { return;