diff --git a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java index 18cc82b80..8a91a6a89 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalCrystallizer.java @@ -9,315 +9,158 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalCrystallizer extends ModelBase { - ModelRenderer Base; - ModelRenderer IO1; - ModelRenderer IO2; - ModelRenderer Base3; - ModelRenderer Base2; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; - ModelRenderer Spire; - ModelRenderer Spin; - ModelRenderer Vial1; - ModelRenderer Vial2; - ModelRenderer Vial3; - ModelRenderer Vial4; + ModelRenderer tray; + ModelRenderer support4; + ModelRenderer rimBack; + ModelRenderer portRight; + ModelRenderer rimRight; + ModelRenderer rimLeft; + ModelRenderer rimFront; + ModelRenderer portLeft; + ModelRenderer support3; + ModelRenderer support2; + ModelRenderer support1; + ModelRenderer tank; + ModelRenderer rod1; + ModelRenderer rod2; + ModelRenderer rod3; + ModelRenderer base; + ModelRenderer Shape1; - public ModelChemicalCrystallizer() + public ModelChemicalCrystallizer() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 16, 0); - Base3.addBox(0F, 0F, 0F, 14, 1, 14); - Base3.setRotationPoint(-7F, 9F, -7F); - Base3.setTextureSize(128, 64); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 16, 0); - Base2.addBox(0F, 0F, 0F, 14, 1, 14); - Base2.setRotationPoint(-7F, 14F, -7F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 13F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 10F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side3.setRotationPoint(5F, 11F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side1.setRotationPoint(2F, 11F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side2.setRotationPoint(2F, 11F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side4.setRotationPoint(2F, 11F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side4.setRotationPoint(-6F, 11F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side3.setRotationPoint(5F, 11F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side2.setRotationPoint(-6F, 11F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side3.setRotationPoint(-3F, 11F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side1.setRotationPoint(-6F, 11F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Side3.setRotationPoint(-3F, 11F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side1.setRotationPoint(-6F, 11F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Sjde4.setRotationPoint(-6F, 11F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side2.setRotationPoint(-6F, 11F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side4.setRotationPoint(2F, 11F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 13F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side2.setRotationPoint(2F, 11F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side1.setRotationPoint(2F, 11F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 13F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 10F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 10F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 10F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 13F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); - Spire = new ModelRenderer(this, 0, 6); - Spire.addBox(0F, 0F, 0F, 2, 8, 2); - Spire.setRotationPoint(-1F, 15F, -1F); - Spire.setTextureSize(128, 64); - Spire.mirror = true; - setRotation(Spire, 0F, 0F, 0F); - Spin = new ModelRenderer(this, 28, 24); - Spin.addBox(-4F, 0F, -4F, 8, 1, 8); - Spin.setRotationPoint(0F, 16F, 0F); - Spin.setTextureSize(128, 64); - Spin.mirror = true; - setRotation(Spin, 0F, 0F, 0F); - Vial1 = new ModelRenderer(this, 8, 6); - Vial1.addBox(-3F, 0.5F, 3F, 2, 3, 2); - Vial1.setRotationPoint(0F, 16F, 0F); - Vial1.setTextureSize(128, 64); - Vial1.mirror = true; - setRotation(Vial1, 0F, 0F, 0F); - Vial2 = new ModelRenderer(this, 8, 6); - Vial2.addBox(1F, 0.5F, 3F, 2, 3, 2); - Vial2.setRotationPoint(0F, 16F, 0F); - Vial2.setTextureSize(128, 64); - Vial2.mirror = true; - setRotation(Vial2, 0F, 0F, 0F); - Vial3 = new ModelRenderer(this, 8, 6); - Vial3.addBox(-3F, 0.5F, -5F, 2, 3, 2); - Vial3.setRotationPoint(0F, 16F, 0F); - Vial3.setTextureSize(128, 64); - Vial3.mirror = true; - setRotation(Vial3, 0F, 0F, 0F); - Vial4 = new ModelRenderer(this, 8, 6); - Vial4.addBox(1F, 0.5F, -5F, 2, 3, 2); - Vial4.setRotationPoint(0F, 16F, 0F); - Vial4.setTextureSize(128, 64); - Vial4.mirror = true; - setRotation(Vial4, 0F, 0F, 0F); + tray = new ModelRenderer(this, 48, 0); + tray.addBox(0F, 0F, 0F, 10, 1, 10); + tray.setRotationPoint(-5F, 18.5F, -5F); + tray.setTextureSize(128, 64); + tray.mirror = true; + setRotation(tray, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 0, 0); + support4.addBox(0F, 0F, 0F, 1, 5, 1); + support4.setRotationPoint(6.5F, 13F, 6.5F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + rimBack = new ModelRenderer(this, 0, 46); + rimBack.addBox(0F, 0F, 0F, 16, 2, 2); + rimBack.setRotationPoint(-8F, 17F, 6F); + rimBack.setTextureSize(128, 64); + rimBack.mirror = true; + setRotation(rimBack, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 36, 42); + portRight.mirror = true; + portRight.addBox(0F, 0F, 0F, 1, 8, 8); + portRight.setRotationPoint(7.01F, 12F, -4F); + portRight.setTextureSize(128, 64); + setRotation(portRight, 0F, 0F, 0F); + rimRight = new ModelRenderer(this, 0, 50); + rimRight.mirror = true; + rimRight.addBox(0F, 0F, 0F, 2, 2, 12); + rimRight.setRotationPoint(6F, 17F, -6F); + rimRight.setTextureSize(128, 64); + setRotation(rimRight, 0F, 0F, 0F); + rimLeft = new ModelRenderer(this, 0, 50); + rimLeft.addBox(0F, 0F, 0F, 2, 2, 12); + rimLeft.setRotationPoint(-8F, 17F, -6F); + rimLeft.setTextureSize(128, 64); + rimLeft.mirror = true; + setRotation(rimLeft, 0F, 0F, 0F); + rimFront = new ModelRenderer(this, 0, 42); + rimFront.addBox(0F, 0F, 0F, 16, 2, 2); + rimFront.setRotationPoint(-8F, 17F, -8F); + rimFront.setTextureSize(128, 64); + rimFront.mirror = true; + setRotation(rimFront, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 36, 42); + 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); + support3 = new ModelRenderer(this, 0, 0); + support3.addBox(0F, 0F, 0F, 1, 5, 1); + support3.setRotationPoint(-7.5F, 13F, 6.5F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 0, 0); + support2.addBox(0F, 0F, 0F, 1, 5, 1); + support2.setRotationPoint(6.5F, 13F, -7.5F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 0, 0); + support1.addBox(0F, 0F, 0F, 1, 5, 1); + support1.setRotationPoint(-7.5F, 13F, -7.5F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + tank = new ModelRenderer(this, 0, 0); + tank.addBox(0F, 0F, 0F, 16, 5, 16); + tank.setRotationPoint(-8F, 8F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + rod1 = new ModelRenderer(this, 8, 0); + rod1.addBox(0F, 0F, 0F, 1, 2, 1); + rod1.setRotationPoint(-2F, 13F, 0F); + rod1.setTextureSize(128, 64); + rod1.mirror = true; + setRotation(rod1, 0F, 0F, 0F); + rod2 = new ModelRenderer(this, 8, 3); + rod2.addBox(0F, 0F, 0F, 1, 3, 1); + rod2.setRotationPoint(1F, 13F, 1F); + rod2.setTextureSize(128, 64); + rod2.mirror = true; + setRotation(rod2, 0F, 0F, 0F); + rod3 = new ModelRenderer(this, 4, 0); + rod3.addBox(0F, 0F, 0F, 1, 4, 1); + rod3.setRotationPoint(-0.5F, 13F, -2F); + rod3.setTextureSize(128, 64); + rod3.mirror = true; + setRotation(rod3, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 21); + 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); + Shape1 = new ModelRenderer(this, 64, 11); + Shape1.addBox(0F, 0F, 0F, 14, 4, 14); + Shape1.setRotationPoint(-7F, 13F, -7F); + Shape1.setTextureSize(128, 64); + Shape1.mirror = true; + setRotation(Shape1, 0F, 0F, 0F); } public void render(float size) { MekanismRenderer.blendOn(); - - Base.render(size); - IO1.render(size); - IO2.render(size); - Base3.render(size); - Base2.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - Spire.render(size); - Spin.render(size); - Vial1.render(size); - Vial2.render(size); - Vial3.render(size); - Vial4.render(size); - + + tray.render(size); + support4.render(size); + rimBack.render(size); + portRight.render(size); + rimRight.render(size); + rimLeft.render(size); + rimFront.render(size); + portLeft.render(size); + support3.render(size); + support2.render(size); + support1.render(size); + tank.render(size); + rod1.render(size); + rod2.render(size); + rod3.render(size); + base.render(size); + Shape1.render(size); + MekanismRenderer.blendOff(); } - public void renderWithRotation(float size, float rotate) - { - rotate *= Math.PI; - - Spin.rotateAngleY = rotate; - Vial1.rotateAngleY = rotate; - Vial2.rotateAngleY = rotate; - Vial3.rotateAngleY = rotate; - Vial4.rotateAngleY = rotate; - - render(size); - } - private void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; diff --git a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java index 470ae4726..c69554a8f 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/model/ModelChemicalDissolutionChamber.java @@ -9,299 +9,259 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalDissolutionChamber extends ModelBase { - ModelRenderer Centre; - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; - ModelRenderer IO1; - ModelRenderer IO2Port; - ModelRenderer IO2; - ModelRenderer IO2Port2; - ModelRenderer Coil1; - ModelRenderer Coil2; - ModelRenderer Coil3; - ModelRenderer Coil4; + ModelRenderer support2; + ModelRenderer vat5; + ModelRenderer top2; + ModelRenderer top; + ModelRenderer base; + ModelRenderer vat2; + ModelRenderer vat3; + ModelRenderer vat6; + ModelRenderer vat9; + ModelRenderer vat8; + ModelRenderer vat7; + ModelRenderer vat4; + ModelRenderer backEdge2; + ModelRenderer back; + ModelRenderer backEdge1; + ModelRenderer vents; + ModelRenderer support1; + ModelRenderer vat1; + ModelRenderer nozzle8; + ModelRenderer nozzle5; + ModelRenderer nozzle7; + ModelRenderer nozzle4; + ModelRenderer nozzle9; + ModelRenderer nozzle6; + ModelRenderer nozzle3; + ModelRenderer nozzle2; + ModelRenderer nozzle1; + ModelRenderer glass; + ModelRenderer portToggle1; + ModelRenderer portToggle2; - public ModelChemicalDissolutionChamber() + public ModelChemicalDissolutionChamber() { textureWidth = 128; textureHeight = 64; - Centre = new ModelRenderer(this, 0, 17); - Centre.addBox(0F, 0F, 0F, 2, 13, 2); - Centre.setRotationPoint(-1F, 9F, -1F); - Centre.setTextureSize(128, 64); - Centre.mirror = true; - setRotation(Centre, 0F, 0F, 0F); - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 2, 14); - Base.setRotationPoint(-7F, 22F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 16, 0); - Base2.addBox(0F, 0F, 0F, 14, 1, 14); - Base2.setRotationPoint(-7F, 16F, -7F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 21F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 17F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can1Side3.setRotationPoint(5F, 18F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can1Side1.setRotationPoint(2F, 18F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can1Side2.setRotationPoint(2F, 18F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can1Side4.setRotationPoint(2F, 18F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can2Side4.setRotationPoint(-6F, 18F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can3Side3.setRotationPoint(5F, 18F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can2Side2.setRotationPoint(-6F, 18F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can2Side3.setRotationPoint(-3F, 18F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can2Side1.setRotationPoint(-6F, 18F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 3, 2); - Can4Side3.setRotationPoint(-3F, 18F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can4Side1.setRotationPoint(-6F, 18F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 3, 2); - Can4Sjde4.setRotationPoint(-6F, 18F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can4Side2.setRotationPoint(-6F, 18F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 3, 2); - Can3Side4.setRotationPoint(2F, 18F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 21F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 3, 1); - Can3Side2.setRotationPoint(2F, 18F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 3, 1); - Can3Side1.setRotationPoint(2F, 18F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 21F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 17F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 17F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 17F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 21F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2Port = new ModelRenderer(this, 28, 17); - IO2Port.addBox(0F, 0F, 0F, 2, 2, 4); - IO2Port.setRotationPoint(-7F, 14F, -2F); - IO2Port.setTextureSize(128, 64); - IO2Port.mirror = true; - setRotation(IO2Port, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - IO2Port2 = new ModelRenderer(this, 28, 17); - IO2Port2.addBox(0F, 0F, 0F, 2, 2, 4); - IO2Port2.setRotationPoint(5F, 14F, -2F); - IO2Port2.setTextureSize(128, 64); - IO2Port2.mirror = true; - setRotation(IO2Port2, 0F, 0F, 0F); - Coil1 = new ModelRenderer(this, 0, 34); - Coil1.addBox(0F, 0F, 0F, 8, 1, 8); - Coil1.setRotationPoint(-4F, 14F, -4F); - Coil1.setTextureSize(128, 64); - Coil1.mirror = true; - setRotation(Coil1, 0F, 0F, 0F); - Coil2 = new ModelRenderer(this, 0, 34); - Coil2.addBox(0F, 0F, 0F, 8, 1, 8); - Coil2.setRotationPoint(-4F, 12F, -4F); - Coil2.setTextureSize(128, 64); - Coil2.mirror = true; - setRotation(Coil2, 0F, 0F, 0F); - Coil3 = new ModelRenderer(this, 0, 34); - Coil3.addBox(0F, 0F, 0F, 8, 1, 8); - Coil3.setRotationPoint(-4F, 10F, -4F); - Coil3.setTextureSize(128, 64); - Coil3.mirror = true; - setRotation(Coil3, 0F, 0F, 0F); - Coil4 = new ModelRenderer(this, 0, 34); - Coil4.addBox(0F, 0F, 0F, 8, 1, 8); - Coil4.setRotationPoint(-4F, 8F, -4F); - Coil4.setTextureSize(128, 64); - Coil4.mirror = true; - setRotation(Coil4, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 4, 0); + support2.addBox(0F, 0F, 0F, 1, 2, 1); + support2.setRotationPoint(6F, 9F, -7F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + vat5 = new ModelRenderer(this, 0, 23); + vat5.addBox(0F, 0F, 0F, 3, 4, 3); + vat5.setRotationPoint(-1.5F, 13F, -1.5F); + vat5.setTextureSize(128, 64); + vat5.mirror = true; + setRotation(vat5, 0F, 0F, 0F); + top2 = new ModelRenderer(this, 0, 40); + top2.addBox(0F, 0F, 0F, 16, 1, 15); + top2.setRotationPoint(-8F, 11F, -8F); + top2.setTextureSize(128, 64); + top2.mirror = true; + setRotation(top2, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 23); + top.addBox(0F, 0F, 0F, 16, 1, 16); + top.setRotationPoint(-8F, 8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + vat2 = new ModelRenderer(this, 0, 23); + vat2.addBox(0F, 0F, 0F, 3, 4, 3); + vat2.setRotationPoint(-5F, 13F, -1.5F); + vat2.setTextureSize(128, 64); + vat2.mirror = true; + setRotation(vat2, 0F, 0F, 0F); + vat3 = new ModelRenderer(this, 0, 23); + vat3.addBox(0F, 0F, 0F, 3, 4, 3); + vat3.setRotationPoint(-5F, 13F, 2F); + vat3.setTextureSize(128, 64); + vat3.mirror = true; + setRotation(vat3, 0F, 0F, 0F); + vat6 = new ModelRenderer(this, 0, 23); + vat6.addBox(0F, 0F, 0F, 3, 4, 3); + vat6.setRotationPoint(-1.5F, 13F, 2F); + vat6.setTextureSize(128, 64); + vat6.mirror = true; + setRotation(vat6, 0F, 0F, 0F); + vat9 = new ModelRenderer(this, 0, 23); + vat9.addBox(0F, 0F, 0F, 3, 4, 3); + vat9.setRotationPoint(2F, 13F, 2F); + vat9.setTextureSize(128, 64); + vat9.mirror = true; + setRotation(vat9, 0F, 0F, 0F); + vat8 = new ModelRenderer(this, 0, 23); + vat8.addBox(0F, 0F, 0F, 3, 4, 3); + vat8.setRotationPoint(2F, 13F, -1.5F); + vat8.setTextureSize(128, 64); + vat8.mirror = true; + setRotation(vat8, 0F, 0F, 0F); + vat7 = new ModelRenderer(this, 0, 23); + vat7.addBox(0F, 0F, 0F, 3, 4, 3); + vat7.setRotationPoint(2F, 13F, -5F); + vat7.setTextureSize(128, 64); + vat7.mirror = true; + setRotation(vat7, 0F, 0F, 0F); + vat4 = new ModelRenderer(this, 0, 23); + vat4.addBox(0F, 0F, 0F, 3, 4, 3); + vat4.setRotationPoint(-1.5F, 13F, -5F); + vat4.setTextureSize(128, 64); + vat4.mirror = true; + setRotation(vat4, 0F, 0F, 0F); + backEdge2 = new ModelRenderer(this, 8, 0); + backEdge2.addBox(0F, 0F, 0F, 1, 8, 1); + backEdge2.setRotationPoint(7F, 9F, 7F); + backEdge2.setTextureSize(128, 64); + backEdge2.mirror = true; + setRotation(backEdge2, 0F, 0F, 0F); + back = new ModelRenderer(this, 48, 0); + back.addBox(0F, 0F, 0F, 14, 8, 2); + back.setRotationPoint(-7F, 9F, 6F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + backEdge1 = new ModelRenderer(this, 8, 0); + backEdge1.addBox(0F, 0F, 0F, 1, 8, 1); + backEdge1.setRotationPoint(-8F, 9F, 7F); + backEdge1.setTextureSize(128, 64); + backEdge1.mirror = true; + setRotation(backEdge1, 0F, 0F, 0F); + vents = new ModelRenderer(this, 70, 0); + vents.addBox(0F, 0F, 0F, 8, 2, 10); + vents.setRotationPoint(-4F, 9F, -4F); + vents.setTextureSize(128, 64); + vents.mirror = true; + setRotation(vents, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 4, 0); + support1.addBox(0F, 0F, 0F, 1, 2, 1); + support1.setRotationPoint(-7F, 9F, -7F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); + vat1 = new ModelRenderer(this, 0, 23); + vat1.addBox(0F, 0F, 0F, 3, 4, 3); + vat1.setRotationPoint(-5F, 13F, -5F); + vat1.setTextureSize(128, 64); + vat1.mirror = true; + setRotation(vat1, 0F, 0F, 0F); + nozzle8 = new ModelRenderer(this, 0, 0); + nozzle8.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle8.setRotationPoint(3F, 11.5F, -0.5F); + nozzle8.setTextureSize(128, 64); + nozzle8.mirror = true; + setRotation(nozzle8, 0F, 0F, 0F); + nozzle5 = new ModelRenderer(this, 0, 0); + nozzle5.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle5.setRotationPoint(-0.5F, 11.5F, -0.5F); + nozzle5.setTextureSize(128, 64); + nozzle5.mirror = true; + setRotation(nozzle5, 0F, 0F, 0F); + nozzle7 = new ModelRenderer(this, 0, 0); + nozzle7.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle7.setRotationPoint(3F, 11.5F, -4F); + nozzle7.setTextureSize(128, 64); + nozzle7.mirror = true; + setRotation(nozzle7, 0F, 0F, 0F); + nozzle4 = new ModelRenderer(this, 0, 0); + nozzle4.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle4.setRotationPoint(-0.5F, 11.5F, -4F); + nozzle4.setTextureSize(128, 64); + nozzle4.mirror = true; + setRotation(nozzle4, 0F, 0F, 0F); + nozzle9 = new ModelRenderer(this, 0, 0); + nozzle9.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle9.setRotationPoint(3F, 11.5F, 3F); + nozzle9.setTextureSize(128, 64); + nozzle9.mirror = true; + setRotation(nozzle9, 0F, 0F, 0F); + nozzle6 = new ModelRenderer(this, 0, 0); + nozzle6.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle6.setRotationPoint(-0.5F, 11.5F, 3F); + nozzle6.setTextureSize(128, 64); + nozzle6.mirror = true; + setRotation(nozzle6, 0F, 0F, 0F); + nozzle3 = new ModelRenderer(this, 0, 0); + nozzle3.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle3.setRotationPoint(-4F, 11.5F, 3F); + nozzle3.setTextureSize(128, 64); + nozzle3.mirror = true; + setRotation(nozzle3, 0F, 0F, 0F); + nozzle2 = new ModelRenderer(this, 0, 0); + nozzle2.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle2.setRotationPoint(-4F, 11.5F, -0.5F); + nozzle2.setTextureSize(128, 64); + nozzle2.mirror = true; + setRotation(nozzle2, 0F, 0F, 0F); + nozzle1 = new ModelRenderer(this, 0, 0); + nozzle1.addBox(0F, 0F, 0F, 1, 1, 1); + nozzle1.setRotationPoint(-4F, 11.5F, -4F); + nozzle1.setTextureSize(128, 64); + nozzle1.mirror = true; + setRotation(nozzle1, 0F, 0F, 0F); + glass = new ModelRenderer(this, 64, 14); + glass.addBox(0F, 0F, 0F, 14, 5, 13); + glass.setRotationPoint(-7F, 12F, -7F); + glass.setTextureSize(128, 64); + glass.mirror = true; + setRotation(glass, 0F, 0F, 0F); + portToggle1 = new ModelRenderer(this, 64, 32); + portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle1.setRotationPoint(-8.01F, 12F, -4F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2 = new ModelRenderer(this, 64, 32); + portToggle2.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2.setRotationPoint(7.01F, 12F, -4F); + portToggle2.setTextureSize(128, 64); + portToggle2.mirror = true; + setRotation(portToggle2, 0F, 0F, 0F); } public void render(float size) { MekanismRenderer.blendOn(); - - Centre.render(size); - Base.render(size); - Base2.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - IO1.render(size); - IO2Port.render(size); - IO2.render(size); - IO2Port2.render(size); - Coil1.render(size); - Coil2.render(size); - Coil3.render(size); - Coil4.render(size); - + + support2.render(size); + vat5.render(size); + top2.render(size); + top.render(size); + base.render(size); + vat2.render(size); + vat3.render(size); + vat6.render(size); + vat9.render(size); + vat8.render(size); + vat7.render(size); + vat4.render(size); + backEdge2.render(size); + back.render(size); + backEdge1.render(size); + vents.render(size); + support1.render(size); + vat1.render(size); + nozzle8.render(size); + nozzle5.render(size); + nozzle7.render(size); + nozzle4.render(size); + nozzle9.render(size); + nozzle6.render(size); + nozzle3.render(size); + nozzle2.render(size); + nozzle1.render(size); + glass.render(size); + portToggle1.render(size); + portToggle2.render(size); + MekanismRenderer.blendOff(); } diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index c3a28875a..da80b3674 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -1,11 +1,7 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/model/ModelChemicalWasher.java b/src/main/java/mekanism/client/model/ModelChemicalWasher.java index 434e29a32..0eb42e8d6 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalWasher.java +++ b/src/main/java/mekanism/client/model/ModelChemicalWasher.java @@ -1,6 +1,5 @@ package mekanism.client.model; -import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import cpw.mods.fml.relauncher.Side; @@ -9,285 +8,200 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalWasher extends ModelBase { - ModelRenderer Base; - ModelRenderer Base2; - ModelRenderer IO1; - ModelRenderer IO2; - ModelRenderer IO3; - ModelRenderer Base3; - ModelRenderer Base4; - ModelRenderer Base5; - ModelRenderer Base6; - ModelRenderer Can1B; - ModelRenderer Can1T; - ModelRenderer Can1Side3; - ModelRenderer Can1Side1; - ModelRenderer Can1Side2; - ModelRenderer Can1Side4; - ModelRenderer Can2Side4; - ModelRenderer Can3Side3; - ModelRenderer Can2Side2; - ModelRenderer Can2Side3; - ModelRenderer Can2Side1; - ModelRenderer Can4Side3; - ModelRenderer Can4Side1; - ModelRenderer Can4Sjde4; - ModelRenderer Can4Side2; - ModelRenderer Can3Side4; - ModelRenderer Can4B; - ModelRenderer Can3Side2; - ModelRenderer Can3Side1; - ModelRenderer Can2B; - ModelRenderer Can4T; - ModelRenderer Can2T; - ModelRenderer Can3T; - ModelRenderer Can3B; + 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() + public ModelChemicalWasher() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 16, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Base2 = new ModelRenderer(this, 72, 0); - Base2.addBox(0F, 0F, 0F, 14, 10, 1); - Base2.setRotationPoint(-7F, 8F, 6F); - Base2.setTextureSize(128, 64); - Base2.mirror = true; - setRotation(Base2, 0F, 0F, 0F); - Base2.mirror = false; - IO1 = new ModelRenderer(this, 9, 17); - IO1.addBox(0F, 0F, 0F, 1, 8, 8); - IO1.setRotationPoint(-8F, 12F, -4F); - IO1.setTextureSize(128, 64); - IO1.mirror = true; - setRotation(IO1, 0F, 0F, 0F); - IO2 = new ModelRenderer(this, 9, 17); - IO2.addBox(0F, 0F, 0F, 1, 8, 8); - IO2.setRotationPoint(7F, 12F, -4F); - IO2.setTextureSize(128, 64); - IO2.mirror = true; - setRotation(IO2, 0F, 0F, 0F); - IO3 = new ModelRenderer(this, 0, 42); - IO3.addBox(0F, 0F, 0F, 12, 1, 8); - IO3.setRotationPoint(-6F, 8F, -4F); - IO3.setTextureSize(128, 64); - IO3.mirror = true; - setRotation(IO3, 0F, 0F, 0F); - Base3 = new ModelRenderer(this, 72, 0); - Base3.addBox(0F, 0F, 0F, 14, 10, 1); - Base3.setRotationPoint(-7F, 8F, -7F); - Base3.setTextureSize(128, 64); - Base3.mirror = true; - setRotation(Base3, 0F, 0F, 0F); - Base4 = new ModelRenderer(this, 72, 12); - Base4.addBox(0F, 0F, 0F, 1, 10, 12); - Base4.setRotationPoint(6F, 8F, -6F); - Base4.setTextureSize(128, 64); - Base4.mirror = true; - setRotation(Base4, 0F, 0F, 0F); - Base5 = new ModelRenderer(this, 72, 12); - Base5.addBox(0F, 0F, 0F, 1, 10, 12); - Base5.setRotationPoint(-7F, 8F, -6F); - Base5.setTextureSize(128, 64); - Base5.mirror = true; - setRotation(Base5, 0F, 0F, 0F); - Base6 = new ModelRenderer(this, 16, 0); - Base6.addBox(0F, 0F, 0F, 14, 1, 14); - Base6.setRotationPoint(-7F, 18F, -7F); - Base6.setTextureSize(128, 64); - Base6.mirror = true; - setRotation(Base6, 0F, 0F, 0F); - Can1B = new ModelRenderer(this, 0, 0); - Can1B.addBox(0F, 0F, 0F, 4, 1, 4); - Can1B.setRotationPoint(2F, 22F, 2F); - Can1B.setTextureSize(128, 64); - Can1B.mirror = true; - setRotation(Can1B, 0F, 0F, 0F); - Can1T = new ModelRenderer(this, 0, 0); - Can1T.addBox(0F, 0F, 0F, 4, 1, 4); - Can1T.setRotationPoint(2F, 19F, 2F); - Can1T.setTextureSize(128, 64); - Can1T.mirror = true; - setRotation(Can1T, 0F, 0F, 0F); - Can1Side3 = new ModelRenderer(this, 0, 0); - Can1Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side3.setRotationPoint(5F, 20F, 3F); - Can1Side3.setTextureSize(128, 64); - Can1Side3.mirror = true; - setRotation(Can1Side3, 0F, 0F, 0F); - Can1Side1 = new ModelRenderer(this, 0, 0); - Can1Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side1.setRotationPoint(2F, 20F, 5F); - Can1Side1.setTextureSize(128, 64); - Can1Side1.mirror = true; - setRotation(Can1Side1, 0F, 0F, 0F); - Can1Side2 = new ModelRenderer(this, 0, 0); - Can1Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can1Side2.setRotationPoint(2F, 20F, 2F); - Can1Side2.setTextureSize(128, 64); - Can1Side2.mirror = true; - setRotation(Can1Side2, 0F, 0F, 0F); - Can1Side4 = new ModelRenderer(this, 0, 0); - Can1Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can1Side4.setRotationPoint(2F, 20F, 3F); - Can1Side4.setTextureSize(128, 64); - Can1Side4.mirror = true; - setRotation(Can1Side4, 0F, 0F, 0F); - Can2Side4 = new ModelRenderer(this, 0, 0); - Can2Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side4.setRotationPoint(-6F, 20F, 3F); - Can2Side4.setTextureSize(128, 64); - Can2Side4.mirror = true; - setRotation(Can2Side4, 0F, 0F, 0F); - Can3Side3 = new ModelRenderer(this, 0, 0); - Can3Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side3.setRotationPoint(5F, 20F, -5F); - Can3Side3.setTextureSize(128, 64); - Can3Side3.mirror = true; - setRotation(Can3Side3, 0F, 0F, 0F); - Can2Side2 = new ModelRenderer(this, 0, 0); - Can2Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side2.setRotationPoint(-6F, 20F, 2F); - Can2Side2.setTextureSize(128, 64); - Can2Side2.mirror = true; - setRotation(Can2Side2, 0F, 0F, 0F); - Can2Side3 = new ModelRenderer(this, 0, 0); - Can2Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can2Side3.setRotationPoint(-3F, 20F, 3F); - Can2Side3.setTextureSize(128, 64); - Can2Side3.mirror = true; - setRotation(Can2Side3, 0F, 0F, 0F); - Can2Side1 = new ModelRenderer(this, 0, 0); - Can2Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can2Side1.setRotationPoint(-6F, 20F, 5F); - Can2Side1.setTextureSize(128, 64); - Can2Side1.mirror = true; - setRotation(Can2Side1, 0F, 0F, 0F); - Can4Side3 = new ModelRenderer(this, 0, 0); - Can4Side3.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Side3.setRotationPoint(-3F, 20F, -5F); - Can4Side3.setTextureSize(128, 64); - Can4Side3.mirror = true; - setRotation(Can4Side3, 0F, 0F, 0F); - Can4Side1 = new ModelRenderer(this, 0, 0); - Can4Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side1.setRotationPoint(-6F, 20F, -3F); - Can4Side1.setTextureSize(128, 64); - Can4Side1.mirror = true; - setRotation(Can4Side1, 0F, 0F, 0F); - Can4Sjde4 = new ModelRenderer(this, 0, 0); - Can4Sjde4.addBox(0F, 0F, 0F, 1, 2, 2); - Can4Sjde4.setRotationPoint(-6F, 20F, -5F); - Can4Sjde4.setTextureSize(128, 64); - Can4Sjde4.mirror = true; - setRotation(Can4Sjde4, 0F, 0F, 0F); - Can4Side2 = new ModelRenderer(this, 0, 0); - Can4Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can4Side2.setRotationPoint(-6F, 20F, -6F); - Can4Side2.setTextureSize(128, 64); - Can4Side2.mirror = true; - setRotation(Can4Side2, 0F, 0F, 0F); - Can3Side4 = new ModelRenderer(this, 0, 0); - Can3Side4.addBox(0F, 0F, 0F, 1, 2, 2); - Can3Side4.setRotationPoint(2F, 20F, -5F); - Can3Side4.setTextureSize(128, 64); - Can3Side4.mirror = true; - setRotation(Can3Side4, 0F, 0F, 0F); - Can4B = new ModelRenderer(this, 0, 0); - Can4B.addBox(0F, 0F, 0F, 4, 1, 4); - Can4B.setRotationPoint(-6F, 22F, -6F); - Can4B.setTextureSize(128, 64); - Can4B.mirror = true; - setRotation(Can4B, 0F, 0F, 0F); - Can3Side2 = new ModelRenderer(this, 0, 0); - Can3Side2.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side2.setRotationPoint(2F, 20F, -6F); - Can3Side2.setTextureSize(128, 64); - Can3Side2.mirror = true; - setRotation(Can3Side2, 0F, 0F, 0F); - Can3Side1 = new ModelRenderer(this, 0, 0); - Can3Side1.addBox(0F, 0F, 0F, 4, 2, 1); - Can3Side1.setRotationPoint(2F, 20F, -3F); - Can3Side1.setTextureSize(128, 64); - Can3Side1.mirror = true; - setRotation(Can3Side1, 0F, 0F, 0F); - Can2B = new ModelRenderer(this, 0, 0); - Can2B.addBox(0F, 0F, 0F, 4, 1, 4); - Can2B.setRotationPoint(-6F, 22F, 2F); - Can2B.setTextureSize(128, 64); - Can2B.mirror = true; - setRotation(Can2B, 0F, 0F, 0F); - Can4T = new ModelRenderer(this, 0, 0); - Can4T.addBox(0F, 0F, 0F, 4, 1, 4); - Can4T.setRotationPoint(-6F, 19F, -6F); - Can4T.setTextureSize(128, 64); - Can4T.mirror = true; - setRotation(Can4T, 0F, 0F, 0F); - Can2T = new ModelRenderer(this, 0, 0); - Can2T.addBox(0F, 0F, 0F, 4, 1, 4); - Can2T.setRotationPoint(-6F, 19F, 2F); - Can2T.setTextureSize(128, 64); - Can2T.mirror = true; - setRotation(Can2T, 0F, 0F, 0F); - Can3T = new ModelRenderer(this, 0, 0); - Can3T.addBox(0F, 0F, 0F, 4, 1, 4); - Can3T.setRotationPoint(2F, 19F, -6F); - Can3T.setTextureSize(128, 64); - Can3T.mirror = true; - setRotation(Can3T, 0F, 0F, 0F); - Can3B = new ModelRenderer(this, 0, 0); - Can3B.addBox(0F, 0F, 0F, 4, 1, 4); - Can3B.setRotationPoint(2F, 22F, -6F); - Can3B.setTextureSize(128, 64); - Can3B.mirror = true; - setRotation(Can3B, 0F, 0F, 0F); + 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, 66, 0); + portTop.addBox(0F, 0F, 0F, 8, 1, 8); + portTop.setRotationPoint(-4F, 8F, -4F); + 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; + 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; + 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; + 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; + 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; + 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; + 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; + setRotation(tubeLeft3, 0F, 0F, -0.8203047F); } public void render(float size) { - MekanismRenderer.blendOn(); - - Base.render(size); - Base2.render(size); - IO1.render(size); - IO2.render(size); - IO3.render(size); - Base3.render(size); - Base4.render(size); - Base5.render(size); - Base6.render(size); - Can1B.render(size); - Can1T.render(size); - Can1Side3.render(size); - Can1Side1.render(size); - Can1Side2.render(size); - Can1Side4.render(size); - Can2Side4.render(size); - Can3Side3.render(size); - Can2Side2.render(size); - Can2Side3.render(size); - Can2Side1.render(size); - Can4Side3.render(size); - Can4Side1.render(size); - Can4Sjde4.render(size); - Can4Side2.render(size); - Can3Side4.render(size); - Can4B.render(size); - Can3Side2.render(size); - Can3Side1.render(size); - Can2B.render(size); - Can4T.render(size); - Can2T.render(size); - Can3T.render(size); - Can3B.render(size); - - MekanismRenderer.blendOff(); + 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) diff --git a/src/main/java/mekanism/client/model/ModelElectricPump.java b/src/main/java/mekanism/client/model/ModelElectricPump.java index 0c442b82a..39c8cdf42 100644 --- a/src/main/java/mekanism/client/model/ModelElectricPump.java +++ b/src/main/java/mekanism/client/model/ModelElectricPump.java @@ -8,112 +8,176 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectricPump extends ModelBase { - ModelRenderer PumpHead; - ModelRenderer Connector; - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Body; - ModelRenderer Axil; - ModelRenderer Axil2; - ModelRenderer Ring1; - ModelRenderer Ring2; - ModelRenderer Plug; - ModelRenderer Ring3; + ModelRenderer pumpRingTop; + ModelRenderer pumpPortTop; + ModelRenderer pumpCasing; + ModelRenderer pumpBase; + ModelRenderer powerPort; + ModelRenderer powerConnector; + ModelRenderer powerConnectorFrame4; + ModelRenderer powerConnectorFrame3; + ModelRenderer powerConnectorFrame2; + ModelRenderer powerConnectorFrame1; + ModelRenderer pipeToggleBack; + ModelRenderer pipeToggleRingBack; + ModelRenderer pipeTogglePortBack; + ModelRenderer pipeToggleLeft; + ModelRenderer pipeToggleRingLeft; + ModelRenderer pipeTogglePortLeft; + ModelRenderer pipeToggleRight; + ModelRenderer pipeToggleRingRight; + ModelRenderer pipeTogglePortRight; + ModelRenderer pumpPipe; - public ModelElectricPump() + public ModelElectricPump() { - textureWidth = 64; + textureWidth = 128; textureHeight = 64; - PumpHead = new ModelRenderer(this, 33, 0); - PumpHead.addBox(0F, 0F, 0F, 6, 3, 6); - PumpHead.setRotationPoint(-3F, 19F, -3F); - PumpHead.setTextureSize(64, 64); - PumpHead.mirror = true; - setRotation(PumpHead, 0F, 0F, 0F); - Connector = new ModelRenderer(this, 33, 10); - Connector.addBox(0F, 0F, 0F, 4, 1, 5); - Connector.setRotationPoint(-2F, 14F, 2.5F); - Connector.setTextureSize(64, 64); - Connector.mirror = true; - setRotation(Connector, 0F, 0F, 0F); - Panel1 = new ModelRenderer(this, 0, 15); - Panel1.addBox(-3F, -6F, 0F, 6, 6, 1); - Panel1.setRotationPoint(0F, 21F, -3F); - Panel1.setTextureSize(64, 64); - Panel1.mirror = true; - setRotation(Panel1, 0.5585054F, 0F, 0F); - Panel2 = new ModelRenderer(this, 15, 15); - Panel2.addBox(0F, -6F, -3F, 1, 6, 6); - Panel2.setRotationPoint(-3F, 21F, 0F); - Panel2.setTextureSize(64, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, -0.5585054F); - Panel3 = new ModelRenderer(this, 15, 15); - Panel3.addBox(-1F, -6F, -3F, 1, 6, 6); - Panel3.setRotationPoint(3F, 21F, 0F); - Panel3.setTextureSize(64, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0.5585054F); - Body = new ModelRenderer(this, 30, 17); - Body.addBox(0F, 0F, 0F, 6, 10, 6); - Body.setRotationPoint(-3F, 9F, -3F); - Body.setTextureSize(64, 64); - Body.mirror = true; - setRotation(Body, 0F, 0F, 0F); - Axil = new ModelRenderer(this, 0, 28); - Axil.addBox(0F, 0F, 0F, 9, 2, 4); - Axil.setRotationPoint(-4.5F, 17F, -2F); - Axil.setTextureSize(64, 64); - Axil.mirror = true; - setRotation(Axil, 0F, 0F, 0F); - Axil2 = new ModelRenderer(this, 0, 0); - Axil2.addBox(0F, 0F, 0F, 4, 2, 12); - Axil2.setRotationPoint(-2F, 17F, -4.5F); - Axil2.setTextureSize(64, 64); - Axil2.mirror = true; - setRotation(Axil2, 0F, 0F, 0F); - Ring1 = new ModelRenderer(this, 0, 35); - Ring1.addBox(0F, 0F, 0F, 8, 1, 8); - Ring1.setRotationPoint(-4F, 12F, -4F); - Ring1.setTextureSize(64, 64); - Ring1.mirror = true; - setRotation(Ring1, 0F, 0F, 0F); - Ring2 = new ModelRenderer(this, 0, 35); - Ring2.addBox(0F, 0F, 0F, 8, 1, 8); - Ring2.setRotationPoint(-4F, 10F, -4F); - Ring2.setTextureSize(64, 64); - Ring2.mirror = true; - setRotation(Ring2, 0F, 0F, 0F); - Plug = new ModelRenderer(this, 0, 45); - Plug.addBox(0F, 0F, 0F, 6, 6, 1); - Plug.setRotationPoint(-3F, 13F, 7F); - Plug.setTextureSize(64, 64); - Plug.mirror = true; - setRotation(Plug, 0F, 0F, 0F); - Ring3 = new ModelRenderer(this, 0, 35); - Ring3.addBox(0F, 0F, 0F, 8, 1, 8); - Ring3.setRotationPoint(-4F, 8F, -4F); - Ring3.setTextureSize(64, 64); - Ring3.mirror = true; - setRotation(Ring3, 0F, 0F, 0F); + pumpRingTop = new ModelRenderer(this, 68, 9); + pumpRingTop.addBox(0F, 0F, 0F, 8, 1, 8); + pumpRingTop.setRotationPoint(-4F, 10F, -4F); + pumpRingTop.setTextureSize(128, 64); + pumpRingTop.mirror = true; + setRotation(pumpRingTop, 0F, 0F, 0F); + pumpPortTop = new ModelRenderer(this, 68, 0); + pumpPortTop.addBox(0F, 0F, 0F, 8, 1, 8); + pumpPortTop.setRotationPoint(-4F, 8F, -4F); + pumpPortTop.setTextureSize(128, 64); + pumpPortTop.mirror = true; + setRotation(pumpPortTop, 0F, 0F, 0F); + pumpCasing = new ModelRenderer(this, 0, 0); + pumpCasing.addBox(0F, 0F, 0F, 7, 12, 7); + pumpCasing.setRotationPoint(-3.5F, 11F, -3.5F); + pumpCasing.setTextureSize(128, 64); + pumpCasing.mirror = true; + setRotation(pumpCasing, 0F, 0F, 0F); + pumpBase = new ModelRenderer(this, 28, 0); + pumpBase.addBox(0F, 0F, 0F, 6, 15, 6); + pumpBase.setRotationPoint(-3F, 9F, -3F); + pumpBase.setTextureSize(128, 64); + pumpBase.mirror = true; + setRotation(pumpBase, 0F, 0F, 0F); + powerPort = new ModelRenderer(this, 38, 29); + powerPort.addBox(0F, 0F, 0F, 8, 8, 1); + powerPort.setRotationPoint(-4F, 12F, -8F); + powerPort.setTextureSize(128, 64); + powerPort.mirror = true; + setRotation(powerPort, 0F, 0F, 0F); + powerConnector = new ModelRenderer(this, 0, 29); + powerConnector.addBox(0F, 0F, 0F, 5, 5, 4); + powerConnector.setRotationPoint(-2.5F, 13.5F, -7F); + powerConnector.setTextureSize(128, 64); + powerConnector.mirror = true; + setRotation(powerConnector, 0F, 0F, 0F); + powerConnectorFrame4 = new ModelRenderer(this, 38, 21); + powerConnectorFrame4.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame4.setRotationPoint(2F, 18F, -7F); + powerConnectorFrame4.setTextureSize(128, 64); + powerConnectorFrame4.mirror = true; + setRotation(powerConnectorFrame4, 0F, 0F, 0F); + powerConnectorFrame3 = new ModelRenderer(this, 38, 21); + powerConnectorFrame3.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame3.setRotationPoint(-3F, 18F, -7F); + powerConnectorFrame3.setTextureSize(128, 64); + powerConnectorFrame3.mirror = true; + setRotation(powerConnectorFrame3, 0F, 0F, 0F); + powerConnectorFrame2 = new ModelRenderer(this, 38, 21); + powerConnectorFrame2.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame2.setRotationPoint(2F, 13F, -7F); + powerConnectorFrame2.setTextureSize(128, 64); + powerConnectorFrame2.mirror = true; + setRotation(powerConnectorFrame2, 0F, 0F, 0F); + powerConnectorFrame1 = new ModelRenderer(this, 38, 21); + powerConnectorFrame1.addBox(0F, 0F, 0F, 1, 1, 4); + powerConnectorFrame1.setRotationPoint(-3F, 13F, -7F); + powerConnectorFrame1.setTextureSize(128, 64); + powerConnectorFrame1.mirror = true; + setRotation(powerConnectorFrame1, 0F, 0F, 0F); + pipeToggleBack = new ModelRenderer(this, 0, 19); + pipeToggleBack.addBox(0F, 0F, 0F, 6, 6, 4); + pipeToggleBack.setRotationPoint(-3F, 13F, 3F); + pipeToggleBack.setTextureSize(128, 64); + pipeToggleBack.mirror = true; + setRotation(pipeToggleBack, 0F, 0F, 0F); + pipeToggleRingBack = new ModelRenderer(this, 18, 30); + pipeToggleRingBack.addBox(0F, 0F, 0F, 7, 7, 1); + pipeToggleRingBack.setRotationPoint(-3.5F, 12.5F, 5F); + pipeToggleRingBack.setTextureSize(128, 64); + pipeToggleRingBack.mirror = true; + setRotation(pipeToggleRingBack, 0F, 0F, 0F); + pipeTogglePortBack = new ModelRenderer(this, 20, 21); + pipeTogglePortBack.addBox(0F, 0F, 0F, 8, 8, 1); + pipeTogglePortBack.setRotationPoint(-4F, 12F, 7F); + pipeTogglePortBack.setTextureSize(128, 64); + pipeTogglePortBack.mirror = true; + setRotation(pipeTogglePortBack, 0F, 0F, 0F); + pipeToggleLeft = new ModelRenderer(this, 34, 38); + pipeToggleLeft.addBox(0F, 0F, 0F, 4, 6, 6); + pipeToggleLeft.setRotationPoint(3F, 13F, -3F); + pipeToggleLeft.setTextureSize(128, 64); + pipeToggleLeft.mirror = true; + setRotation(pipeToggleLeft, 0F, 0F, 0F); + pipeToggleRingLeft = new ModelRenderer(this, 18, 38); + pipeToggleRingLeft.addBox(0F, 0F, 0F, 1, 7, 7); + pipeToggleRingLeft.setRotationPoint(5F, 12.5F, -3.5F); + pipeToggleRingLeft.setTextureSize(128, 64); + pipeToggleRingLeft.mirror = true; + setRotation(pipeToggleRingLeft, 0F, 0F, 0F); + pipeTogglePortLeft = new ModelRenderer(this, 0, 38); + pipeTogglePortLeft.addBox(0F, 0F, 0F, 1, 8, 8); + pipeTogglePortLeft.setRotationPoint(7F, 12F, -4F); + pipeTogglePortLeft.setTextureSize(128, 64); + pipeTogglePortLeft.mirror = true; + setRotation(pipeTogglePortLeft, 0F, 0F, 0F); + pipeToggleRight = new ModelRenderer(this, 34, 38); + pipeToggleRight.mirror = true; + pipeToggleRight.addBox(0F, 0F, 0F, 4, 6, 6); + pipeToggleRight.setRotationPoint(-7F, 13F, -3F); + pipeToggleRight.setTextureSize(128, 64); + setRotation(pipeToggleRight, 0F, 0F, 0F); + pipeToggleRingRight = new ModelRenderer(this, 18, 38); + pipeToggleRingRight.addBox(0F, 0F, 0F, 1, 7, 7); + pipeToggleRingRight.setRotationPoint(-6F, 12.5F, -3.5F); + pipeToggleRingRight.setTextureSize(128, 64); + pipeToggleRingRight.mirror = true; + setRotation(pipeToggleRingRight, 0F, 0F, 0F); + pipeTogglePortRight = new ModelRenderer(this, 0, 38); + pipeTogglePortRight.addBox(0F, 0F, 0F, 1, 8, 8); + pipeTogglePortRight.setRotationPoint(-8F, 12F, -4F); + pipeTogglePortRight.setTextureSize(128, 64); + pipeTogglePortRight.mirror = true; + setRotation(pipeTogglePortRight, 0F, 0F, 0F); + pumpPipe = new ModelRenderer(this, 52, 0); + pumpPipe.addBox(0F, 0F, 0F, 4, 8, 4); + pumpPipe.setRotationPoint(-2F, 24F, -2F); + pumpPipe.setTextureSize(128, 64); + pumpPipe.mirror = true; + setRotation(pumpPipe, 0F, 0F, 0F); } public void render(float size) { - PumpHead.render(size); - Connector.render(size); - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Body.render(size); - Axil.render(size); - Axil2.render(size); - Ring1.render(size); - Ring2.render(size); - Plug.render(size); - Ring3.render(size); + pumpRingTop.render(size); + pumpPortTop.render(size); + pumpCasing.render(size); + pumpBase.render(size); + powerPort.render(size); + powerConnector.render(size); + powerConnectorFrame4.render(size); + powerConnectorFrame3.render(size); + powerConnectorFrame2.render(size); + powerConnectorFrame1.render(size); + /*pipeToggleBack.render(size); + pipeToggleRingBack.render(size); + pipeTogglePortBack.render(size); + pipeToggleLeft.render(size); + pipeToggleRingLeft.render(size); + pipeTogglePortLeft.render(size); + pipeToggleRight.render(size); + pipeToggleRingRight.render(size); + pipeTogglePortRight.render(size);*/ + pumpPipe.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java index c52693ee9..5b252f01d 100644 --- a/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/model/ModelRotaryCondensentrator.java @@ -8,216 +8,192 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelRotaryCondensentrator extends ModelBase { - ModelRenderer GasBottleLid1; - ModelRenderer GasBottleLid2; - ModelRenderer GasBottleDecor1; - ModelRenderer GasBottleDecor2; - ModelRenderer GasBottleDecor3; - ModelRenderer GasBottleDecor4; - ModelRenderer GasBottle1; - ModelRenderer GasBottle2; - ModelRenderer GasBottleBot1; - ModelRenderer GasBottleBot2; - ModelRenderer LiqBottleLid1; - ModelRenderer LiqBottleLid2; - ModelRenderer LiqBottleBot1; - ModelRenderer LiqBottleBot2; - ModelRenderer LiqBottle2; - ModelRenderer LiqBottle1; - ModelRenderer LiqBottleDecor1; - ModelRenderer LiqBottleDecor2; - ModelRenderer LiqBottleDecor3; - ModelRenderer LiqBottleDecor4; - ModelRenderer GasInput; - ModelRenderer MidSection1; - ModelRenderer MidSection2; - ModelRenderer LiquidOutput; - ModelRenderer MidSection3; + ModelRenderer portRight; + ModelRenderer tankRight; + ModelRenderer base; + ModelRenderer pipe; + ModelRenderer middle; + ModelRenderer shaft; + ModelRenderer portLeft; + ModelRenderer tankLeft; + ModelRenderer support4; + ModelRenderer bridge; + ModelRenderer tube8; + ModelRenderer tube7; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer top; + ModelRenderer support3; + ModelRenderer support2; + ModelRenderer support1; - public ModelRotaryCondensentrator() + public ModelRotaryCondensentrator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - GasBottleLid1 = new ModelRenderer(this, 0, 40); - GasBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleLid1.setRotationPoint(-7F, 11F, 1F); - GasBottleLid1.setTextureSize(128, 128); - GasBottleLid1.mirror = true; - setRotation(GasBottleLid1, 0F, 0F, 0F); - GasBottleLid2 = new ModelRenderer(this, 0, 40); - GasBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleLid2.setRotationPoint(1F, 11F, 1F); - GasBottleLid2.setTextureSize(128, 128); - GasBottleLid2.mirror = true; - setRotation(GasBottleLid2, 0F, 0F, 0F); - GasBottleDecor1 = new ModelRenderer(this, 0, 33); - GasBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor1.setRotationPoint(1.5F, 21F, 1.5F); - GasBottleDecor1.setTextureSize(128, 128); - GasBottleDecor1.mirror = true; - setRotation(GasBottleDecor1, 0F, 0F, 0F); - GasBottleDecor2 = new ModelRenderer(this, 0, 33); - GasBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor2.setRotationPoint(1.5F, 13F, 1.5F); - GasBottleDecor2.setTextureSize(128, 128); - GasBottleDecor2.mirror = true; - setRotation(GasBottleDecor2, 0F, 0F, 0F); - GasBottleDecor3 = new ModelRenderer(this, 0, 33); - GasBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor3.setRotationPoint(-6.5F, 21F, 1.5F); - GasBottleDecor3.setTextureSize(128, 128); - GasBottleDecor3.mirror = true; - setRotation(GasBottleDecor3, 0F, 0F, 0F); - GasBottleDecor4 = new ModelRenderer(this, 0, 33); - GasBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5); - GasBottleDecor4.setRotationPoint(-6.5F, 13F, 1.5F); - GasBottleDecor4.setTextureSize(128, 128); - GasBottleDecor4.mirror = true; - setRotation(GasBottleDecor4, 0F, 0F, 0F); - GasBottle1 = new ModelRenderer(this, 0, 48); - GasBottle1.addBox(0F, 0F, 0F, 4, 11, 4); - GasBottle1.setRotationPoint(-6F, 12F, 2F); - GasBottle1.setTextureSize(128, 128); - GasBottle1.mirror = true; - setRotation(GasBottle1, 0F, 0F, 0F); - GasBottle2 = new ModelRenderer(this, 0, 48); - GasBottle2.addBox(0F, 0F, 0F, 4, 11, 4); - GasBottle2.setRotationPoint(2F, 12F, 2F); - GasBottle2.setTextureSize(128, 128); - GasBottle2.mirror = true; - setRotation(GasBottle2, 0F, 0F, 0F); - GasBottleBot1 = new ModelRenderer(this, 0, 40); - GasBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleBot1.setRotationPoint(-7F, 23F, 1F); - GasBottleBot1.setTextureSize(128, 128); - GasBottleBot1.mirror = true; - setRotation(GasBottleBot1, 0F, 0F, 0F); - GasBottleBot2 = new ModelRenderer(this, 0, 40); - GasBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6); - GasBottleBot2.setRotationPoint(1F, 23F, 1F); - GasBottleBot2.setTextureSize(128, 128); - GasBottleBot2.mirror = true; - setRotation(GasBottleBot2, 0F, 0F, 0F); - LiqBottleLid1 = new ModelRenderer(this, 25, 40); - LiqBottleLid1.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleLid1.setRotationPoint(-7F, 11F, -7F); - LiqBottleLid1.setTextureSize(128, 128); - LiqBottleLid1.mirror = true; - setRotation(LiqBottleLid1, 0F, 0F, 0F); - LiqBottleLid2 = new ModelRenderer(this, 25, 40); - LiqBottleLid2.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleLid2.setRotationPoint(1F, 11F, -7F); - LiqBottleLid2.setTextureSize(128, 128); - LiqBottleLid2.mirror = true; - setRotation(LiqBottleLid2, 0F, 0F, 0F); - LiqBottleBot1 = new ModelRenderer(this, 25, 40); - LiqBottleBot1.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleBot1.setRotationPoint(-7F, 23F, -7F); - LiqBottleBot1.setTextureSize(128, 128); - LiqBottleBot1.mirror = true; - setRotation(LiqBottleBot1, 0F, 0F, 0F); - LiqBottleBot2 = new ModelRenderer(this, 25, 40); - LiqBottleBot2.addBox(0F, 0F, 0F, 6, 1, 6); - LiqBottleBot2.setRotationPoint(1F, 23F, -7F); - LiqBottleBot2.setTextureSize(128, 128); - LiqBottleBot2.mirror = true; - setRotation(LiqBottleBot2, 0F, 0F, 0F); - LiqBottle2 = new ModelRenderer(this, 25, 48); - LiqBottle2.addBox(0F, 0F, 0F, 4, 11, 4); - LiqBottle2.setRotationPoint(2F, 12F, -6F); - LiqBottle2.setTextureSize(128, 128); - LiqBottle2.mirror = true; - setRotation(LiqBottle2, 0F, 0F, 0F); - LiqBottle1 = new ModelRenderer(this, 25, 48); - LiqBottle1.addBox(0F, 0F, 0F, 4, 11, 4); - LiqBottle1.setRotationPoint(-6F, 12F, -6F); - LiqBottle1.setTextureSize(128, 128); - LiqBottle1.mirror = true; - setRotation(LiqBottle1, 0F, 0F, 0F); - LiqBottleDecor1 = new ModelRenderer(this, 25, 33); - LiqBottleDecor1.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor1.setRotationPoint(1.5F, 21F, -6.5F); - LiqBottleDecor1.setTextureSize(128, 128); - LiqBottleDecor1.mirror = true; - setRotation(LiqBottleDecor1, 0F, 0F, 0F); - LiqBottleDecor2 = new ModelRenderer(this, 25, 33); - LiqBottleDecor2.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor2.setRotationPoint(1.5F, 13F, -6.5F); - LiqBottleDecor2.setTextureSize(128, 128); - LiqBottleDecor2.mirror = true; - setRotation(LiqBottleDecor2, 0F, 0F, 0F); - LiqBottleDecor3 = new ModelRenderer(this, 25, 33); - LiqBottleDecor3.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor3.setRotationPoint(-6.5F, 21F, -6.5F); - LiqBottleDecor3.setTextureSize(128, 128); - LiqBottleDecor3.mirror = true; - setRotation(LiqBottleDecor3, 0F, 0F, 0F); - LiqBottleDecor4 = new ModelRenderer(this, 25, 33); - LiqBottleDecor4.addBox(0F, 0F, 0F, 5, 1, 5); - LiqBottleDecor4.setRotationPoint(-6.5F, 13F, -6.5F); - LiqBottleDecor4.setTextureSize(128, 128); - LiqBottleDecor4.mirror = true; - setRotation(LiqBottleDecor4, 0F, 0F, 0F); - GasInput = new ModelRenderer(this, 0, 24); - GasInput.addBox(0F, 0F, 0F, 6, 6, 1); - GasInput.setRotationPoint(-3F, 13F, 7F); - GasInput.setTextureSize(128, 128); - GasInput.mirror = true; - setRotation(GasInput, 0F, 0F, 0F); - MidSection1 = new ModelRenderer(this, 15, 20); - MidSection1.addBox(0F, 0F, 0F, 4, 5, 6); - MidSection1.setRotationPoint(-2F, 18F, 1F); - MidSection1.setTextureSize(128, 128); - MidSection1.mirror = true; - setRotation(MidSection1, 0F, 0F, 0F); - MidSection2 = new ModelRenderer(this, 37, 0); - MidSection2.addBox(0F, 0F, 0F, 6, 7, 8); - MidSection2.setRotationPoint(-3F, 17F, -7F); - MidSection2.setTextureSize(128, 128); - MidSection2.mirror = true; - setRotation(MidSection2, 0F, 0F, 0F); - LiquidOutput = new ModelRenderer(this, 36, 22); - LiquidOutput.addBox(0F, 0F, 0F, 8, 8, 1); - LiquidOutput.setRotationPoint(-4F, 12F, -8F); - LiquidOutput.setTextureSize(128, 128); - LiquidOutput.mirror = true; - setRotation(LiquidOutput, 0F, 0F, 0F); - MidSection3 = new ModelRenderer(this, 0, 0); - MidSection3.addBox(0F, 0F, 0F, 4, 2, 14); - MidSection3.setRotationPoint(-2F, 15F, -7F); - MidSection3.setTextureSize(128, 128); - MidSection3.mirror = true; - setRotation(MidSection3, 0F, 0F, 0F); + portRight = new ModelRenderer(this, 82, 31); + portRight.addBox(0F, 0F, 0F, 1, 10, 10); + portRight.setRotationPoint(7.01F, 11F, -5F); + portRight.setTextureSize(128, 64); + portRight.mirror = true; + setRotation(portRight, 0F, 0F, 0F); + tankRight = new ModelRenderer(this, 64, 9); + tankRight.mirror = true; + tankRight.addBox(0F, 0F, 0F, 6, 8, 14); + tankRight.setRotationPoint(1F, 11F, -7F); + tankRight.setTextureSize(128, 64); + setRotation(tankRight, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 34); + 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); + pipe = new ModelRenderer(this, 0, 4); + pipe.addBox(0F, 0F, 0F, 2, 6, 6); + pipe.setRotationPoint(-1.01F, 13F, -3F); + pipe.setTextureSize(128, 64); + pipe.mirror = true; + setRotation(pipe, 0F, 0F, 0F); + middle = new ModelRenderer(this, 0, 17); + middle.addBox(0F, 0F, 0F, 16, 1, 16); + middle.setRotationPoint(-8F, 10F, -8F); + middle.setTextureSize(128, 64); + middle.mirror = true; + setRotation(middle, 0F, 0F, 0F); + shaft = new ModelRenderer(this, 12, 0); + shaft.addBox(0F, 0F, 0F, 1, 2, 1); + shaft.setRotationPoint(-0.5F, 11F, -0.5F); + shaft.setTextureSize(128, 64); + shaft.mirror = true; + setRotation(shaft, 0F, 0F, 0F); + portLeft = new ModelRenderer(this, 64, 31); + 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); + tankLeft = new ModelRenderer(this, 64, 9); + tankLeft.addBox(0F, 0F, 0F, 6, 8, 14); + tankLeft.setRotationPoint(-7F, 11F, -7F); + tankLeft.setTextureSize(128, 64); + tankLeft.mirror = true; + setRotation(tankLeft, 0F, 0F, 0F); + support4 = new ModelRenderer(this, 7, 0); + support4.addBox(0F, 0F, 0F, 1, 1, 1); + support4.setRotationPoint(6F, 9F, 6F); + support4.setTextureSize(128, 64); + support4.mirror = true; + setRotation(support4, 0F, 0F, 0F); + bridge = new ModelRenderer(this, 64, 0); + bridge.addBox(0F, 0F, 0F, 8, 1, 8); + bridge.setRotationPoint(-4F, 9F, -4F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + tube8 = new ModelRenderer(this, 0, 0); + tube8.addBox(0F, 0F, 0F, 2, 1, 1); + tube8.setRotationPoint(-1F, 18F, 5F); + tube8.setTextureSize(128, 64); + tube8.mirror = true; + setRotation(tube8, 0F, 0F, 0F); + tube7 = new ModelRenderer(this, 0, 0); + tube7.addBox(0F, 0F, 0F, 2, 1, 1); + tube7.setRotationPoint(-1F, 12F, 5F); + tube7.setTextureSize(128, 64); + tube7.mirror = true; + setRotation(tube7, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 2, 1, 1); + tube6.setRotationPoint(-1F, 14F, 5F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 2, 1, 1); + tube5.setRotationPoint(-1F, 16F, 5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 0); + tube4.addBox(0F, 0F, 0F, 2, 1, 1); + tube4.setRotationPoint(-1F, 18F, -6F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 2, 1, 1); + tube3.setRotationPoint(-1F, 16F, -6F); + 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(-1F, 14F, -6F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, 0F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(0F, 0F, 0F, 2, 1, 1); + tube1.setRotationPoint(-1F, 12F, -6F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 0F, 0F, 0F); + top = new ModelRenderer(this, 0, 0); + top.addBox(0F, 0F, 0F, 16, 1, 16); + top.setRotationPoint(-8F, 8F, -8F); + top.setTextureSize(128, 64); + top.mirror = true; + setRotation(top, 0F, 0F, 0F); + support3 = new ModelRenderer(this, 7, 0); + support3.addBox(0F, 0F, 0F, 1, 1, 1); + support3.setRotationPoint(6F, 9F, -7F); + support3.setTextureSize(128, 64); + support3.mirror = true; + setRotation(support3, 0F, 0F, 0F); + support2 = new ModelRenderer(this, 7, 0); + support2.addBox(0F, 0F, 0F, 1, 1, 1); + support2.setRotationPoint(-7F, 9F, -7F); + support2.setTextureSize(128, 64); + support2.mirror = true; + setRotation(support2, 0F, 0F, 0F); + support1 = new ModelRenderer(this, 7, 0); + support1.addBox(0F, 0F, 0F, 1, 1, 1); + support1.setRotationPoint(-7F, 9F, 6F); + support1.setTextureSize(128, 64); + support1.mirror = true; + setRotation(support1, 0F, 0F, 0F); } public void render(float size) { - GasBottleLid1.render(size); - GasBottleLid2.render(size); - GasBottleDecor1.render(size); - GasBottleDecor2.render(size); - GasBottleDecor3.render(size); - GasBottleDecor4.render(size); - GasBottle1.render(size); - GasBottle2.render(size); - GasBottleBot1.render(size); - GasBottleBot2.render(size); - LiqBottleLid1.render(size); - LiqBottleLid2.render(size); - LiqBottleBot1.render(size); - LiqBottleBot2.render(size); - LiqBottle2.render(size); - LiqBottle1.render(size); - LiqBottleDecor1.render(size); - LiqBottleDecor2.render(size); - LiqBottleDecor3.render(size); - LiqBottleDecor4.render(size); - GasInput.render(size); - MidSection1.render(size); - MidSection2.render(size); - LiquidOutput.render(size); - MidSection3.render(size); + portRight.render(size); + tankRight.render(size); + base.render(size); + pipe.render(size); + middle.render(size); + shaft.render(size); + portLeft.render(size); + tankLeft.render(size); + support4.render(size); + bridge.render(size); + tube8.render(size); + tube7.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + top.render(size); + support3.render(size); + support2.render(size); + support1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 0ccade6ec..a99f56d7c 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -75,7 +75,6 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler if(type == MachineType.ELECTRIC_PUMP) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.85F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectricPump.png")); electricPump.render(0.0560F); @@ -114,8 +113,8 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.ROTARY_CONDENSENTRATOR) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "RotaryCondensentrator.png")); rotaryCondensentrator.render(0.0625F); } @@ -146,24 +145,24 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.CHEMICAL_DISSOLUTION_CHAMBER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalDissolutionChamber.png")); chemicalDissolutionChamber.render(0.0625F); } else if(type == MachineType.CHEMICAL_WASHER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalWasher.png")); chemicalWasher.render(0.0625F); } else if(type == MachineType.CHEMICAL_CRYSTALLIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalCrystallizer.png")); chemicalCrystallizer.render(0.0625F); } @@ -178,8 +177,8 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.PRESSURIZED_REACTION_CHAMBER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); + GL11.glTranslatef(0.05F, -0.96F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "PressurizedReactionChamber.png")); pressurizedReactionChamber.render(0.0625F); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java index 73f91d754..847c9f532 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalCrystallizer.java @@ -49,7 +49,7 @@ public class RenderChemicalCrystallizer extends TileEntitySpecialRenderer tileEntity.spin = (tileEntity.spin + (tileEntity.spinSpeed*0.1F)) % 1; GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.renderWithRotation(0.0625F, tileEntity.spin); + model.render(0.0625F); GL11.glPopMatrix(); MekanismRenderer.machineRenderer.renderAModelAt(tileEntity, x, y, z, partialTick); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java index 0c08cb083..2524e3938 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectricPump.java @@ -32,10 +32,10 @@ public class RenderElectricPump extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 2: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index f1a96863e..ac2892a04 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -32,10 +32,10 @@ public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 17f615a42..5354c8cf8 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -280,7 +280,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } - else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR) + else if(type == MachineType.SOLAR_NEUTRON_ACTIVATOR || type == MachineType.SEISMIC_VIBRATOR) { if(y+1 > 255 || !world.getBlock(x, y+1, z).isReplaceable(world, x, y+1, z)) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 373f2af47..8218d594e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -95,7 +95,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityNoisyElectricBlock configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.YELLOW, new int[] {0})); - configComponent.setConfig(TransmissionType.GAS, new byte[] {0, 0, 0, 0, 1, 0}); + configComponent.setConfig(TransmissionType.GAS, new byte[] {-1, -1, -1, -1, 1, -1}); configComponent.setCanEject(TransmissionType.GAS, false); configComponent.setInputConfig(TransmissionType.ENERGY); diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index ceee8968b..7e0447554 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -11,6 +11,7 @@ import mekanism.api.MekanismConfig.usage; import mekanism.api.Range4D; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; +import mekanism.common.base.IBoundingBlock; import mekanism.common.base.IRedstoneControl; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -22,7 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile +public class TileEntitySeismicVibrator extends TileEntityElectricBlock implements IActiveState, IRedstoneControl, ISecurityTile, IBoundingBlock { public boolean isActive; @@ -214,4 +215,17 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement { return securityComponent; } + + @Override + public void onPlace() + { + MekanismUtils.makeBoundingBlock(worldObj, Coord4D.get(this).getFromSide(ForgeDirection.UP), Coord4D.get(this)); + } + + @Override + public void onBreak() + { + worldObj.setBlockToAir(xCoord, yCoord+1, zCoord); + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + } } diff --git a/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png b/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png index c4d0ff88e..a67fe178f 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png and b/src/main/resources/assets/mekanism/render/ChemicalCrystallizer.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png b/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png index 7b1e34027..250669e62 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png and b/src/main/resources/assets/mekanism/render/ChemicalDissolutionChamber.png differ diff --git a/src/main/resources/assets/mekanism/render/ChemicalWasher.png b/src/main/resources/assets/mekanism/render/ChemicalWasher.png index 34e4e5cb1..b332e7c84 100644 Binary files a/src/main/resources/assets/mekanism/render/ChemicalWasher.png and b/src/main/resources/assets/mekanism/render/ChemicalWasher.png differ diff --git a/src/main/resources/assets/mekanism/render/ElectricPump.png b/src/main/resources/assets/mekanism/render/ElectricPump.png index f881af1fe..eb8209e46 100644 Binary files a/src/main/resources/assets/mekanism/render/ElectricPump.png and b/src/main/resources/assets/mekanism/render/ElectricPump.png differ diff --git a/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png b/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png index f0f8e3574..0a1e54084 100644 Binary files a/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png and b/src/main/resources/assets/mekanism/render/RotaryCondensentrator.png differ