diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 4d6dc7aee..78b228d0d 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -80,23 +80,16 @@ import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderChargepad; import mekanism.client.render.tileentity.RenderChemicalCrystallizer; import mekanism.client.render.tileentity.RenderChemicalDissolutionChamber; -import mekanism.client.render.tileentity.RenderChemicalInfuser; -import mekanism.client.render.tileentity.RenderChemicalOxidizer; -import mekanism.client.render.tileentity.RenderChemicalWasher; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDigitalMiner; import mekanism.client.render.tileentity.RenderDynamicTank; import mekanism.client.render.tileentity.RenderElectricPump; -import mekanism.client.render.tileentity.RenderElectrolyticSeparator; import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.client.render.tileentity.RenderFluidTank; import mekanism.client.render.tileentity.RenderFluidicPlenisher; import mekanism.client.render.tileentity.RenderGasTank; -import mekanism.client.render.tileentity.RenderLaserAmplifier; -import mekanism.client.render.tileentity.RenderLaserTractorBeam; import mekanism.client.render.tileentity.RenderLogisticalSorter; import mekanism.client.render.tileentity.RenderPersonalChest; -import mekanism.client.render.tileentity.RenderPressurizedReactionChamber; import mekanism.client.render.tileentity.RenderQuantumEntangloporter; import mekanism.client.render.tileentity.RenderResistiveHeater; import mekanism.client.render.tileentity.RenderSecurityDesk; @@ -166,9 +159,6 @@ import mekanism.common.tile.TileEntityFormulaicAssemblicator; import mekanism.common.tile.TileEntityFuelwoodHeater; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; -import mekanism.common.tile.TileEntityInductionCell; -import mekanism.common.tile.TileEntityInductionPort; -import mekanism.common.tile.TileEntityInductionProvider; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; import mekanism.common.tile.TileEntityLogisticalSorter; @@ -186,7 +176,6 @@ import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySecurityDesk; import mekanism.common.tile.TileEntitySeismicVibrator; import mekanism.common.tile.TileEntitySolarNeutronActivator; -import mekanism.common.tile.TileEntityStructuralGlass; import mekanism.common.tile.TileEntityTeleporter; import mekanism.common.tile.TileEntityThermalEvaporationController; import net.minecraft.client.Minecraft; @@ -219,9 +208,9 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import scala.actors.threadpool.Arrays; /** * Client proxy for the Mekanism mod. @@ -236,7 +225,7 @@ public class ClientProxy extends CommonProxy public static final String[] CUSTOM_RENDERS = new String[] {"fluid_tank", "bin_basic", "bin_advanced", "bin_elite", "bin_ultimate", "Jetpack", "FreeRunners", "AtomicDisassembler", "ScubaTank", "GasMask", "ArmoredJetpack", "Flamethrower", "personal_chest", - "solar_neutron_activator"}; + "solar_neutron_activator", "chemical_dissolution_chamber", "chemical_crystallizer", "seismic_vibrator"}; @Override public void loadConfiguration() @@ -299,8 +288,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityEliteFactory.class, "UltimateSmeltingFactory", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityPurificationChamber.class, "PurificationChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityEnergizedSmelter.class, "EnergizedSmelter", new RenderConfigurableMachine()); - //ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderMetallurgicInfuser()); - //ClientRegistry.registerTileEntity(TileEntityObsidianTNT.class, "ObsidianTNT", new RenderObsidianTNT()); + ClientRegistry.registerTileEntity(TileEntityMetallurgicInfuser.class, "MetallurgicInfuser", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityGasTank.class, "GasTank", new RenderGasTank()); ClientRegistry.registerTileEntity(TileEntityEnergyCube.class, "EnergyCube", new RenderEnergyCube()); ClientRegistry.registerTileEntity(TileEntityElectricPump.class, "ElectricPump", new RenderElectricPump()); @@ -311,39 +299,23 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityLogisticalSorter.class, "LogisticalSorter", new RenderLogisticalSorter()); ClientRegistry.registerTileEntity(TileEntityBin.class, "Bin", new RenderBin()); ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner()); - GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator"); ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter()); - ClientRegistry.registerTileEntity(TileEntityChemicalOxidizer.class, "ChemicalOxidizer", new RenderChemicalOxidizer()); - ClientRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser", new RenderChemicalInfuser()); ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityElectrolyticSeparator.class, "ElectrolyticSeparator", new RenderElectrolyticSeparator()); ClientRegistry.registerTileEntity(TileEntityThermalEvaporationController.class, "ThermalEvaporationController", new RenderThermalEvaporationController()); ClientRegistry.registerTileEntity(TileEntityPrecisionSawmill.class, "PrecisionSawmill", new RenderConfigurableMachine()); - ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); - ClientRegistry.registerTileEntity(TileEntityChemicalWasher.class, "ChemicalWasher", new RenderChemicalWasher()); ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); - ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderPressurizedReactionChamber()); + ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine()); ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); ClientRegistry.registerTileEntity(TileEntityFluidicPlenisher.class, "FluidicPlenisher", new RenderFluidicPlenisher()); - //ClientRegistry.registerTileEntity(TileEntityLaser.class, "Laser", new RenderLaser()); - ClientRegistry.registerTileEntity(TileEntityLaserAmplifier.class, "LaserAmplifier", new RenderLaserAmplifier()); - ClientRegistry.registerTileEntity(TileEntityLaserTractorBeam.class, "LaserTractorBeam", new RenderLaserTractorBeam()); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); - GameRegistry.registerTileEntity(TileEntityAmbientAccumulator.class, "AmbientAccumulator"); - GameRegistry.registerTileEntity(TileEntityInductionCasing.class, "InductionCasing"); - GameRegistry.registerTileEntity(TileEntityInductionPort.class, "InductionPort"); - GameRegistry.registerTileEntity(TileEntityInductionCell.class, "InductionCell"); - GameRegistry.registerTileEntity(TileEntityInductionProvider.class, "InductionProvider"); - GameRegistry.registerTileEntity(TileEntityOredictionificator.class, "Oredictionificator"); - GameRegistry.registerTileEntity(TileEntityStructuralGlass.class, "StructuralGlass"); 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()); ClientRegistry.registerTileEntity(TileEntitySecurityDesk.class, "SecurityDesk", new RenderSecurityDesk()); ClientRegistry.registerTileEntity(TileEntityQuantumEntangloporter.class, "QuantumEntangloporter", new RenderQuantumEntangloporter()); - GameRegistry.registerTileEntity(TileEntityFuelwoodHeater.class, "FuelwoodHeater"); + ClientRegistry.registerTileEntity(TileEntityChemicalDissolutionChamber.class, "ChemicalDissolutionChamber", new RenderChemicalDissolutionChamber()); } @Override @@ -467,7 +439,7 @@ public class ClientProxy extends CommonProxy } } - if(type == MachineType.FLUID_TANK || type == MachineType.PERSONAL_CHEST || type == MachineType.SOLAR_NEUTRON_ACTIVATOR) + if(Arrays.asList(CUSTOM_RENDERS).contains(type.getName())) { properties = "inventory"; } diff --git a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java b/src/main/java/mekanism/client/model/ModelChemicalInfuser.java deleted file mode 100644 index d5777f82f..000000000 --- a/src/main/java/mekanism/client/model/ModelChemicalInfuser.java +++ /dev/null @@ -1,268 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelChemicalInfuser extends ModelBase -{ - ModelRenderer base; - ModelRenderer tank2; - ModelRenderer portRight; - ModelRenderer portBack; - ModelRenderer portLeft; - ModelRenderer tank1; - ModelRenderer portFront; - ModelRenderer tank3; - ModelRenderer pipeAngle2; - ModelRenderer connectorAngle; - ModelRenderer pipe2; - ModelRenderer connector; - ModelRenderer compressor; - ModelRenderer tube10; - ModelRenderer tube8; - ModelRenderer tube9; - ModelRenderer tube7; - ModelRenderer tube6; - ModelRenderer tube5; - ModelRenderer tube4; - ModelRenderer tube3; - ModelRenderer tube2; - ModelRenderer tube1; - ModelRenderer pipe1; - ModelRenderer pipeAngle1; - ModelRenderer exhaust4; - ModelRenderer exhaust3; - ModelRenderer exhaust2; - ModelRenderer exhaust1; - - public ModelChemicalInfuser() - { - textureWidth = 128; - textureHeight = 64; - - base = new ModelRenderer(this, 0, 0); - base.addBox(0F, 0F, 0F, 16, 5, 16); - base.setRotationPoint(-8F, 19F, -8F); - base.setTextureSize(128, 64); - base.mirror = true; - setRotation(base, 0F, 0F, 0F); - tank2 = new ModelRenderer(this, 0, 21); - tank2.mirror = true; - tank2.addBox(0F, 0F, 0F, 6, 11, 6); - tank2.setRotationPoint(1F, 8F, 1F); - tank2.setTextureSize(128, 64); - setRotation(tank2, 0F, 0F, 0F); - portRight = new ModelRenderer(this, 0, 38); - portRight.addBox(0F, 0F, 0F, 1, 8, 8); - portRight.setRotationPoint(7.01F, 12F, -4F); - portRight.setTextureSize(128, 64); - portRight.mirror = true; - setRotation(portRight, 0F, 0F, 0F); - portBack = new ModelRenderer(this, 0, 54); - portBack.addBox(0F, 0F, 0F, 8, 8, 1); - portBack.setRotationPoint(-4F, 12F, 7.01F); - portBack.setTextureSize(128, 64); - portBack.mirror = true; - setRotation(portBack, 0F, 0F, 0F); - portLeft = new ModelRenderer(this, 0, 38); - portLeft.addBox(0F, 0F, 0F, 1, 8, 8); - portLeft.setRotationPoint(-8.01F, 12F, -4F); - portLeft.setTextureSize(128, 64); - portLeft.mirror = true; - setRotation(portLeft, 0F, 0F, 0F); - tank1 = new ModelRenderer(this, 0, 21); - tank1.addBox(0F, 0F, 0F, 6, 11, 6); - tank1.setRotationPoint(-7F, 8F, 1F); - tank1.setTextureSize(128, 64); - tank1.mirror = true; - setRotation(tank1, 0F, 0F, 0F); - portFront = new ModelRenderer(this, 18, 38); - portFront.addBox(0F, 0F, 0F, 8, 8, 1); - portFront.setRotationPoint(-4F, 12F, -8.01F); - portFront.setTextureSize(128, 64); - portFront.mirror = true; - setRotation(portFront, 0F, 0F, 0F); - tank3 = new ModelRenderer(this, 24, 21); - tank3.addBox(0F, 0F, 0F, 12, 7, 7); - tank3.setRotationPoint(-6F, 12F, -7F); - tank3.setTextureSize(128, 64); - tank3.mirror = true; - setRotation(tank3, 0F, 0F, 0F); - pipeAngle2 = new ModelRenderer(this, 18, 55); - pipeAngle2.addBox(-5F, 0F, 0F, 5, 6, 3); - pipeAngle2.setRotationPoint(5F, 13.01F, -2F); - pipeAngle2.setTextureSize(128, 64); - pipeAngle2.mirror = true; - //TODO - setRotation(pipeAngle2, 0F, 0.7853982F, 0F); - connectorAngle = new ModelRenderer(this, 40, 45); - connectorAngle.addBox(0F, 0F, 0F, 2, 8, 2); - connectorAngle.setRotationPoint(-1F, 13F, 5F); - connectorAngle.setTextureSize(128, 64); - connectorAngle.mirror = true; - //TODO - setRotation(connectorAngle, -0.4886922F, 0F, 0F); - pipe2 = new ModelRenderer(this, 40, 35); - pipe2.addBox(0F, 0F, 0F, 1, 6, 4); - pipe2.setRotationPoint(6F, 13F, -3F); - pipe2.setTextureSize(128, 64); - pipe2.mirror = true; - setRotation(pipe2, 0F, 0F, 0F); - connector = new ModelRenderer(this, 50, 35); - connector.addBox(0F, 0F, 0F, 2, 6, 2); - connector.setRotationPoint(-1F, 13F, 5F); - connector.setTextureSize(128, 64); - connector.mirror = true; - setRotation(connector, 0F, 0F, 0F); - compressor = new ModelRenderer(this, 18, 49); - compressor.addBox(0F, 0F, 0F, 6, 3, 3); - compressor.setRotationPoint(-3F, 8.5F, -2.5F); - compressor.setTextureSize(128, 64); - compressor.mirror = true; - setRotation(compressor, 0F, 0F, 0F); - tube10 = new ModelRenderer(this, 0, 14); - tube10.addBox(0F, 0F, 0F, 2, 1, 1); - tube10.setRotationPoint(-1F, 9F, 5F); - tube10.setTextureSize(128, 64); - tube10.mirror = true; - setRotation(tube10, 0F, 0F, 0F); - tube8 = new ModelRenderer(this, 0, 2); - tube8.addBox(0F, 0F, 0F, 1, 1, 2); - tube8.setRotationPoint(4F, 9.5F, -0.5F); - tube8.setTextureSize(128, 64); - tube8.mirror = true; - setRotation(tube8, 0F, 0F, 0F); - tube9 = new ModelRenderer(this, 0, 14); - tube9.addBox(0F, 0F, 0F, 2, 1, 1); - tube9.setRotationPoint(-1F, 9F, 2F); - tube9.setTextureSize(128, 64); - tube9.mirror = true; - setRotation(tube9, 0F, 0F, 0F); - tube7 = new ModelRenderer(this, 0, 0); - tube7.addBox(0F, 0F, 0F, 2, 1, 1); - tube7.setRotationPoint(3F, 9.5F, -1.5F); - tube7.setTextureSize(128, 64); - tube7.mirror = true; - setRotation(tube7, 0F, 0F, 0F); - tube6 = new ModelRenderer(this, 12, 13); - tube6.addBox(0F, 0F, 0F, 1, 2, 1); - tube6.setRotationPoint(1F, 10.5F, -4F); - tube6.setTextureSize(128, 64); - tube6.mirror = true; - setRotation(tube6, 0F, 0F, 0F); - tube5 = new ModelRenderer(this, 0, 2); - tube5.addBox(0F, 0F, 0F, 1, 1, 2); - tube5.setRotationPoint(1F, 9.5F, -4F); - tube5.setTextureSize(128, 64); - tube5.mirror = true; - setRotation(tube5, 0F, 0F, 0F); - tube4 = new ModelRenderer(this, 0, 2); - tube4.addBox(0F, 0F, 0F, 1, 1, 2); - tube4.setRotationPoint(-2F, 9.5F, -4F); - tube4.setTextureSize(128, 64); - tube4.mirror = true; - setRotation(tube4, 0F, 0F, 0F); - tube3 = new ModelRenderer(this, 12, 13); - tube3.addBox(0F, 0F, 0F, 1, 2, 1); - tube3.setRotationPoint(-2F, 10.5F, -4F); - tube3.setTextureSize(128, 64); - tube3.mirror = true; - setRotation(tube3, 0F, 0F, 0F); - tube2 = new ModelRenderer(this, 0, 0); - tube2.addBox(0F, 0F, 0F, 2, 1, 1); - tube2.setRotationPoint(-5F, 9.5F, -1.5F); - tube2.setTextureSize(128, 64); - tube2.mirror = true; - setRotation(tube2, 0F, 0F, 0F); - tube1 = new ModelRenderer(this, 0, 2); - tube1.addBox(0F, 0F, 0F, 1, 1, 2); - tube1.setRotationPoint(-5F, 9.5F, -0.5F); - tube1.setTextureSize(128, 64); - tube1.mirror = true; - setRotation(tube1, 0F, 0F, 0F); - pipe1 = new ModelRenderer(this, 40, 35); - pipe1.addBox(0F, 0F, 0F, 1, 6, 4); - pipe1.setRotationPoint(-7F, 13F, -3F); - pipe1.setTextureSize(128, 64); - pipe1.mirror = true; - setRotation(pipe1, 0F, 0F, 0F); - pipeAngle1 = new ModelRenderer(this, 18, 55); - pipeAngle1.addBox(0F, 0F, 0F, 5, 6, 3); - pipeAngle1.setRotationPoint(-5F, 13.01F, -2F); - pipeAngle1.setTextureSize(128, 64); - pipeAngle1.mirror = true; - //TODO - setRotation(pipeAngle1, 0F, -0.7853982F, 0F); - exhaust4 = new ModelRenderer(this, 0, 9); - exhaust4.addBox(0F, 0F, 0F, 1, 1, 1); - exhaust4.setRotationPoint(-1.33F, 11.5F, -6.2F); - exhaust4.setTextureSize(128, 64); - exhaust4.mirror = true; - //TODO - setRotation(exhaust4, 0.3490659F, 0F, 0F); - exhaust3 = new ModelRenderer(this, 0, 9); - exhaust3.addBox(0F, 0F, 0F, 1, 1, 1); - exhaust3.setRotationPoint(-3F, 11.5F, -6.2F); - exhaust3.setTextureSize(128, 64); - exhaust3.mirror = true; - //TODO - setRotation(exhaust3, 0.3490659F, 0F, 0F); - exhaust2 = new ModelRenderer(this, 0, 9); - exhaust2.addBox(0F, 0F, 0F, 1, 1, 1); - exhaust2.setRotationPoint(2F, 11.5F, -6.2F); - exhaust2.setTextureSize(128, 64); - exhaust2.mirror = true; - //TODO - setRotation(exhaust2, 0.3490659F, 0F, 0F); - exhaust1 = new ModelRenderer(this, 0, 9); - exhaust1.addBox(0F, 0F, 0F, 1, 1, 1); - exhaust1.setRotationPoint(0.33F, 11.5F, -6.2F); - exhaust1.setTextureSize(128, 64); - exhaust1.mirror = true; - //TODO - setRotation(exhaust1, 0.3490659F, 0F, 0F); - } - - public void render(float size) - { - base.render(size); - tank2.render(size); - portRight.render(size); - portBack.render(size); - portLeft.render(size); - tank1.render(size); - portFront.render(size); - tank3.render(size); - pipeAngle2.render(size); - connectorAngle.render(size); - pipe2.render(size); - connector.render(size); - compressor.render(size); - tube10.render(size); - tube8.render(size); - tube9.render(size); - tube7.render(size); - tube6.render(size); - tube5.render(size); - tube4.render(size); - tube3.render(size); - tube2.render(size); - tube1.render(size); - pipe1.render(size); - pipeAngle1.render(size); - exhaust4.render(size); - exhaust3.render(size); - exhaust2.render(size); - exhaust1.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java deleted file mode 100644 index 13c18a3a1..000000000 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ /dev/null @@ -1,109 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelChemicalOxidizer extends ModelBase -{ - ModelRenderer stand; - ModelRenderer tank; - ModelRenderer pipe2; - ModelRenderer bridge; - ModelRenderer pipe1; - ModelRenderer tower2; - ModelRenderer tower1; - ModelRenderer base; - ModelRenderer connector; - ModelRenderer connectorToggle; - - public ModelChemicalOxidizer() - { - textureWidth = 128; - textureHeight = 64; - - stand = new ModelRenderer(this, 0, 20); - stand.addBox(0F, 0F, 0F, 5, 1, 13); - stand.setRotationPoint(-5.5F, 19F, -6.5F); - stand.setTextureSize(128, 64); - stand.mirror = true; - setRotation(stand, 0F, 0F, 0F); - tank = new ModelRenderer(this, 66, 0); - tank.addBox(0F, 0F, 0F, 7, 12, 16); - tank.setRotationPoint(1F, 8F, -8F); - tank.setTextureSize(128, 64); - tank.mirror = true; - setRotation(tank, 0F, 0F, 0F); - pipe2 = new ModelRenderer(this, 82, 28); - pipe2.addBox(0F, 0F, 0F, 2, 6, 6); - pipe2.setRotationPoint(-7F, 13F, -3F); - pipe2.setTextureSize(128, 64); - pipe2.mirror = true; - setRotation(pipe2, 0F, 0F, 0F); - bridge = new ModelRenderer(this, 70, 0); - bridge.addBox(0F, 0F, 0F, 5, 10, 1); - bridge.setRotationPoint(-5.5F, 8.5F, -2F); - bridge.setTextureSize(128, 64); - bridge.mirror = true; - setRotation(bridge, 0F, 0F, 0F); - pipe1 = new ModelRenderer(this, 0, 0); - pipe1.addBox(0F, 0F, 0F, 1, 3, 3); - pipe1.setRotationPoint(0F, 14F, 1F); - pipe1.setTextureSize(128, 64); - pipe1.mirror = true; - setRotation(pipe1, 0F, 0F, 0F); - tower2 = new ModelRenderer(this, 36, 20); - tower2.addBox(0F, 0F, 0F, 6, 11, 8); - tower2.setRotationPoint(-6F, 8F, -1F); - tower2.setTextureSize(128, 64); - tower2.mirror = true; - setRotation(tower2, 0F, 0F, 0F); - tower1 = new ModelRenderer(this, 48, 0); - tower1.addBox(0F, 0F, 0F, 6, 11, 5); - tower1.setRotationPoint(-6F, 8F, -7F); - tower1.setTextureSize(128, 64); - tower1.mirror = true; - setRotation(tower1, 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); - connector = new ModelRenderer(this, 0, 34); - connector.addBox(0F, 0F, 0F, 1, 10, 10); - connector.setRotationPoint(-8F, 11F, -5F); - connector.setTextureSize(128, 64); - connector.mirror = true; - setRotation(connector, 0F, 0F, 0F); - connectorToggle = new ModelRenderer(this, 64, 28); - connectorToggle.addBox(0F, 0F, 0F, 1, 8, 8); - connectorToggle.setRotationPoint(7.01F, 12F, -4F); - connectorToggle.setTextureSize(128, 64); - connectorToggle.mirror = true; - setRotation(connectorToggle, 0F, 0F, 0F); - } - - public void render(float size) - { - stand.render(size); - tank.render(size); - pipe2.render(size); - bridge.render(size); - pipe1.render(size); - tower2.render(size); - tower1.render(size); - base.render(size); - connector.render(size); - connectorToggle.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} \ No newline at end of file diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java deleted file mode 100644 index 0e4c10df1..000000000 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ /dev/null @@ -1,220 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelChemicalWasher extends ModelBase -{ - ModelRenderer tankBack; - ModelRenderer base; - ModelRenderer portTop; - ModelRenderer pipe1; - ModelRenderer pipe2b; - ModelRenderer portRight; - ModelRenderer bridge1; - ModelRenderer bridge2; - ModelRenderer bridge3; - ModelRenderer conduit; - ModelRenderer bridge4; - ModelRenderer pipe2; - ModelRenderer tankLeft; - ModelRenderer connectorRight; - ModelRenderer portLeft; - ModelRenderer connectorLeft; - ModelRenderer tankRight; - ModelRenderer tubeLeft1; - ModelRenderer tubeLeft2; - ModelRenderer tubeRight3; - ModelRenderer tubeRight1; - ModelRenderer tubeRight2; - ModelRenderer tubeLeft3; - - public ModelChemicalWasher() - { - textureWidth = 128; - textureHeight = 64; - - tankBack = new ModelRenderer(this, 0, 20); - tankBack.addBox(0F, 0F, 0F, 16, 10, 6); - tankBack.setRotationPoint(-8F, 10F, 2F); - tankBack.setTextureSize(128, 64); - tankBack.mirror = true; - setRotation(tankBack, 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); - portTop = new ModelRenderer(this, 53, 33); - portTop.addBox(0F, 0F, 0F, 10, 1, 10); - portTop.setRotationPoint(-5F, 8F, -5F); - portTop.setTextureSize(128, 64); - portTop.mirror = true; - setRotation(portTop, 0F, 0F, 0F); - pipe1 = new ModelRenderer(this, 66, 9); - pipe1.addBox(0F, 0F, 0F, 7, 5, 7); - pipe1.setRotationPoint(-3.5F, 9F, -3.5F); - pipe1.setTextureSize(128, 64); - pipe1.mirror = true; - setRotation(pipe1, 0F, 0F, 0F); - pipe2b = new ModelRenderer(this, 44, 21); - pipe2b.addBox(0F, 0F, 0F, 1, 8, 4); - pipe2b.setRotationPoint(-3.49F, 14F, -3.5F); - pipe2b.setTextureSize(128, 64); - pipe2b.mirror = true; - //TODO - setRotation(pipe2b, 0.837758F, 0F, 0F); - portRight = new ModelRenderer(this, 48, 0); - portRight.addBox(0F, 0F, 0F, 1, 8, 8); - portRight.setRotationPoint(7.01F, 12F, -4F); - portRight.setTextureSize(128, 64); - portRight.mirror = true; - setRotation(portRight, 0F, 0F, 0F); - bridge1 = new ModelRenderer(this, 0, 0); - bridge1.addBox(0F, 0F, 0F, 2, 1, 1); - bridge1.setRotationPoint(-1F, 11F, -7F); - bridge1.setTextureSize(128, 64); - bridge1.mirror = true; - setRotation(bridge1, 0F, 0F, 0F); - bridge2 = new ModelRenderer(this, 0, 0); - bridge2.addBox(0F, 0F, 0F, 2, 1, 1); - bridge2.setRotationPoint(-1F, 13F, -7F); - bridge2.setTextureSize(128, 64); - bridge2.mirror = true; - setRotation(bridge2, 0F, 0F, 0F); - bridge3 = new ModelRenderer(this, 0, 0); - bridge3.addBox(0F, 0F, 0F, 2, 1, 1); - bridge3.setRotationPoint(-1F, 15F, -7F); - bridge3.setTextureSize(128, 64); - bridge3.mirror = true; - setRotation(bridge3, 0F, 0F, 0F); - conduit = new ModelRenderer(this, 0, 3); - conduit.addBox(0F, 0F, 0F, 2, 1, 2); - conduit.setRotationPoint(-1F, 19.5F, -5F); - conduit.setTextureSize(128, 64); - conduit.mirror = true; - setRotation(conduit, 0F, 0F, 0F); - bridge4 = new ModelRenderer(this, 0, 0); - bridge4.addBox(0F, 0F, 0F, 2, 1, 1); - bridge4.setRotationPoint(-1F, 17F, -7F); - bridge4.setTextureSize(128, 64); - bridge4.mirror = true; - setRotation(bridge4, 0F, 0F, 0F); - pipe2 = new ModelRenderer(this, 54, 21); - pipe2.addBox(0F, 0F, 0F, 6, 8, 4); - pipe2.setRotationPoint(-2.51F, 14F, -3.5F); - pipe2.setTextureSize(128, 64); - pipe2.mirror = true; - //TODO - setRotation(pipe2, 0.837758F, 0F, 0F); - tankLeft = new ModelRenderer(this, 0, 36); - tankLeft.addBox(0F, 0F, 0F, 7, 10, 8); - tankLeft.setRotationPoint(-8F, 10F, -8F); - tankLeft.setTextureSize(128, 64); - tankLeft.mirror = true; - setRotation(tankLeft, 0F, 0F, 0F); - connectorRight = new ModelRenderer(this, 0, 7); - connectorRight.addBox(0F, 0F, 0F, 2, 6, 2); - connectorRight.setRotationPoint(5F, 13F, 0F); - connectorRight.setTextureSize(128, 64); - connectorRight.mirror = true; - setRotation(connectorRight, 0F, 0F, 0F); - portLeft = new ModelRenderer(this, 48, 0); - portLeft.addBox(0F, 0F, 0F, 1, 8, 8); - portLeft.setRotationPoint(-8.01F, 12F, -4F); - portLeft.setTextureSize(128, 64); - portLeft.mirror = true; - setRotation(portLeft, 0F, 0F, 0F); - connectorLeft = new ModelRenderer(this, 0, 7); - connectorLeft.addBox(0F, 0F, 0F, 2, 6, 2); - connectorLeft.setRotationPoint(-7F, 13F, 0F); - connectorLeft.setTextureSize(128, 64); - connectorLeft.mirror = true; - setRotation(connectorLeft, 0F, 0F, 0F); - tankRight = new ModelRenderer(this, 0, 36); - tankRight.mirror = true; - tankRight.addBox(0F, 0F, 0F, 7, 10, 8); - tankRight.setRotationPoint(1F, 10F, -8F); - tankRight.setTextureSize(128, 64); - setRotation(tankRight, 0F, 0F, 0F); - tubeLeft1 = new ModelRenderer(this, 30, 36); - tubeLeft1.addBox(0F, 0F, -1F, 1, 2, 1); - tubeLeft1.setRotationPoint(-6F, 8.5F, 4F); - tubeLeft1.setTextureSize(128, 64); - tubeLeft1.mirror = true; - //TODO - setRotation(tubeLeft1, 0.6806784F, 0F, 0F); - tubeLeft2 = new ModelRenderer(this, 30, 36); - tubeLeft2.addBox(0F, 0F, 0F, 1, 1, 8); - tubeLeft2.setRotationPoint(-6F, 8.5F, -4F); - tubeLeft2.setTextureSize(128, 64); - tubeLeft2.mirror = true; - setRotation(tubeLeft2, 0F, 0F, 0F); - tubeRight3 = new ModelRenderer(this, 30, 39); - tubeRight3.addBox(0F, -1F, 0F, 1, 2, 1); - tubeRight3.setRotationPoint(6F, 10F, -2.5F); - tubeRight3.setTextureSize(128, 64); - tubeRight3.mirror = true; - //TODO - setRotation(tubeRight3, 0F, 0F, 0.3141593F); - tubeRight1 = new ModelRenderer(this, 30, 39); - tubeRight1.addBox(0F, -1F, 0F, 1, 2, 1); - tubeRight1.setRotationPoint(6F, 10F, -6.5F); - tubeRight1.setTextureSize(128, 64); - tubeRight1.mirror = true; - //TODO - setRotation(tubeRight1, 0F, 0F, 0.3141593F); - tubeRight2 = new ModelRenderer(this, 30, 39); - tubeRight2.addBox(0F, -1F, 0F, 1, 2, 1); - tubeRight2.setRotationPoint(6F, 10F, -4.5F); - tubeRight2.setTextureSize(128, 64); - tubeRight2.mirror = true; - //TODO - setRotation(tubeRight2, 0F, 0F, 0.3141593F); - tubeLeft3 = new ModelRenderer(this, 30, 36); - tubeLeft3.addBox(0F, 0F, 0F, 1, 2, 1); - tubeLeft3.setRotationPoint(-6F, 9.5F, -4F); - tubeLeft3.setTextureSize(128, 64); - tubeLeft3.mirror = true; - //TODO - setRotation(tubeLeft3, 0F, 0F, -0.8203047F); - } - - public void render(float size) - { - tankBack.render(size); - base.render(size); - portTop.render(size); - pipe1.render(size); - pipe2b.render(size); - portRight.render(size); - bridge1.render(size); - bridge2.render(size); - bridge3.render(size); - conduit.render(size); - bridge4.render(size); - pipe2.render(size); - tankLeft.render(size); - connectorRight.render(size); - portLeft.render(size); - connectorLeft.render(size); - tankRight.render(size); - tubeLeft1.render(size); - tubeLeft2.render(size); - tubeRight3.render(size); - tubeRight1.render(size); - tubeRight2.render(size); - tubeLeft3.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java deleted file mode 100644 index 9942e6ae1..000000000 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ /dev/null @@ -1,110 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelGasTank extends ModelBase -{ - ModelRenderer rim4; - ModelRenderer rim5; - ModelRenderer rim2; - ModelRenderer tankBase; - ModelRenderer valve; - ModelRenderer rim3; - ModelRenderer tank; - ModelRenderer rim0; - ModelRenderer valveBase; - ModelRenderer rim1; - - public ModelGasTank() - { - textureWidth = 64; - textureHeight = 32; - - rim4 = new ModelRenderer(this, 30, 0); - rim4.addBox(0F, 0F, 0F, 1, 3, 6); - rim4.setRotationPoint(3F, 8F, -3F); - rim4.setTextureSize(64, 32); - rim4.mirror = true; - setRotation(rim4, 0F, 0F, 0F); - rim4.mirror = false; - rim5 = new ModelRenderer(this, 0, 4); - rim5.addBox(0F, 0F, 0F, 2, 3, 1); - rim5.setRotationPoint(2F, 8F, -4F); - rim5.setTextureSize(64, 32); - rim5.mirror = true; - setRotation(rim5, 0F, 0F, 0F); - rim2 = new ModelRenderer(this, 30, 0); - rim2.addBox(0F, 0F, 0F, 1, 3, 6); - rim2.setRotationPoint(-4F, 8F, -3F); - rim2.setTextureSize(64, 32); - rim2.mirror = true; - setRotation(rim2, 0F, 0F, 0F); - tankBase = new ModelRenderer(this, 0, 22); - tankBase.addBox(0F, 0F, 0F, 9, 1, 9); - tankBase.setRotationPoint(-4.5F, 22.5F, -4.5F); - tankBase.setTextureSize(64, 32); - tankBase.mirror = true; - setRotation(tankBase, 0F, 0F, 0F); - valve = new ModelRenderer(this, 46, 0); - valve.addBox(0F, 0F, 0F, 3, 1, 3); - valve.setRotationPoint(-1.5F, 8.5F, -1.5F); - valve.setTextureSize(64, 32); - valve.mirror = true; - setRotation(valve, 0F, 0F, 0F); - rim3 = new ModelRenderer(this, 44, 5); - rim3.addBox(0F, 0F, 0F, 8, 3, 1); - rim3.setRotationPoint(-4F, 8F, 3F); - rim3.setTextureSize(64, 32); - rim3.mirror = true; - setRotation(rim3, 0F, 0F, 0F); - tank = new ModelRenderer(this, 0, 0); - tank.addBox(0F, 0F, 0F, 10, 12, 10); - tank.setRotationPoint(-5F, 10.5F, -5F); - tank.setTextureSize(64, 32); - tank.mirror = true; - setRotation(tank, 0F, 0F, 0F); - rim0 = new ModelRenderer(this, 0, 8); - rim0.addBox(0F, 0F, 0F, 4, 1, 1); - rim0.setRotationPoint(-2F, 10F, -4F); - rim0.setTextureSize(64, 32); - rim0.mirror = true; - setRotation(rim0, 0F, 0F, 0F); - valveBase = new ModelRenderer(this, 38, 0); - valveBase.addBox(0F, 0F, 0F, 2, 1, 2); - valveBase.setRotationPoint(-1F, 9.5F, -1F); - valveBase.setTextureSize(64, 32); - valveBase.mirror = true; - setRotation(valveBase, 0F, 0F, 0F); - rim1 = new ModelRenderer(this, 0, 0); - rim1.addBox(0F, 0F, 0F, 2, 3, 1); - rim1.setRotationPoint(-4F, 8F, -4F); - rim1.setTextureSize(64, 32); - rim1.mirror = true; - setRotation(rim1, 0F, 0F, 0F); - } - - public void render(float size) - { - rim4.render(size); - rim5.render(size); - rim2.render(size); - tankBase.render(size); - valve.render(size); - rim3.render(size); - tank.render(size); - rim0.render(size); - valveBase.render(size); - rim1.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java deleted file mode 100644 index a7c1b4365..000000000 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ /dev/null @@ -1,165 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelMetallurgicInfuser extends ModelBase -{ - ModelRenderer base; - ModelRenderer back; - ModelRenderer connector1; - ModelRenderer connector2; - ModelRenderer sideRight; - ModelRenderer top; - ModelRenderer sideLeft; - ModelRenderer tap1; - ModelRenderer tap2; - ModelRenderer tapBase1; - ModelRenderer tapBase2; - ModelRenderer divider; - ModelRenderer plate1; - ModelRenderer plate2; - ModelRenderer plate3; - ModelRenderer bar1; - ModelRenderer bar2; - - public ModelMetallurgicInfuser() - { - textureWidth = 128; - textureHeight = 64; - - 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); - back = new ModelRenderer(this, 42, 20); - back.addBox(0F, 0F, 0F, 16, 12, 1); - back.setRotationPoint(-8F, 8F, 7F); - back.setTextureSize(128, 64); - back.mirror = true; - setRotation(back, 0F, 0F, 0F); - connector1 = new ModelRenderer(this, 0, 8); - connector1.addBox(0F, 0F, 0F, 1, 5, 3); - connector1.setRotationPoint(-4F, 8.5F, -3F); - connector1.setTextureSize(128, 64); - connector1.mirror = true; - setRotation(connector1, 0F, 0F, 0F); - connector2 = new ModelRenderer(this, 0, 8); - connector2.addBox(0F, 0F, 0F, 1, 5, 3); - connector2.setRotationPoint(3F, 8.5F, -3F); - connector2.setTextureSize(128, 64); - connector2.mirror = true; - setRotation(connector2, 0F, 0F, 0F); - sideRight = new ModelRenderer(this, 64, 0); - sideRight.mirror = true; - sideRight.addBox(0F, 0F, 0F, 1, 11, 7); - sideRight.setRotationPoint(7F, 9F, 0F); - sideRight.setTextureSize(128, 64); - setRotation(sideRight, 0F, 0F, 0F); - top = new ModelRenderer(this, 80, 0); - top.addBox(0F, 0F, 0F, 16, 1, 7); - top.setRotationPoint(-8F, 8F, 0F); - top.setTextureSize(128, 64); - top.mirror = true; - setRotation(top, 0F, 0F, 0F); - sideLeft = new ModelRenderer(this, 64, 0); - sideLeft.addBox(0F, 0F, 0F, 1, 11, 7); - sideLeft.setRotationPoint(-8F, 9F, 0F); - sideLeft.setTextureSize(128, 64); - sideLeft.mirror = true; - setRotation(sideLeft, 0F, 0F, 0F); - tap1 = new ModelRenderer(this, 80, 8); - tap1.addBox(0F, 0F, 0F, 2, 1, 11); - tap1.setRotationPoint(-4.5F, 11.5F, -4F); - tap1.setTextureSize(128, 64); - tap1.mirror = true; - setRotation(tap1, 0F, 0F, 0F); - tap2 = new ModelRenderer(this, 80, 8); - tap2.addBox(0F, 0F, 0F, 2, 1, 11); - tap2.setRotationPoint(2.5F, 11.5F, -4F); - tap2.setTextureSize(128, 64); - tap2.mirror = true; - setRotation(tap2, 0F, 0F, 0F); - tapBase1 = new ModelRenderer(this, 4, 0); - tapBase1.addBox(0F, 0F, 0F, 2, 1, 2); - tapBase1.setRotationPoint(-4.5F, 12.5F, 5F); - tapBase1.setTextureSize(128, 64); - tapBase1.mirror = true; - setRotation(tapBase1, 0F, 0F, 0F); - tapBase2 = new ModelRenderer(this, 4, 0); - tapBase2.addBox(0F, 0F, 0F, 2, 1, 2); - tapBase2.setRotationPoint(2.5F, 12.5F, 5F); - tapBase2.setTextureSize(128, 64); - tapBase2.mirror = true; - setRotation(tapBase2, 0F, 0F, 0F); - divider = new ModelRenderer(this, 66, 20); - divider.addBox(0F, 0F, 0F, 13, 1, 14); - divider.setRotationPoint(-6.5F, 16F, -6.5F); - divider.setTextureSize(128, 64); - divider.mirror = true; - setRotation(divider, 0F, 0F, 0F); - plate1 = new ModelRenderer(this, 0, 20); - plate1.addBox(0F, 0F, 0F, 14, 3, 14); - plate1.setRotationPoint(-7F, 9F, -7F); - plate1.setTextureSize(128, 64); - plate1.mirror = true; - setRotation(plate1, 0F, 0F, 0F); - plate2 = new ModelRenderer(this, 0, 37); - plate2.addBox(0F, 0F, 0F, 14, 3, 14); - plate2.setRotationPoint(-7F, 13F, -7F); - plate2.setTextureSize(128, 64); - plate2.mirror = true; - setRotation(plate2, 0F, 0F, 0F); - plate3 = new ModelRenderer(this, 0, 37); - plate3.addBox(0F, 0F, 0F, 14, 3, 14); - plate3.setRotationPoint(-7F, 17F, -7F); - plate3.setTextureSize(128, 64); - plate3.mirror = true; - setRotation(plate3, 0F, 0F, 0F); - bar1 = new ModelRenderer(this, 0, 0); - bar1.addBox(0F, 0F, 0F, 1, 1, 1); - bar1.setRotationPoint(-6.5F, 12F, -6.5F); - bar1.setTextureSize(128, 64); - bar1.mirror = true; - setRotation(bar1, 0F, 0F, 0F); - bar2 = new ModelRenderer(this, 0, 0); - bar2.addBox(0F, 0F, 0F, 1, 1, 1); - bar2.setRotationPoint(5.5F, 12F, -6.5F); - bar2.setTextureSize(128, 64); - bar2.mirror = true; - setRotation(bar2, 0F, 0F, 0F); - } - - public void render(float size) - { - base.render(size); - back.render(size); - connector1.render(size); - connector2.render(size); - sideRight.render(size); - top.render(size); - sideLeft.render(size); - tap1.render(size); - tap2.render(size); - tapBase1.render(size); - tapBase2.render(size); - divider.render(size); - plate1.render(size); - plate2.render(size); - plate3.render(size); - bar1.render(size); - bar2.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java deleted file mode 100644 index 10f9cfd1e..000000000 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ /dev/null @@ -1,109 +0,0 @@ -package mekanism.client.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class ModelPressurizedReactionChamber extends ModelBase -{ - ModelRenderer frontDivider1; - ModelRenderer base; - ModelRenderer front; - ModelRenderer bar1; - ModelRenderer body; - ModelRenderer bar5; - ModelRenderer bar4; - ModelRenderer bar3; - ModelRenderer bar2; - ModelRenderer frontDivider2; - - public ModelPressurizedReactionChamber() - { - textureWidth = 128; - textureHeight = 64; - - frontDivider1 = new ModelRenderer(this, 52, 20); - frontDivider1.addBox(0F, 0F, 0F, 2, 12, 6); - frontDivider1.setRotationPoint(-7F, 8.5F, -7.5F); - frontDivider1.setTextureSize(128, 64); - frontDivider1.mirror = true; - setRotation(frontDivider1, 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); - front = new ModelRenderer(this, 48, 0); - front.addBox(0F, 0F, 0F, 9, 11, 5); - front.setRotationPoint(-2F, 9F, -7F); - front.setTextureSize(128, 64); - front.mirror = true; - setRotation(front, 0F, 0F, 0F); - bar1 = new ModelRenderer(this, 0, 0); - bar1.addBox(0F, 0F, 0F, 1, 1, 5); - bar1.setRotationPoint(-5F, 18F, -7F); - bar1.setTextureSize(128, 64); - bar1.mirror = true; - setRotation(bar1, 0F, 0F, 0F); - body = new ModelRenderer(this, 0, 20); - body.addBox(0F, 0F, 0F, 16, 12, 10); - body.setRotationPoint(-8F, 8F, -2F); - body.setTextureSize(128, 64); - body.mirror = true; - setRotation(body, 0F, 0F, 0F); - bar5 = new ModelRenderer(this, 0, 0); - bar5.addBox(0F, 0F, 0F, 1, 1, 5); - bar5.setRotationPoint(-5F, 10F, -7F); - bar5.setTextureSize(128, 64); - bar5.mirror = true; - setRotation(bar5, 0F, 0F, 0F); - bar4 = new ModelRenderer(this, 0, 0); - bar4.addBox(0F, 0F, 0F, 1, 1, 5); - bar4.setRotationPoint(-5F, 12F, -7F); - bar4.setTextureSize(128, 64); - bar4.mirror = true; - setRotation(bar4, 0F, 0F, 0F); - bar3 = new ModelRenderer(this, 0, 0); - bar3.addBox(0F, 0F, 0F, 1, 1, 5); - bar3.setRotationPoint(-5F, 14F, -7F); - bar3.setTextureSize(128, 64); - bar3.mirror = true; - setRotation(bar3, 0F, 0F, 0F); - bar2 = new ModelRenderer(this, 0, 0); - bar2.addBox(0F, 0F, 0F, 1, 1, 5); - bar2.setRotationPoint(-5F, 16F, -7F); - bar2.setTextureSize(128, 64); - bar2.mirror = true; - setRotation(bar2, 0F, 0F, 0F); - frontDivider2 = new ModelRenderer(this, 52, 20); - frontDivider2.mirror = true; - frontDivider2.addBox(0F, 0F, 0F, 2, 12, 6); - frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); - frontDivider2.setTextureSize(128, 64); - setRotation(frontDivider2, 0F, 0F, 0F); - } - - public void render(float size) - { - frontDivider1.render(size); - base.render(size); - front.render(size); - bar1.render(size); - body.render(size); - bar5.render(size); - bar4.render(size); - bar3.render(size); - bar2.render(size); - frontDivider2.render(size); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } -} diff --git a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java index f09a7f23b..b6441c650 100644 --- a/src/main/java/mekanism/client/model/ModelSeismicVibrator.java +++ b/src/main/java/mekanism/client/model/ModelSeismicVibrator.java @@ -106,7 +106,6 @@ public class ModelSeismicVibrator extends ModelBase arm3.setRotationPoint(-1F, 7F, 3F); arm3.setTextureSize(128, 64); arm3.mirror = true; - //TODO setRotation(arm3, -0.3665191F, 0F, 0F); plate2 = new ModelRenderer(this, 48, 0); plate2.addBox(0F, 0F, 0F, 4, 2, 4); @@ -137,7 +136,6 @@ public class ModelSeismicVibrator extends ModelBase frameBack5.setRotationPoint(7.5F, 7F, 6.49F); frameBack5.setTextureSize(128, 64); frameBack5.mirror = true; - //TODO setRotation(frameBack5, 0F, 0F, 0.837758F); pole3 = new ModelRenderer(this, 0, 34); pole3.addBox(0F, 0F, 0F, 1, 25, 1); @@ -150,7 +148,6 @@ public class ModelSeismicVibrator extends ModelBase frameRight5.setRotationPoint(6.485F, 7F, -7.5F); frameRight5.setTextureSize(128, 64); frameRight5.mirror = true; - //TODO setRotation(frameRight5, 0.837758F, 0F, 0F); baseRight = new ModelRenderer(this, 38, 18); baseRight.mirror = true; @@ -187,35 +184,30 @@ public class ModelSeismicVibrator extends ModelBase frameRight4.setRotationPoint(6.49F, 7F, 7.5F); frameRight4.setTextureSize(128, 64); frameRight4.mirror = true; - //TODO setRotation(frameRight4, -0.837758F, 0F, 0F); frameRight1 = new ModelRenderer(this, 4, 34); frameRight1.addBox(0F, 0F, 0F, 1, 19, 1); frameRight1.setRotationPoint(6.485F, -6F, -7.5F); frameRight1.setTextureSize(128, 64); frameRight1.mirror = true; - //TODO setRotation(frameRight1, 0.837758F, 0F, 0F); frameRight2 = new ModelRenderer(this, 4, 34); frameRight2.addBox(0F, 0F, -1F, 1, 19, 1); frameRight2.setRotationPoint(6.49F, -6F, 7.5F); frameRight2.setTextureSize(128, 64); frameRight2.mirror = true; - //TODO setRotation(frameRight2, -0.837758F, 0F, 0F); frameLeft5 = new ModelRenderer(this, 4, 34); frameLeft5.addBox(0F, 0F, 0F, 1, 19, 1); frameLeft5.setRotationPoint(-7.485F, 7F, -7.5F); frameLeft5.setTextureSize(128, 64); frameLeft5.mirror = true; - //TODO setRotation(frameLeft5, 0.837758F, 0F, 0F); frameLeft4 = new ModelRenderer(this, 4, 34); frameLeft4.addBox(0F, 0F, -1F, 1, 19, 1); frameLeft4.setRotationPoint(-7.49F, 7F, 7.5F); frameLeft4.setTextureSize(128, 64); frameLeft4.mirror = true; - //TODO setRotation(frameLeft4, -0.837758F, 0F, 0F); frameBack3 = new ModelRenderer(this, 36, 52); frameBack3.addBox(0F, 0F, 0F, 13, 1, 1); @@ -228,14 +220,12 @@ public class ModelSeismicVibrator extends ModelBase frameLeft2.setRotationPoint(-7.485F, -6F, -7.5F); frameLeft2.setTextureSize(128, 64); frameLeft2.mirror = true; - //TODO setRotation(frameLeft2, 0.837758F, 0F, 0F); frameLeft1 = new ModelRenderer(this, 4, 34); frameLeft1.addBox(0F, 0F, -1F, 1, 19, 1); frameLeft1.setRotationPoint(-7.49F, -6F, 7.5F); frameLeft1.setTextureSize(128, 64); frameLeft1.mirror = true; - //TODO setRotation(frameLeft1, -0.837758F, 0F, 0F); pole2 = new ModelRenderer(this, 0, 34); pole2.addBox(0F, 0F, 0F, 1, 25, 1); @@ -248,21 +238,18 @@ public class ModelSeismicVibrator extends ModelBase frameBack1.setRotationPoint(7.5F, -6F, 6.49F); frameBack1.setTextureSize(128, 64); frameBack1.mirror = true; - //TODO setRotation(frameBack1, 0F, 0F, 0.837758F); frameBack2 = new ModelRenderer(this, 4, 34); frameBack2.addBox(0F, 0F, 0F, 1, 19, 1); frameBack2.setRotationPoint(-7.5F, -6F, 6.49F); frameBack2.setTextureSize(128, 64); frameBack2.mirror = true; - //TODO setRotation(frameBack2, 0F, 0F, -0.837758F); frameBack4 = new ModelRenderer(this, 4, 34); frameBack4.addBox(0F, 0F, 0F, 1, 19, 1); frameBack4.setRotationPoint(-7.5F, 7F, 6.49F); frameBack4.setTextureSize(128, 64); frameBack4.mirror = true; - //TODO setRotation(frameBack4, 0F, 0F, -0.837758F); frameLeft3 = new ModelRenderer(this, 64, 27); frameLeft3.addBox(0F, 0F, 0F, 1, 1, 13); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 3ad465f55..0fbbb7e82 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -7,11 +7,14 @@ import javax.vecmath.Matrix4f; import mekanism.client.model.ModelArmoredJetpack; import mekanism.client.model.ModelAtomicDisassembler; +import mekanism.client.model.ModelChemicalCrystallizer; +import mekanism.client.model.ModelChemicalDissolutionChamber; import mekanism.client.model.ModelFlamethrower; import mekanism.client.model.ModelFreeRunners; import mekanism.client.model.ModelGasMask; import mekanism.client.model.ModelJetpack; import mekanism.client.model.ModelScubaTank; +import mekanism.client.model.ModelSeismicVibrator; import mekanism.client.model.ModelSolarNeutronActivator; import mekanism.client.render.ctm.ModelChiselBlock; import mekanism.client.render.tileentity.RenderBin; @@ -74,6 +77,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel public static ModelFlamethrower flamethrower = new ModelFlamethrower(); public static ModelChest personalChest = new ModelChest(); public static ModelSolarNeutronActivator solarNeutronActivator = new ModelSolarNeutronActivator(); + public static ModelSeismicVibrator seismicVibrator = new ModelSeismicVibrator(); + public static ModelChemicalDissolutionChamber chemicalDissolutionChamber = new ModelChemicalDissolutionChamber(); + public static ModelChemicalCrystallizer chemicalCrystallizer = new ModelChemicalCrystallizer(); public BakedCustomItemModel(IBakedModel model, ItemStack s) { @@ -142,6 +148,28 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SolarNeutronActivator.png")); solarNeutronActivator.render(0.0625F); } + else if(machineType == MachineType.SEISMIC_VIBRATOR) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glScalef(0.6F, 0.6F, 0.6F); + GL11.glTranslatef(0.0F, -0.55F, 0.0F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "SeismicVibrator.png")); + seismicVibrator.render(0.0625F); + } + else if(machineType == MachineType.CHEMICAL_CRYSTALLIZER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.05F, -1.02F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); + chemicalCrystallizer.render(0.0625F); + } + else if(machineType == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) + { + GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.05F, -1.02F, 0.05F); + mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); + chemicalDissolutionChamber.render(0.0625F); + } return; } @@ -343,6 +371,11 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel GlStateManager.scale(0.5F, 0.5F, 0.5F); doRender(cameraTransformType); GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.enableLighting(); + GlStateManager.enableLight(0); + GlStateManager.enableLight(1); + GlStateManager.enableColorMaterial(); + GlStateManager.colorMaterial(1032, 5634); GlStateManager.popMatrix(); return Pair.of(this, null); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index e7dc091f0..a4f4733e6 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -10,8 +10,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer { @@ -21,7 +19,7 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer -{ - private ModelChemicalInfuser model = new ModelChemicalInfuser(); - - @Override - public void renderTileEntityAt(TileEntityChemicalInfuser tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java deleted file mode 100644 index 5859cb8e7..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ /dev/null @@ -1,48 +0,0 @@ -package mekanism.client.render.tileentity; - -import java.util.HashMap; -import java.util.Map; - -import mekanism.api.gas.Gas; -import mekanism.client.model.ModelChemicalOxidizer; -import mekanism.client.render.MekanismRenderer.DisplayInteger; -import mekanism.common.tile.TileEntityChemicalOxidizer; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.EnumFacing; - -import org.lwjgl.opengl.GL11; - -public class RenderChemicalOxidizer extends TileEntitySpecialRenderer -{ - private ModelChemicalOxidizer model = new ModelChemicalOxidizer(); - - private static final double offset = 0.001; - - private Map> cachedGasses = new HashMap>(); - - @Override - public void renderTileEntityAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - - model.render(0.0625F); - - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java deleted file mode 100644 index e541cdfbe..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java +++ /dev/null @@ -1,35 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelChemicalWasher; -import mekanism.common.tile.TileEntityChemicalWasher; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderChemicalWasher extends TileEntitySpecialRenderer -{ - private ModelChemicalWasher model = new ModelChemicalWasher(); - - @Override - public void renderTileEntityAt(TileEntityChemicalWasher tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index b6e2bbbb5..bba54ec96 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -5,6 +5,7 @@ import java.util.HashMap; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; +import mekanism.client.render.MekanismRenderer.Model3D; import mekanism.common.SideData; import mekanism.common.base.ISideConfiguration; import mekanism.common.item.ItemConfigurator; @@ -14,6 +15,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; @@ -103,13 +105,13 @@ public class RenderConfigurableMachine -{ - private ModelElectrolyticSeparator model = new ModelElectrolyticSeparator(); - - @Override - public void renderTileEntityAt(TileEntityElectrolyticSeparator tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 2.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90F, 0.0F, 1.0F, 0.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index 71da113b3..bf0035742 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -1,40 +1,17 @@ package mekanism.client.render.tileentity; -import mekanism.client.model.ModelGasTank; +import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityGasTank; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderGasTank extends TileEntitySpecialRenderer { - private ModelGasTank model = new ModelGasTank(); - @Override public void renderTileEntityAt(TileEntityGasTank tileEntity, double x, double y, double z, float partialTick, int destroyStage) { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tileEntity.tier.getBaseTier().getSimpleName() + ".png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - - //TODO MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); + MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage); } } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java deleted file mode 100644 index 5aca86ebf..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java +++ /dev/null @@ -1,62 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityLaserAmplifier; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderLaserAmplifier extends TileEntitySpecialRenderer -{ - private ModelLaserAmplifier model = new ModelLaserAmplifier(); - - @Override - public void renderTileEntityAt(TileEntityLaserAmplifier tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserAmplifier.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 0: - GlStateManager.translate(0.0F, -2.0F, 0.0F); - GlStateManager.rotate(180F, 1.0F, 0.0F, 0.0F); - break; - case 5: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, -1.0F); - break; - case 4: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(-1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, 1.0F); - break; - case 2: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, -1.0F); - GlStateManager.rotate(90, -1.0F, 0.0F, 0.0F); - break; - case 3: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 1.0F, 0.0F, 0.0F); - break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - MekanismRenderer.blendOn(); - model.render(0.0625F); - MekanismRenderer.blendOff(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java b/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java deleted file mode 100644 index c3cbc8c71..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelLaserAmplifier; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityLaserTractorBeam; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; - -import org.lwjgl.opengl.GL11; - -public class RenderLaserTractorBeam extends TileEntitySpecialRenderer -{ - private ModelLaserAmplifier model = new ModelLaserAmplifier(); - - @Override - public void renderTileEntityAt(TileEntityLaserTractorBeam tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "LaserTractorBeam.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 0: - GlStateManager.translate(0.0F, -2.0F, 0.0F); - GlStateManager.rotate(180F, 1.0F, 0.0F, 0.0F); - break; - case 5: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, -1.0F); - break; - case 4: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(-1.0F, 0.0F, 0.0F); - GlStateManager.rotate(90, 0.0F, 0.0F, 1.0F); - break; - case 2: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, -1.0F); - GlStateManager.rotate(90, -1.0F, 0.0F, 0.0F); - break; - case 3: - GlStateManager.translate(0.0F, -1.0F, 0.0F); - GlStateManager.translate(0.0F, 0.0F, 1.0F); - GlStateManager.rotate(90, 1.0F, 0.0F, 0.0F); - break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - MekanismRenderer.blendOn(); - model.render(0.0625F); - MekanismRenderer.blendOff(); - GlStateManager.popMatrix(); - } -} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java deleted file mode 100644 index 2c4a3f4f8..000000000 --- a/src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.client.render.tileentity; - -import mekanism.client.model.ModelPressurizedReactionChamber; -import mekanism.client.render.MekanismRenderer; -import mekanism.common.tile.TileEntityPRC; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import org.lwjgl.opengl.GL11; - -@SideOnly(Side.CLIENT) -public class RenderPressurizedReactionChamber extends TileEntitySpecialRenderer -{ - private ModelPressurizedReactionChamber model = new ModelPressurizedReactionChamber(); - - @Override - public void renderTileEntityAt(TileEntityPRC tileEntity, double x, double y, double z, float partialTick, int destroyStage) - { - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x + 0.5F, (float)y + 1.5F, (float)z + 1.5F); - - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); - - switch(tileEntity.facing.ordinal()) /*TODO: switch the enum*/ - { - case 2: GlStateManager.rotate(0, 0.0F, 1.0F, 0.0F); break; - case 3: GlStateManager.rotate(180, 0.0F, 1.0F, 0.0F); break; - case 4: GlStateManager.rotate(90, 0.0F, 1.0F, 0.0F); break; - case 5: GlStateManager.rotate(270, 0.0F, 1.0F, 0.0F); break; - } - - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); - GlStateManager.popMatrix(); - - MekanismRenderer.machineRenderer.renderTileEntityAt(tileEntity, x, y, z, partialTick, destroyStage); - } -} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index 4a41c9c52..3645f52cd 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -20,7 +20,7 @@ public class RenderSeismicVibrator extends TileEntitySpecialRenderer