From 8493e6f4d1fdf5079c9cee75ca166d5f8bef19cb Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 11 May 2016 19:09:28 -0400 Subject: [PATCH] Begin overhauling TE renders. Certain blocks are gonna need to remain TESRs --- .../java/mekanism/client/ClientProxy.java | 40 +- .../client/model/ModelChemicalInfuser.java | 268 -------- .../client/model/ModelChemicalOxidizer.java | 109 ---- .../client/model/ModelChemicalWasher.java | 220 ------- .../mekanism/client/model/ModelGasTank.java | 110 ---- .../client/model/ModelMetallurgicInfuser.java | 165 ----- .../ModelPressurizedReactionChamber.java | 109 ---- .../client/model/ModelSeismicVibrator.java | 13 - .../render/item/BakedCustomItemModel.java | 33 + .../RenderChemicalCrystallizer.java | 14 +- .../RenderChemicalDissolutionChamber.java | 2 +- .../tileentity/RenderChemicalInfuser.java | 37 -- .../tileentity/RenderChemicalOxidizer.java | 48 -- .../tileentity/RenderChemicalWasher.java | 35 -- .../tileentity/RenderConfigurableMachine.java | 13 +- .../RenderElectrolyticSeparator.java | 39 -- .../render/tileentity/RenderGasTank.java | 27 +- .../tileentity/RenderLaserAmplifier.java | 62 -- .../tileentity/RenderLaserTractorBeam.java | 59 -- .../RenderPressurizedReactionChamber.java | 42 -- .../tileentity/RenderSeismicVibrator.java | 2 +- .../java/mekanism/common/CommonProxy.java | 17 +- src/main/java/mekanism/common/Mekanism.java | 33 +- .../tile/TileEntityChemicalCrystallizer.java | 4 - .../blockstates/chemical_crystallizer.json | 2 +- .../chemical_dissolution_chamber.json | 2 +- .../blockstates/formulaic_assemblicator.json | 1 + .../blockstates/seismic_vibrator.json | 2 +- .../mekanism/gui/GuiChemicalCrystallizer.png | Bin 18862 -> 8644 bytes .../mekanism/models/block/chargepad.json | 2 +- .../models/block/chemical_crystallizer.json | 229 ------- .../block/chemical_dissolution_chamber.json | 398 ------------ .../models/block/chemical_infuser.json | 2 +- .../models/block/chemical_oxidizer.json | 2 +- .../mekanism/models/block/electric_pump.json | 132 +--- .../models/block/electrolytic_separator.json | 2 +- .../mekanism/models/block/energy_cube.json | 2 +- .../assets/mekanism/models/block/factory.json | 13 - .../models/block/fluidic_plenisher.json | 13 - .../mekanism/models/block/gas_tank.json | 2 +- .../assets/mekanism/models/block/laser.json | 4 +- .../models/block/laser_amplifier.json | 2 +- .../block/pressurized_reaction_chamber.json | 2 +- .../models/block/quantum_entangloporter.json | 2 +- .../models/block/resistive_heater.json | 2 +- .../models/block/rotary_condensentrator.json | 2 +- .../models/block/seismic_vibrator.json | 593 ------------------ .../mekanism/models/block/solar_tri.obj | 513 --------------- 48 files changed, 100 insertions(+), 3325 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/ModelChemicalInfuser.java delete mode 100644 src/main/java/mekanism/client/model/ModelChemicalOxidizer.java delete mode 100644 src/main/java/mekanism/client/model/ModelChemicalWasher.java delete mode 100644 src/main/java/mekanism/client/model/ModelGasTank.java delete mode 100644 src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java delete mode 100644 src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderChemicalInfuser.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderChemicalWasher.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderLaserAmplifier.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderLaserTractorBeam.java delete mode 100644 src/main/java/mekanism/client/render/tileentity/RenderPressurizedReactionChamber.java delete mode 100644 src/main/resources/assets/mekanism/models/block/chemical_crystallizer.json delete mode 100644 src/main/resources/assets/mekanism/models/block/chemical_dissolution_chamber.json delete mode 100644 src/main/resources/assets/mekanism/models/block/factory.json delete mode 100644 src/main/resources/assets/mekanism/models/block/seismic_vibrator.json delete mode 100644 src/main/resources/assets/mekanism/models/block/solar_tri.obj 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 TileEntitySpecialRendererB{&o7URbwZHvcdw{0;P{WjxrzdV5z4co< zq$XPeR=+j?-X=+EQd)FqiW<~cFKKf~co$e-WZO|?zG%>W(X-gL7`)W^ zgnNV621WwokP5>htc~ zW7e3n55%aPJZ%Ow4)sv)(_Y3bY5gI@lm+_EC3r38=cWU{ zi#*@uat4fRirALuGQ=g0NLs4@J~c75<>2k%#qA^OVN#TV2ukLK;si?1GFEtN5!E-mAgFqy9? zr{`VkTR6H+ab`s7QRQdT7z}`LjZS@P7dpJup%?ufDVhGY81%iD0@)Z{^4?%CaTlv| zGTqtxN+z!lDJEiKLY8`u9g68^pbdG}2vUn3O;kc^88}vxM}G~I>fK%LV7Tx7w4PsO z1iRXvM+{*418uz{;{!_reL#DK+0{$<%R9xH?|~% z50r6POjJSHgyGdn-c;9$HimsD`ax`QVR|-Cz_so5DHh_3?B1hUSv-SCvh16kHx7*2 zkSK;J1p&1d{7M;}ORVvT@Ng5Pk+qLuaZE%%d=J+lI;&IkB_$KJm@hOmh2^tR1+9x@ zsP9Z1XglV0fg=!x*U(95-tx?4-XTYQuzhUgwD>k&N2i5BwOXr<2wuwQ#lOZAg>W}vR4)%Y%Y@e9H6CuW+hs9qV>m!fQO5*s=^y>^e< z)uo$TScGOxa>`cC1co(4t)lsOdEY9j1qGtqozgZrpewxVQJT~UhmWsPj%BC=L2!by z-NB`dD$EKWkL@0wS*ty>>An;QG{2!pD!Nz{YA}9Yx0wD~(?R)w%$eMI5B>Bm&EiS; zSchiu_xWnxF(FyhiQkOxewc)NZ;tD`-|y}6jOn$@u#C%`>ccc#vhVlS+5zkSql7u7 zKuwC>Vx&hEb?Ari@d{;Co8V}3(pv7ZBQpa`u}Hr%^Pwe%VV8j-H3Ac}D7WfLqOiUJ zzMqsPApnv||K&R$!!icmk|JvtHHpr7Lx~bG3k9Ec9J82t)z}{7q}~uR*Y@0fKLSZg zLm6#w#T7-Oik=Tqe&6)JkJTIsNO_G<=GMI&W7i1Xz=N z5?PchJwjA&VY>MKWck3dvEyqd@OdcLedqY#Z)Vn=9sVl^v&FcC4gjUXp-OpRx#pge zp3&d8?2Mhzn9(=|6T>@5%*)6tSWL2rLu|An&kSBF!`pJz^<=roD>K06`f}g$2$0Q7 zA3P-(xy7rn|2nRSUKcX#tDAW0=K_~yLCSZ`k$1j#{*fy>*L6{B>CT`nR`VLK+IgEP zuPuBo7gt7LryGHfO?AsG%e}EK1r$GTT71#C6T2q8b+|_0O43fFf2B!-&K~IR^)VC_ z5cb*n3kvYRp1gF*HwaPC^U8;RWv+_*`MsTw`)nrlz92h`dhr-?-sRx!u1DIUm;~&5 zRA25xO;^((!G)~jqou_lhZD!i2~}ZuQyK(`8h0G&<^Y5CM-(2tB!=N`&#kzyzjoOi z2^z$7Z;}(z84r&cVxp9y)!x?V9bAf;UxQ-rAyi(%rAy?K@s1E3892MzJ#4#4g4nnF zkuAzBD757%IwE_r!X7yvQbZ1k2qL6Wb1vkevBFRibye+c5B|V2opJpv%LJeDsgOBV zYWDmUKuzNC8u^{$ISXbfl1)Azi6RzSn({IO1id2er_FkMN zN~T{pbpP^Z(_R`TtyjV#;#ZxY&y=fN`3-`R;Sud*46OKPYcjaqu zw`gn&&Y?}56dd9^eGZtN)NQib7{8ri3YaaWXIXFf914hUZ*-kdoF|94-|RSdh@MJ{ zHUS4z#COC{WZEAE1!Wf6Xl`)E^!)tu*>d3G$=j{Um+qtHraPLuHPvx05p$ec%CiX$ zFQafbhHZT{P0F`2;3p1muqfMEB8D8tG3UqUv2`VHWVrWQO515WLx#z3Tqj-wP4EKB zM3Db-IEu{tP)()8*=aQl*(bPMEt$0bwi{DBuGl`<*r z_`~ty905855UUafgvQHMC&ARp-SWIGz&v@cnJSLwdSgcPTs@X`!E1!57t49>iXDo{ zQP(2R+QdJyhIL!W&ultfun@>uNcQeip~z*@>bDs)n%tIF7p(|xvP!JqmAr4xg&MaF zyRYWr69GwPu)sJguCZb0xXD@@r9b_3HVRwXnulgJ1N_$yEMu^@J1E9#g!4FF;Vwz% zrLC7D&YAG01Gr@F{o`&%LY7O_pN<1h2|SMaTU=UnZl@P6KagN-{;WQ3C*#wU3j{)ro(||8#zDS2a{X{yxg6K z!1r(6Lb2hdBIbv1)3Cxa^<*XMJn7=jeKb49Ltc+{JX`&e?pGG8N%pAoK~h4004xcA zIB{vW{D0IZhDv!|DoUobXgRw|v9(2eVI-DU%#W8QGHhHs&=&_+>tk6c(xXF5tfhB{ zSk3wD=2=@_Gr#g+On(vD1$*6JS#whxNdLx3<^=itiGAjG6txaUp@=A~+8MW>G^)mm z(V3M(xw*6vr)_Un*;rATp}Ok2Dy^*^!@`bNum@L{m%>rhLP7rT9bT?tzVmMxsKvOA zd8lu*l!rrZucuotWA`uo96f5E0B^iqXNDoA-2Z5!r2&)!06NyLGRtHn^O0&zRAI(X0a?LrGHLs zrNaXfy9wb7#?sz4ojX7rZa(m`J}^B!qq+t;P)drE-3+Zna|+}jz`UwAqV{ap5xIm5 zdOFf}80Uaxyj}945P#hBEO*9mPbLsN|IT;O^CB_=hltBKE~%-*CmCfKFVuyA*#Xba z3ykJ=z{1^sVwu1IYSp8v5DaXnvN+e$lsuW=K@`Agn(m4=tnmUH!`RQyLi*8f_P8>g zi<356r+bRArwfEDpJ&6if9p5@qzisU(kePKJvK`=bJb{gXNsHeeBIJhtovYrZ)c;G zuyaX~^MGg()%MPAh}UaFVyWw_d3PBn0*~_6J3ZHnvX2L{W%-iN*N9lqp@+y3+*5rC z{^ojlZX`g;%j`TDu?_wa^gjC*!gr~aF;P~?j5$5pAekY>QpG&S-u+Tg6XQT>cz>@v zR6AAjZ*NZdeM>Gq8hj-2OK(OF{jxj%EmU#~*}Lnkfn<>bYHyApUIZ6xtCb4-dB8|@7a?)$zcYKdz6ly`Mn8`y z1SG6{nV21-Oyuk97emcApSE&4^nk*+-&cdd&$sIP#7MI;Bv+XA7O98j?&o1R!1P*c z2jH<&bLb2J;Sir{>@ioA5HY88C!Y?)NUArR|L8opRYF8DrqcEaq+U|wztRl&x9%RU z!xF_h8)Do{U8}7S^5qc2l_yl`wC4$@gfB-PuYZ=Isa(^<>RzNxUDJcjT7f@Gu8I-Z zxH$DG`?Hoft^SK4_EJVRDJ>zQOe^8Scnr~ft^KgxV-!>hkgL7*phXopx=WJos~b=9 z43qXi!a!%PP3=!gR;iWJo=J_jR)ss#W&g1I|1tyqIjSUG5bbHm#*LnerxMAky9y=p;cHC__S8yRBXFx7VvqSzN!p`UZ-B8gfm`!_n(WfjeNjCtDlr$CV%^@#vvYJF6 z3DR~g5SBzKRgbS$L1c~1*KnYOu|Dy~`wSR%B5t5Dl|Ewyu09o31tH?;v$M0f>82*2 zsqp}RV>vCYMc;s?rCC7jU!7ie)@ylO7_7wvg=pE{_&Zix~%8+UM%7v-&;)J_+ zNUHv*{g(Q^@QSVa8usA?mWk@kSaA3(Y%TSMz7+JN16VaD5n}WW0{?{n4ha0g;_rz3 tXJFvJO7XXlxcM*V@mG_$nE>9DzKqOt&bf558zgy7IiEXG;~4n!KLFu_yEOm+ literal 18862 zcmeI4XH-*JyMPaDHF}bJt6ym5CT$OlZ@V%6;*A z*R3bsG%3qE)%(>{>$pB)`qF^~oIgZ2p7+z1TKcf>j}DF4!8Y?PZG%-q=OvL?-XKy8_15AN;bjN$a03 z%)1SU?WgPrewUhemnunbTA^n^jg|2eI$E}Dg2XE-tz!+ zpN^}9D!V*Wvu_nDbXAA0fUdT$AGV)+mw)cnLEpzU;-PmbxrPssTZ%pmtlJ(c(N$P> zVB1+gq~_P(uLj=wYw(HMns!SbjC(rAbKrQgS&_$!$n7~)rhhpub-wEIM!69T#d;GS}y^N;nvS+6P#X~?`IAeFHZaUB7cAHp zX;xzqDS0}Pu${Azpu-PYytqq7YxAQMC zIQ{b{*FJ+CEF}d6RWiOU@b?LSu+8NKx^5NOZpTN_gp=FU8#ft7HAQMfNwh3!DPa2U zzuf3!IAAqkGhjYoGH`HUo$J59G3*Bnb7X?H90i4K) zI+QBo69$CFn&tQGX$lWxu1HkF!U7+yJY*p4o)Z<9BkH{+r}h56YhzaydxT4*vtU=y zs;SQdHdp#<1_v~_ukA?ch&gn&J`c&WjI3)>4oOKmkkRvJh`kaXW#<2fG4>Op@)InB z2P?k0De2FCcxHFN*6t<|^`5m{do`JQ_JX&R71xKe4QfyNzPlGEbU^*O+CRs?l$&l1 z5&Gge+}{=IxUL|YrV_p4OVOu+h0e{*ZryP$ZmeeGo?;QklaaOdz#+eNA8&hty8?`8 zV1WmKli=17z8nAsBLLu7GXMl~0HB=-02+S)fQ+r&ZUY=>`wPRso&^9)R*nA&0as%r z!A4QGAzn|kX~8<7&4|?}Rv!bKwz2i>*!ti`0y7~{Nx)ujvW^FdN+uG#beR4uHo?n_ z96(|s7&Q0$C7e?LfC?g8*|F{L`_M!>6+v*NyO0omR0bFc05BSU3<8ltV#8cW?qnKP zhL>L~10%a)Wo%XO@_2?0$%AYVz$94)m{<`5C`6R2j0SEo#t#h!ppw`Gm><=P#zOmH zWhUaH!SCbENEz6K37dkI(Hc((v%{Ogbm&YHOa-9=C(0`-z|>F(1r=qKg2HZ?qP&6< zQb8W6h=MC9pq16o3aYTFM+UbT{Dxt=x}hy}^{3K-5?028&1RsHNMB!Hgs&2U&U8mA zpin5JydqLj5e{0wS^hLO!4FPjZJ7-6J&rDkMP!m0Y%-k&8;?tHp?kBjGBV?drk|Mg%-}_6Y&YPOW*7E@oOd*|<_PZy`%AY|(T98!kH9ze;$&dUKw{gv++r(6u93c$&u4o-5iNK~at>|zSdR2}IH*ut_*@DyqQcmEZ~}D+O>KqR`6faCtSfy!@;nla`Pec)Bau z&3{e|MP(}mb+nQaT3K~=j9He@7~s-zC9nzqQIy%Xv*NfC(Qb4mmB7Z4sRVZt65Iwb z$eG4jmeUgotwZ;sGr?|=a7q~De9iNEfhEmUMT6T*qLG+nBFtj1_V+4hcA#07^G4F8 z6TQdRh8B%TVu2&dnl;kkcu%Z;ZG!vU*6#{0G7cPGge%z`<0;zCqYLb;NNDlTdm;iXj zb9IHQE6OX8Q1VJdMHTh=gH5*1?eJ_I{9bo_KH~9cLmIe|gES0vCti*`{&KD^@@n$n zd#MqWT;M9oeh>MkUCR}~kO64;*~+-F{MD)jg4Q=uog{THEUx&IK_lt~5; z5rWq&n`xT=MT&XC{E*6kJU&tU=Z@mUM6o0tn%g=vQ6{!~27$>Ujc;aHneV&V^!YG3 z6Q<_F#HNTQ5XTP+9C3WFA-Q6Zb6RJ*HSLL+G$8+92k-~?pXc!PAkp}3Sd*b9tbQJZ zMR#NS5||_{cW?pzFWcy3z_}jK$o!VX+@bkCS$`Z#%=l4(2B!hoCBg)L1q||swwcV6 z_IBgL>E%6PucjyuK447&K2xr<)lgS^{;sptP}dnxYZ{r2Q=G~MX`baZex6P4xRzk) zMZ&47s3@smkkDqRhZ)(ASY!v;tfZApAuEF8+KVS^+Ky5dNY7 z7k@qwtpFDU2!Bz4i$5QTR)7lvguf`j#h(vEE5HQ-!e12N;?D=772tvZ;V%ks@#h24 z3UEPy@D~NR`165i1-KwU_=^Hu{P{q%0$dOv{6zsS{(K->0WJs-{-OXEe?Abc02c%Z ze^G#oKOcxzfC~bIzbL@PpASSUzy$%qUlict&j+Fv;DP|*FA8w+=L69Sa6y3Z7y05^ zJaeUzL<8?p`hpiGSA1<>4_>yE9KX0}Id$IxfZSM9eiq>l+N>D2v1O9kBqm_#%^)$s ztLKj%roS1#6KbfdW#!k<@kW96Po9*B+0*jHN3!fsguzHd$py!NK;s_sL4RszXJ?k3Q^w9-TL6Q@q2;8rQd3hSEsXm6`^kj|DZhMv zEo?RjUU?S=!~qU?0Um%&+=&O?Mg=Ohmg7RlK8JrREiW&xx{P#+5fc(0?rpb~I`OT7 zEB#HwL~mp9Mtq{|iqbE2K7+$c5_tIHxNikLy+wU*hDWcC94LI~Q%&U-1xIrW10PiL z`i6!Yyexz=^fcbT---pFd`(JJR&RH~i0tYUgxAAG#)My~O(_{^#h2-7qpXd~2QxPV zZWo;*{kL@_Yqs|eRaC_1vy=b$AmI}c{NS&fR{A?#jo?w-j+=3yUD|+uOT~g4Hui~) zEx!5WWMz_K)KF%22-T{~sA<1TQ}*G!*ycOl`)_N=Wdq@& zVw^|WokDj1vg9BVCta>1_&=`KS?Nl)P zLHJN};SHt!BI76xDbXt@bXFUsbr_vfRuIWBP%2jOi?Y4tQMoJcVxLJK>R9k)2a#sW zV@ZQejrgQ%foTAoqZd8)GQ6bWly53|4>v8*_kER~)76Dp4~ydW1czXn`)}qhDQrw0 z+09*aDsPd$c+JL>dht!wPpup7*Niwan+oB_@nxHh8hiI~w1M5Va9M1_nW6gZ?SAB- z8#Zk>_mWs0`8Ml}A6u;dn?hZSKdcWtKUg1c^h(LV+VhC1oJHEZ8j-q7uYJ=LYd2!= zZ#2AgKNYL03rOpJD^_JXQXI}nB-_+~tvnrT@EinRTxdl$hDUNc0vuL}aSClm8b11w zw+2V&TjTcMRh7JK`*B;JWAv)ZJ?HBh6MY}MXZ=kq8L{_o@5uS+p6%9=rCrBuJ$JjR zypY%6=ohqlz@jngHahOwwS@L|ii$Sy+;TARK1IcmBB7k_?EfeU+wa6|GB?v5?c=_E zS}M2V@FtCrTm8HywNTUM{@ZV^brr{Hgr=AaUoVyux4y&;Y1@9(9!qb^J}7)oJ8fp2K8+Be~GV+iA!Bnd5`BY%~RtI#4<@s9RDP0k=>ONp@Tqyaj_86V_d&z3*`VFSZ&kteu!U3TSR+w|a zc?vz_Rqb0j$2)_1c~1iS3)gzDHjDneC*b#_H6h4D;n_P@`a9$I+f`qVvI-#r`_;ZB zu5IYS_Qk#&9C`PwuHczd-svH(dBW98<^d8pwMXjNP1yAAq8I+J-sCfs{j8{0ERNUyGooYiH z^T=?|{fytfSL^aA1Q`A?iu#a}uE6ynQ+Hoqt+Zv3?ALEcvE z<9lrdW2kePJu3;-ceUDAI*~HX3R|xkhJH~$qrUIS?ocO)Y36F_`p15e$+`zc} z%l8}m6>7EPdrdS=!%C}Mgq>UEWrMHiReVx;8PwA-GG?*u$)?8M0P<0d$SmdmxPruNaQHXZyV8NWjR?2*(y`WXj% zG0xp38Uf3^FNUSAh7JBR{Lw@bzBI3GLs~YE+tCM3nhFP5yveRYbNlF4aqm*U4QuRI z%Ek$)7s*=&CU4JMQj0sA*qiB??cRailvm%-|J&o&4!_>9`nRs#duVjnx2xd6cI7r< z4wI2A=I3Tf%F$bmS+K9$$JpYE zpYk>XS4UfFPkQKYdGT_jS60`P_hxTupZ@Si?1!Xn@{bj2`z|-Vh>r@oc}CiM88`sv zgldZFu0E-4zy-7=Sh?|x(2bq>{nh?XAfz>V2la6k*ITQ@6QUJK_G6#Uc1)4*WFfY(RsTZR7Na&I>_ zHfn@Mgoum~g&2W>(O{rnT9HHAF<>MW&f%U1#xem(UT5{5pt0;Vz;pM$)0)-!fgy>T zife^Ap<99R@TH|km6ko01k$uL-Wrrm9@?5ep5s3>Ele>!5sGLm!~u@Y!TI)U6UGL_nJPS@IuC30L@_d4bsG1sM#YG!UY zO+bAS4B%{W)q}N22cbTjdh5Z|b!`?_Et;r*IB8a*LTQWd#OTQGaFV$4yRh@fqR)S& zJa}54Eq$~)Z%&ysH!%2XLc%3G!T-{mQ-$Tgt`S1-EPkF!w03r!K*))wjCCt=Z$+LU zNY;YCdC@l9&np*`zR(6d9jZ<=Ef-7wYjiZ&Xy>wKKs8@f(`Y9ux*&yO3w-wb^_r&o zK@p*O3bh}4Fg-M!S>+sGE1|cm|6|+f0+DaTDJy7EIgig<&CwOzRj(B<|4S?Zz{gO} LME9