From 9d22b7277c2e740be84c7a16ce8d2c8f8e047515 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 24 Mar 2016 00:33:28 -0400 Subject: [PATCH] Added new models --- .../mekanism/client/model/ModelChargepad.java | 101 +++--- .../mekanism/client/model/ModelGasTank.java | 141 +++++--- .../client/model/ModelMetallurgicInfuser.java | 341 +++++++----------- .../ModelPressurizedReactionChamber.java | 256 ++++++------- .../render/block/MachineRenderingHandler.java | 2 +- .../render/item/ItemRenderingHandler.java | 2 +- .../render/tileentity/RenderGasTank.java | 8 +- .../mekanism/common/block/BlockMachine.java | 2 +- .../tile/TileEntityMetallurgicInfuser.java | 7 +- .../client/BlockRenderingHandler.java | 11 +- .../client/model/ModelBioGenerator.java | 195 +++------- .../client/model/ModelGasGenerator.java | 310 ++++++++-------- .../client/model/ModelHeatGenerator.java | 257 ++++++------- .../client/model/ModelSolarGenerator.java | 4 +- .../client/render/RenderBioGenerator.java | 80 ++-- .../client/render/RenderGasGenerator.java | 8 +- .../client/render/RenderHeatGenerator.java | 8 +- .../common/block/BlockGenerator.java | 16 +- .../common/tile/TileEntityBioGenerator.java | 7 - .../assets/mekanism/render/BioGenerator.png | Bin 5331 -> 5595 bytes .../assets/mekanism/render/Chargepad.png | Bin 4717 -> 3389 bytes .../assets/mekanism/render/GasGenerator.png | Bin 3596 -> 5356 bytes .../mekanism/render/GasTankAdvanced.png | Bin 3245 -> 3928 bytes .../assets/mekanism/render/GasTankBasic.png | Bin 3241 -> 3953 bytes .../assets/mekanism/render/GasTankElite.png | Bin 3231 -> 3980 bytes .../mekanism/render/GasTankUltimate.png | Bin 3238 -> 3201 bytes .../assets/mekanism/render/HeatGenerator.png | Bin 2783 -> 4941 bytes .../mekanism/render/HeatGeneratorOn.png | Bin 4747 -> 6283 bytes .../mekanism/render/MetallurgicInfuser.png | Bin 5108 -> 7098 bytes .../render/PressurizedReactionChamber.png | Bin 3747 -> 5404 bytes 30 files changed, 800 insertions(+), 956 deletions(-) mode change 100755 => 100644 src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index fe998d34a..6755ec719 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -8,56 +8,73 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; + ModelRenderer base; + ModelRenderer port; + ModelRenderer plug; + ModelRenderer connector; + ModelRenderer stand; + ModelRenderer pillar2; + ModelRenderer pillar1; - public ModelChargepad() + public ModelChargepad() { textureWidth = 64; textureHeight = 64; - Shape1 = new ModelRenderer(this, 0, 0); - Shape1.addBox(0F, 0F, 0F, 16, 1, 16); - Shape1.setRotationPoint(-8F, 23F, -8F); - Shape1.setTextureSize(64, 64); - Shape1.mirror = true; - setRotation(Shape1, 0F, 0F, 0F); - Shape2 = new ModelRenderer(this, 0, 18); - Shape2.addBox(0F, 0F, 0F, 8, 11, 2); - Shape2.setRotationPoint(-4F, 12F, 6F); - Shape2.setTextureSize(64, 64); - Shape2.mirror = true; - setRotation(Shape2, 0F, 0F, 0F); - Shape3 = new ModelRenderer(this, 0, 0); - Shape3.addBox(0F, 0F, 0F, 4, 3, 1); - Shape3.setRotationPoint(-2F, 14F, 5F); - Shape3.setTextureSize(64, 64); - Shape3.mirror = true; - setRotation(Shape3, 0F, 0F, 0F); - Shape4 = new ModelRenderer(this, 3, 8); - Shape4.addBox(0F, 0F, 0F, 2, 5, 2); - Shape4.setRotationPoint(-5F, 18F, 5F); - Shape4.setTextureSize(64, 64); - Shape4.mirror = true; - setRotation(Shape4, 0F, 0F, 0F); - Shape5 = new ModelRenderer(this, 3, 8); - Shape5.addBox(0F, 0F, 0F, 2, 5, 2); - Shape5.setRotationPoint(3F, 18F, 5F); - Shape5.setTextureSize(64, 64); - Shape5.mirror = true; - setRotation(Shape5, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 1, 16); + base.setRotationPoint(-8F, 23F, -8F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + port = new ModelRenderer(this, 0, 17); + port.addBox(0F, 0F, 0F, 8, 8, 1); + port.setRotationPoint(-4F, 12F, 7F); + port.setTextureSize(64, 64); + port.mirror = true; + setRotation(port, 0F, 0F, 0F); + plug = new ModelRenderer(this, 0, 11); + plug.addBox(0F, 0F, 0F, 2, 1, 2); + plug.setRotationPoint(-1F, 19F, 3F); + plug.setTextureSize(64, 64); + plug.mirror = true; + setRotation(plug, 0F, 0F, 0F); + connector = new ModelRenderer(this, 18, 17); + connector.addBox(0F, 0F, 0F, 6, 6, 1); + connector.setRotationPoint(-3F, 13F, 6F); + connector.setTextureSize(64, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + stand = new ModelRenderer(this, 0, 0); + stand.addBox(0F, 0F, 0F, 6, 10, 1); + stand.setRotationPoint(-3F, 13F, 5F); + stand.setTextureSize(64, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + pillar2 = new ModelRenderer(this, 48, 0); + pillar2.addBox(0F, 0F, 0F, 2, 7, 2); + pillar2.setRotationPoint(2F, 16F, 3.99F); + pillar2.setTextureSize(64, 64); + pillar2.mirror = true; + setRotation(pillar2, 0F, 0F, 0F); + pillar2.mirror = false; + pillar1 = new ModelRenderer(this, 48, 0); + pillar1.addBox(0F, 0F, 0F, 2, 7, 2); + pillar1.setRotationPoint(-4F, 16F, 3.99F); + pillar1.setTextureSize(64, 64); + pillar1.mirror = true; + setRotation(pillar1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Shape1.render(size); - Shape2.render(size); - Shape3.render(size); - Shape4.render(size); - Shape5.render(size); + base.render(size); + port.render(size); + plug.render(size); + connector.render(size); + stand.render(size); + pillar2.render(size); + pillar1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelGasTank.java b/src/main/java/mekanism/client/model/ModelGasTank.java index 595b1c2a9..083381ab0 100644 --- a/src/main/java/mekanism/client/model/ModelGasTank.java +++ b/src/main/java/mekanism/client/model/ModelGasTank.java @@ -8,72 +8,97 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasTank extends ModelBase { - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer Tank; - ModelRenderer Panel4; - ModelRenderer Top; - ModelRenderer Exit; + ModelRenderer rim4; + ModelRenderer rim5; + ModelRenderer rim2; + ModelRenderer tankBase; + ModelRenderer valve; + ModelRenderer rim3; + ModelRenderer tank; + ModelRenderer rim0; + ModelRenderer valveBase; + ModelRenderer rim1; public ModelGasTank() { - textureWidth = 32; - textureHeight = 64; + textureWidth = 64; + textureHeight = 32; - Panel1 = new ModelRenderer(this, 0, 22); - Panel1.addBox(0F, 0F, 0F, 5, 13, 1); - Panel1.setRotationPoint(-2.5F, 11F, 3.5F); - Panel1.setTextureSize(32, 64); - Panel1.mirror = true; - setRotation(Panel1, 0F, 0F, 0F); - Panel2 = new ModelRenderer(this, 0, 37); - Panel2.addBox(0F, 0F, 0F, 1, 13, 5); - Panel2.setRotationPoint(3.5F, 11F, -2.5F); - Panel2.setTextureSize(32, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, 0F); - Panel3 = new ModelRenderer(this, 0, 22); - Panel3.addBox(0F, 0F, 0F, 5, 13, 1); - Panel3.setRotationPoint(-2.5F, 11F, -4.5F); - Panel3.setTextureSize(32, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0F); - Tank = new ModelRenderer(this, 0, 0); - Tank.addBox(0F, 0F, 0F, 7, 14, 7); - Tank.setRotationPoint(-3.5F, 10F, -3.5F); - Tank.setTextureSize(32, 64); - Tank.mirror = true; - setRotation(Tank, 0F, 0F, 0F); - Panel4 = new ModelRenderer(this, 0, 37); - Panel4.addBox(0F, 0F, 0F, 1, 13, 5); - Panel4.setRotationPoint(-4.5F, 11F, -2.5F); - Panel4.setTextureSize(32, 64); - Panel4.mirror = true; - setRotation(Panel4, 0F, 0F, 0F); - Top = new ModelRenderer(this, 13, 22); - Top.addBox(0F, 0F, 0F, 2, 2, 2); - Top.setRotationPoint(-1F, 8F, -1F); - Top.setTextureSize(32, 64); - Top.mirror = true; - setRotation(Top, 0F, 0F, 0F); - Exit = new ModelRenderer(this, 22, 22); - Exit.addBox(0F, 0F, 0F, 1, 1, 1); - Exit.setRotationPoint(1F, 8.2F, -0.5F); - Exit.setTextureSize(32, 64); - Exit.mirror = true; - setRotation(Exit, 0F, 0F, 0F); + 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) { - Panel1.render(size); - Panel2.render(size); - Panel3.render(size); - Tank.render(size); - Panel4.render(size); - Top.render(size); - Exit.render(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) diff --git a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java index 496ec04a4..3876d2122 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -8,216 +8,153 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelMetallurgicInfuser extends ModelBase { - ModelRenderer Base; - ModelRenderer RightChamber; - ModelRenderer TopChamber; - ModelRenderer BackChamber; - ModelRenderer LeftChamber; - ModelRenderer FCTop; - ModelRenderer FCBottom; - ModelRenderer FCRight; - ModelRenderer FCLeft; - ModelRenderer FCDoor; - ModelRenderer Cable1; - ModelRenderer Cable3; - ModelRenderer Cable5; - ModelRenderer Cable2; - ModelRenderer Cable4; - ModelRenderer Cable6; - ModelRenderer TopPanelDec; - ModelRenderer BackPlate; - ModelRenderer TopPanel; - ModelRenderer TopPanelExtr; - ModelRenderer ConnectorRight; - ModelRenderer ConnectorLeft; - ModelRenderer ConnectorWireRight; - ModelRenderer ConnectorWireLeft; - ModelRenderer ConnectorWireTop; + 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() + public ModelMetallurgicInfuser() { textureWidth = 128; textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 2, 16); - Base.setRotationPoint(-7F, 22F, -8F); - Base.setTextureSize(128, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - RightChamber = new ModelRenderer(this, 61, 0); - RightChamber.addBox(0F, 0F, 0F, 1, 6, 5); - RightChamber.setRotationPoint(5.5F, 16F, -6F); - RightChamber.setTextureSize(128, 64); - RightChamber.mirror = true; - setRotation(RightChamber, 0F, 0F, 0F); - TopChamber = new ModelRenderer(this, 86, 12); - TopChamber.addBox(0F, 0F, 0F, 11, 1, 5); - TopChamber.setRotationPoint(-5.5F, 15F, -6F); - TopChamber.setTextureSize(128, 64); - TopChamber.mirror = true; - setRotation(TopChamber, 0F, 0F, 0F); - BackChamber = new ModelRenderer(this, 74, 0); - BackChamber.addBox(0F, 0F, 0F, 11, 6, 1); - BackChamber.setRotationPoint(-5.5F, 16F, -1F); - BackChamber.setTextureSize(128, 64); - BackChamber.mirror = true; - setRotation(BackChamber, 0F, 0F, 0F); - LeftChamber = new ModelRenderer(this, 61, 0); - LeftChamber.addBox(0F, 0F, 0F, 1, 6, 5); - LeftChamber.setRotationPoint(-6.5F, 16F, -6F); - LeftChamber.setTextureSize(128, 64); - LeftChamber.mirror = true; - setRotation(LeftChamber, 0F, 0F, 0F); - FCTop = new ModelRenderer(this, 99, 6); - FCTop.addBox(0F, 0F, 0F, 11, 1, 1); - FCTop.setRotationPoint(-5.5F, 16F, -7F); - FCTop.setTextureSize(128, 64); - FCTop.mirror = true; - setRotation(FCTop, 0F, 0F, 0F); - FCBottom = new ModelRenderer(this, 99, 6); - FCBottom.addBox(0F, 0F, 0F, 11, 1, 1); - FCBottom.setRotationPoint(-5.5F, 21F, -7F); - FCBottom.setTextureSize(128, 64); - FCBottom.mirror = true; - setRotation(FCBottom, 0F, 0F, 0F); - FCRight = new ModelRenderer(this, 61, 11); - FCRight.addBox(0F, 0F, 0F, 1, 4, 1); - FCRight.setRotationPoint(4.5F, 17F, -7F); - FCRight.setTextureSize(128, 64); - FCRight.mirror = true; - setRotation(FCRight, 0F, 0F, 0F); - FCLeft = new ModelRenderer(this, 61, 11); - FCLeft.addBox(0F, 0F, 0F, 1, 4, 1); - FCLeft.setRotationPoint(-5.5F, 17F, -7F); - FCLeft.setTextureSize(128, 64); - FCLeft.mirror = true; - setRotation(FCLeft, 0F, 0F, 0F); - FCDoor = new ModelRenderer(this, 99, 0); - FCDoor.addBox(0F, -2F, -0.5F, 9, 4, 1); - FCDoor.setRotationPoint(-4.5F, 19F, -7F); - FCDoor.setTextureSize(128, 64); - FCDoor.mirror = true; - setRotation(FCDoor, 0F, 0F, 0F); - Cable1 = new ModelRenderer(this, 105, 19); - Cable1.addBox(0F, 0F, 0F, 1, 1, 7); - Cable1.setRotationPoint(-4.5F, 19.5F, 0F); - Cable1.setTextureSize(128, 64); - Cable1.mirror = true; - setRotation(Cable1, 0F, 0.0174533F, 0F); - Cable3 = new ModelRenderer(this, 86, 19); - Cable3.addBox(0F, 0F, 0F, 2, 2, 7); - Cable3.setRotationPoint(3F, 18F, 0F); - Cable3.setTextureSize(128, 64); - Cable3.mirror = true; - setRotation(Cable3, 0F, 0.0174533F, 0F); - Cable5 = new ModelRenderer(this, 105, 19); - Cable5.addBox(0F, 0F, 0F, 1, 1, 7); - Cable5.setRotationPoint(3.5F, 19.5F, 0F); - Cable5.setTextureSize(128, 64); - Cable5.mirror = true; - setRotation(Cable5, 0F, 0.0174533F, 0F); - Cable2 = new ModelRenderer(this, 86, 19); - Cable2.addBox(0F, 0F, 0F, 2, 2, 7); - Cable2.setRotationPoint(-5F, 18F, 0F); - Cable2.setTextureSize(128, 64); - Cable2.mirror = true; - setRotation(Cable2, 0F, 0F, 0F); - Cable4 = new ModelRenderer(this, 105, 19); - Cable4.addBox(0F, 0F, 0F, 1, 1, 7); - Cable4.setRotationPoint(-4.5F, 17.5F, 0F); - Cable4.setTextureSize(128, 64); - Cable4.mirror = true; - setRotation(Cable4, 0F, 0.0174533F, 0F); - Cable6 = new ModelRenderer(this, 105, 19); - Cable6.addBox(0F, 0F, 0F, 1, 1, 7); - Cable6.setRotationPoint(3.5F, 17.5F, 0F); - Cable6.setTextureSize(128, 64); - Cable6.mirror = true; - setRotation(Cable6, 0F, 0.0174533F, 0F); - TopPanelDec = new ModelRenderer(this, 33, 28); - TopPanelDec.addBox(0F, 0F, 0F, 13, 1, 1); - TopPanelDec.setRotationPoint(-6.5F, 11.5F, 5.5F); - TopPanelDec.setTextureSize(128, 64); - TopPanelDec.mirror = true; - setRotation(TopPanelDec, 0F, 0F, 0F); - BackPlate = new ModelRenderer(this, 0, 19); - BackPlate.addBox(0F, 0F, 0F, 14, 12, 2); - BackPlate.setRotationPoint(-7F, 10F, 6F); - BackPlate.setTextureSize(128, 64); - BackPlate.mirror = true; - setRotation(BackPlate, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 33, 19); - TopPanel.addBox(0F, 0F, 0F, 14, 2, 3); - TopPanel.setRotationPoint(-7F, 10F, 3F); - TopPanel.setTextureSize(128, 64); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); - TopPanelExtr = new ModelRenderer(this, 33, 25); - TopPanelExtr.addBox(0F, 0F, 0F, 14, 1, 1); - TopPanelExtr.setRotationPoint(-7F, 10F, 2F); - TopPanelExtr.setTextureSize(128, 64); - TopPanelExtr.mirror = true; - setRotation(TopPanelExtr, 0F, 0F, 0F); - ConnectorRight = new ModelRenderer(this, 68, 19); - ConnectorRight.addBox(0F, 0F, 0F, 3, 1, 3); - ConnectorRight.setRotationPoint(1.5F, 14F, -5F); - ConnectorRight.setTextureSize(128, 64); - ConnectorRight.mirror = true; - setRotation(ConnectorRight, 0F, 0F, 0F); - ConnectorLeft = new ModelRenderer(this, 68, 19); - ConnectorLeft.addBox(0F, 0F, 0F, 3, 1, 3); - ConnectorLeft.setRotationPoint(-4.5F, 14F, -5F); - ConnectorLeft.setTextureSize(128, 64); - ConnectorLeft.mirror = true; - setRotation(ConnectorLeft, 0F, 0F, 0F); - ConnectorWireRight = new ModelRenderer(this, 68, 24); - ConnectorWireRight.addBox(0F, 0F, 0F, 1, 3, 1); - ConnectorWireRight.setRotationPoint(2.5F, 11F, -4F); - ConnectorWireRight.setTextureSize(128, 64); - ConnectorWireRight.mirror = true; - setRotation(ConnectorWireRight, 0F, 0F, 0F); - ConnectorWireLeft = new ModelRenderer(this, 68, 24); - ConnectorWireLeft.addBox(0F, 0F, 0F, 1, 3, 1); - ConnectorWireLeft.setRotationPoint(-3.5F, 11F, -4F); - ConnectorWireLeft.setTextureSize(128, 64); - ConnectorWireLeft.mirror = true; - setRotation(ConnectorWireLeft, 0F, 0F, 0F); - ConnectorWireTop = new ModelRenderer(this, 68, 29); - ConnectorWireTop.addBox(0F, 0F, 0F, 5, 1, 1); - ConnectorWireTop.setRotationPoint(-2.5F, 11F, -4F); - ConnectorWireTop.setTextureSize(128, 64); - ConnectorWireTop.mirror = true; - setRotation(ConnectorWireTop, 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); + 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.addBox(0F, 0F, 0F, 1, 11, 7); + sideRight.setRotationPoint(7F, 9F, 0F); + sideRight.setTextureSize(128, 64); + sideRight.mirror = true; + setRotation(sideRight, 0F, 0F, 0F); + sideRight.mirror = false; + 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) + public void render(float size) { - Base.render(size); - RightChamber.render(size); - TopChamber.render(size); - BackChamber.render(size); - LeftChamber.render(size); - FCTop.render(size); - FCBottom.render(size); - FCRight.render(size); - FCLeft.render(size); - FCDoor.render(size); - Cable1.render(size); - Cable3.render(size); - Cable5.render(size); - Cable2.render(size); - Cable4.render(size); - Cable6.render(size); - TopPanelDec.render(size); - BackPlate.render(size); - TopPanel.render(size); - TopPanelExtr.render(size); - ConnectorRight.render(size); - ConnectorLeft.render(size); - ConnectorWireRight.render(size); - ConnectorWireLeft.render(size); - ConnectorWireTop.render(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) diff --git a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java index 5a8226c28..af15410ab 100644 --- a/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java +++ b/src/main/java/mekanism/client/model/ModelPressurizedReactionChamber.java @@ -8,168 +8,114 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelPressurizedReactionChamber extends ModelBase { - ModelRenderer Base; - ModelRenderer GasRight; - ModelRenderer GasLeft; - ModelRenderer GasConnector; - ModelRenderer FluidBack; - ModelRenderer CoreBase; - ModelRenderer Core; - ModelRenderer PoleRF; - ModelRenderer PoleFL; - ModelRenderer PoleLB; - ModelRenderer PoleBR; - ModelRenderer PoleR; - ModelRenderer PoleL; - ModelRenderer FrontPanel; - ModelRenderer TubeThing; - ModelRenderer CenterCore; - ModelRenderer BackConnector; - ModelRenderer BackCore; - ModelRenderer TopPanel; + ModelRenderer frontDivider1; + ModelRenderer base; + ModelRenderer port2b; + ModelRenderer front; + ModelRenderer bar1; + ModelRenderer body; + ModelRenderer port1b; + ModelRenderer bar5; + ModelRenderer bar4; + ModelRenderer bar3; + ModelRenderer bar2; + ModelRenderer frontDivider2; - public ModelPressurizedReactionChamber() + public ModelPressurizedReactionChamber() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 16, 1, 16); - Base.setRotationPoint(-8F, 23F, -8F); - Base.setTextureSize(128, 128); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - GasRight = new ModelRenderer(this, 64, 12); - GasRight.addBox(0F, 0F, 0F, 1, 6, 6); - GasRight.setRotationPoint(-8F, 13F, -3F); - GasRight.setTextureSize(128, 128); - GasRight.mirror = true; - setRotation(GasRight, 0F, 0F, 0F); - GasLeft = new ModelRenderer(this, 64, 12); - GasLeft.addBox(0F, 0F, 0F, 1, 6, 6); - GasLeft.setRotationPoint(7F, 13F, -3F); - GasLeft.setTextureSize(128, 128); - GasLeft.mirror = true; - setRotation(GasLeft, 0F, 0F, 0F); - GasConnector = new ModelRenderer(this, 22, 38); - GasConnector.addBox(0F, 0F, 0F, 14, 2, 2); - GasConnector.setRotationPoint(-7F, 15F, -1F); - GasConnector.setTextureSize(128, 128); - GasConnector.mirror = true; - setRotation(GasConnector, 0F, 0F, 0F); - FluidBack = new ModelRenderer(this, 50, 24); - FluidBack.addBox(0F, 0F, 0F, 8, 8, 1); - FluidBack.setRotationPoint(-4F, 12F, 7F); - FluidBack.setTextureSize(128, 128); - FluidBack.mirror = true; - setRotation(FluidBack, 0F, 0F, 0F); - CoreBase = new ModelRenderer(this, 64, 0); - CoreBase.addBox(0F, 0F, 0F, 10, 1, 11); - CoreBase.setRotationPoint(-5F, 22F, -6F); - CoreBase.setTextureSize(128, 128); - CoreBase.mirror = true; - setRotation(CoreBase, 0F, 0F, 0F); - Core = new ModelRenderer(this, 0, 17); - Core.addBox(0F, 0F, 0F, 12, 8, 13); - Core.setRotationPoint(-6F, 14F, -7F); - Core.setTextureSize(128, 128); - Core.mirror = true; - setRotation(Core, 0F, 0F, 0F); - PoleRF = new ModelRenderer(this, 38, 42); - PoleRF.addBox(0F, 0F, 0F, 1, 6, 1); - PoleRF.setRotationPoint(-6F, 8F, -7F); - PoleRF.setTextureSize(128, 128); - PoleRF.mirror = true; - setRotation(PoleRF, 0F, 0F, 0F); - PoleFL = new ModelRenderer(this, 38, 42); - PoleFL.addBox(0F, 0F, 0F, 1, 6, 1); - PoleFL.setRotationPoint(5F, 8F, -7F); - PoleFL.setTextureSize(128, 128); - PoleFL.mirror = true; - setRotation(PoleFL, 0F, 0F, 0F); - PoleLB = new ModelRenderer(this, 38, 42); - PoleLB.addBox(0F, 0F, 0F, 1, 6, 1); - PoleLB.setRotationPoint(5F, 8F, 5F); - PoleLB.setTextureSize(128, 128); - PoleLB.mirror = true; - setRotation(PoleLB, 0F, 0F, 0F); - PoleBR = new ModelRenderer(this, 38, 42); - PoleBR.addBox(0F, -2F, 0F, 1, 6, 1); - PoleBR.setRotationPoint(-6F, 10F, 5F); - PoleBR.setTextureSize(128, 128); - PoleBR.mirror = true; - setRotation(PoleBR, 0F, 0F, 0F); - PoleR = new ModelRenderer(this, 0, 57); - PoleR.addBox(0F, 0F, 0F, 1, 1, 11); - PoleR.setRotationPoint(-6F, 8F, -6F); - PoleR.setTextureSize(128, 128); - PoleR.mirror = true; - setRotation(PoleR, 0F, 0F, 0F); - PoleL = new ModelRenderer(this, 0, 57); - PoleL.addBox(0F, 0F, 0F, 1, 1, 11); - PoleL.setRotationPoint(5F, 8F, -6F); - PoleL.setTextureSize(128, 128); - PoleL.mirror = true; - setRotation(PoleL, 0F, 0F, 0F); - FrontPanel = new ModelRenderer(this, 0, 38); - FrontPanel.addBox(0F, 0F, 0F, 10, 12, 1); - FrontPanel.setRotationPoint(-5F, 9F, -8F); - FrontPanel.setTextureSize(128, 128); - FrontPanel.mirror = true; - setRotation(FrontPanel, 0F, 0F, 0F); - TubeThing = new ModelRenderer(this, 22, 42); - TubeThing.addBox(0F, 0F, 0F, 2, 2, 6); - TubeThing.setRotationPoint(-1F, 12F, -7F); - TubeThing.setTextureSize(128, 128); - TubeThing.mirror = true; - setRotation(TubeThing, 0F, 0F, 0F); - CenterCore = new ModelRenderer(this, 84, 12); - CenterCore.addBox(0F, 0F, 0F, 4, 1, 4); - CenterCore.setRotationPoint(-2F, 13F, -3F); - CenterCore.setTextureSize(128, 128); - CenterCore.mirror = true; - setRotation(CenterCore, 0F, 0F, 0F); - BackConnector = new ModelRenderer(this, 78, 12); - BackConnector.addBox(0F, 0F, 0F, 2, 5, 1); - BackConnector.setRotationPoint(-1F, 13F, 6F); - BackConnector.setTextureSize(128, 128); - BackConnector.mirror = true; - setRotation(BackConnector, 0F, 0F, 0F); - BackCore = new ModelRenderer(this, 0, 51); - BackCore.addBox(0F, 0F, 0F, 2, 1, 5); - BackCore.setRotationPoint(-1F, 13F, 1F); - BackCore.setTextureSize(128, 128); - BackCore.mirror = true; - setRotation(BackCore, 0F, 0F, 0F); - TopPanel = new ModelRenderer(this, 0, 69); - TopPanel.addBox(0F, 0F, 0F, 10, 1, 13); - TopPanel.setRotationPoint(-5F, 8F, -7F); - TopPanel.setTextureSize(128, 128); - TopPanel.mirror = true; - setRotation(TopPanel, 0F, 0F, 0F); + 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); + port2b = new ModelRenderer(this, 0, 6); + port2b.addBox(0F, 0F, 0F, 1, 8, 2); + port2b.setRotationPoint(7F, 12F, -4F); + port2b.setTextureSize(128, 64); + port2b.mirror = true; + setRotation(port2b, 0F, 0F, 0F); + port2b.mirror = false; + 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); + port1b = new ModelRenderer(this, 0, 6); + port1b.addBox(0F, 0F, 0F, 1, 8, 2); + port1b.setRotationPoint(-8F, 12F, -4F); + port1b.setTextureSize(128, 64); + port1b.mirror = true; + setRotation(port1b, 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.addBox(0F, 0F, 0F, 2, 12, 6); + frontDivider2.setRotationPoint(-4F, 8.5F, -7.5F); + frontDivider2.setTextureSize(128, 64); + frontDivider2.mirror = true; + setRotation(frontDivider2, 0F, 0F, 0F); + frontDivider2.mirror = false; } - public void render(float size) + public void render(float size) { - Base.render(size); - GasRight.render(size); - GasLeft.render(size); - GasConnector.render(size); - FluidBack.render(size); - CoreBase.render(size); - Core.render(size); - PoleRF.render(size); - PoleFL.render(size); - PoleLB.render(size); - PoleBR.render(size); - PoleR.render(size); - PoleL.render(size); - FrontPanel.render(size); - TubeThing.render(size); - CenterCore.render(size); - BackConnector.render(size); - BackCore.render(size); - TopPanel.render(size); + frontDivider1.render(size); + base.render(size); + port2b.render(size); + front.render(size); + bar1.render(size); + body.render(size); + port1b.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) diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 05aef6522..38f9fc0f5 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -83,7 +83,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.METALLURGIC_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "MetallurgicInfuser.png")); metallurgicInfuser.render(0.0625F); diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index d0537633b..3d929fd07 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -296,7 +296,7 @@ public class ItemRenderingHandler implements IItemRenderer BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); GL11.glPopMatrix(); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index af4af146d..b19069212 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java @@ -32,10 +32,10 @@ public class RenderGasTank 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(270, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 87b099687..cdd665637 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -921,7 +921,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo { ((TileEntityBasicBlock)tileEntity).onNeighborChange(block); } - + if(tileEntity instanceof TileEntityLogisticalSorter) { TileEntityLogisticalSorter sorter = (TileEntityLogisticalSorter)tileEntity; diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 52e7c2e86..9c8b06bb5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -89,7 +89,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i { super("machine.metalinfuser", "MetallurgicInfuser", MachineType.METALLURGIC_INFUSER.baseEnergy); - configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + configComponent = new TileComponentConfig(this, TransmissionType.ITEM); configComponent.addOutput(TransmissionType.ITEM, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.ITEM, new SideData("Input", EnumColor.DARK_RED, new int[] {2})); @@ -98,7 +98,6 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i configComponent.addOutput(TransmissionType.ITEM, new SideData("Infuse", EnumColor.PURPLE, new int[] {1})); configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 0, 0, 3, 1, 2}); - configComponent.setInputConfig(TransmissionType.ENERGY); inventory = new ItemStack[5]; @@ -266,7 +265,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public EnumSet getConsumingSides() { - return configComponent.getSidesForData(TransmissionType.ENERGY, facing, 1); + return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); } @Override @@ -516,7 +515,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i @Override public boolean renderUpdate() { - return true; + return false; } @Override diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 1b433e15f..e66e08718 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -29,8 +29,8 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler public ModelSolarGenerator solarGenerator = new ModelSolarGenerator(); public ModelBioGenerator bioGenerator = new ModelBioGenerator(); public ModelHeatGenerator heatGenerator = new ModelHeatGenerator(); - public ModelGasGenerator hydrogenGenerator = new ModelGasGenerator(); - public ModelWindGenerator windTurbine = new ModelWindGenerator(); + public ModelGasGenerator gasGenerator = new ModelGasGenerator(); + public ModelWindGenerator windGenerator = new ModelWindGenerator(); @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -43,7 +43,6 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler if(metadata == GeneratorType.BIO_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); bioGenerator.render(0.0625F); @@ -67,7 +66,6 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler else if(metadata == GeneratorType.HEAT_GENERATOR.meta) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90F, 0.0F, -1.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "HeatGenerator.png")); heatGenerator.render(0.0625F); @@ -77,8 +75,9 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); GL11.glRotatef(90F, -1.0F, 0.0F, 0.0F); GL11.glTranslated(0.0F, -1.0F, 0.0F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasGenerator.png")); - hydrogenGenerator.render(0.0625F); + gasGenerator.render(0.0625F); } else if(metadata == GeneratorType.WIND_GENERATOR.meta) { @@ -86,7 +85,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, 0.4F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "WindGenerator.png")); - windTurbine.render(0.016F, 0); + windGenerator.render(0.016F, 0); } else if(metadata != 2) { diff --git a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java index 019b2aa54..93e9435d9 100644 --- a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java @@ -1,156 +1,73 @@ package mekanism.generators.client.model; +import mekanism.client.render.MekanismRenderer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelBioGenerator extends ModelBase { - ModelRenderer Base; - ModelRenderer Pipe1; - ModelRenderer Pipe2; - ModelRenderer ContainerLid; - ModelRenderer ContainerRight; - ModelRenderer ContainerBottom; - ModelRenderer ContainerFront; - ModelRenderer ContainerBack; - ModelRenderer ContainerLeft; - ModelRenderer Decor1; - ModelRenderer Decor2; - ModelRenderer BackTop; - ModelRenderer FrontPanel1; - ModelRenderer FrontPanel2; - ModelRenderer LeftPanel; - ModelRenderer RightPanel; - ModelRenderer BackPanel; - - public ModelBioGenerator() + ModelRenderer base; + ModelRenderer sideRight; + ModelRenderer back; + ModelRenderer bar; + ModelRenderer glass; + ModelRenderer sideLeft; + + public ModelBioGenerator() { textureWidth = 64; textureHeight = 64; - Base = new ModelRenderer(this, 0, 0); - Base.addBox(0F, 0F, 0F, 14, 1, 14); - Base.setRotationPoint(-7F, 23F, -7F); - Base.setTextureSize(64, 64); - Base.mirror = true; - setRotation(Base, 0F, 0F, 0F); - Pipe1 = new ModelRenderer(this, 0, 16); - Pipe1.addBox(0F, 0F, 0F, 2, 2, 2); - Pipe1.setRotationPoint(-1F, 13F, -3F); - Pipe1.setTextureSize(64, 64); - Pipe1.mirror = true; - setRotation(Pipe1, 0F, 0F, 0F); - Pipe2 = new ModelRenderer(this, 0, 21); - Pipe2.addBox(0F, 0F, 0F, 2, 2, 8); - Pipe2.setRotationPoint(-1F, 11F, -3F); - Pipe2.setTextureSize(64, 64); - Pipe2.mirror = true; - setRotation(Pipe2, 0F, 0F, 0F); - ContainerLid = new ModelRenderer(this, 0, 32); - ContainerLid.addBox(0F, 0F, 0F, 4, 1, 4); - ContainerLid.setRotationPoint(-2F, 15F, -5F); - ContainerLid.setTextureSize(64, 64); - ContainerLid.mirror = true; - setRotation(ContainerLid, 0F, 0F, 0F); - ContainerRight = new ModelRenderer(this, 0, 38); - ContainerRight.addBox(0F, 0F, 0F, 1, 6, 4); - ContainerRight.setRotationPoint(2F, 16F, -5F); - ContainerRight.setTextureSize(64, 64); - ContainerRight.mirror = true; - setRotation(ContainerRight, 0F, 0F, 0F); - ContainerBottom = new ModelRenderer(this, 0, 49); - ContainerBottom.addBox(0F, 0F, 0F, 6, 1, 6); - ContainerBottom.setRotationPoint(-3F, 22F, -6F); - ContainerBottom.setTextureSize(64, 64); - ContainerBottom.mirror = true; - setRotation(ContainerBottom, 0F, 0F, 0F); - ContainerFront = new ModelRenderer(this, 11, 41); - ContainerFront.addBox(0F, 0F, 0F, 6, 6, 1); - ContainerFront.setRotationPoint(-3F, 16F, -6F); - ContainerFront.setTextureSize(64, 64); - ContainerFront.mirror = true; - setRotation(ContainerFront, 0F, 0F, 0F); - ContainerBack = new ModelRenderer(this, 11, 41); - ContainerBack.addBox(0F, 0F, 0F, 6, 6, 1); - ContainerBack.setRotationPoint(-3F, 16F, -1F); - ContainerBack.setTextureSize(64, 64); - ContainerBack.mirror = true; - setRotation(ContainerBack, 0F, 0F, 0F); - ContainerLeft = new ModelRenderer(this, 0, 38); - ContainerLeft.addBox(0F, 0F, 0F, 1, 6, 4); - ContainerLeft.setRotationPoint(-3F, 16F, -5F); - ContainerLeft.setTextureSize(64, 64); - setRotation(ContainerLeft, 0F, 0F, 0F); - ContainerLeft.mirror = false; - Decor1 = new ModelRenderer(this, 21, 20); - Decor1.addBox(0F, 0F, 0F, 2, 2, 3); - Decor1.setRotationPoint(4.1F, 15F, 2F); - Decor1.setTextureSize(64, 64); - Decor1.mirror = true; - setRotation(Decor1, 0F, 0F, 0F); - Decor2 = new ModelRenderer(this, 21, 20); - Decor2.addBox(0F, 0F, 0F, 2, 2, 3); - Decor2.setRotationPoint(-6.1F, 15F, 2F); - Decor2.setTextureSize(64, 64); - Decor2.mirror = true; - setRotation(Decor2, 0F, 0F, 0F); - BackTop = new ModelRenderer(this, 21, 26); - BackTop.addBox(0F, 0F, 0F, 8, 1, 3); - BackTop.setRotationPoint(-4F, 10F, 5F); - BackTop.setTextureSize(64, 64); - BackTop.mirror = true; - setRotation(BackTop, 0F, 0F, 0F); - FrontPanel1 = new ModelRenderer(this, 17, 32); - FrontPanel1.addBox(0F, 0F, 0F, 3, 6, 2); - FrontPanel1.setRotationPoint(-7F, 17F, -6F); - FrontPanel1.setTextureSize(64, 64); - FrontPanel1.mirror = true; - setRotation(FrontPanel1, 0F, 0F, 0F); - FrontPanel2 = new ModelRenderer(this, 17, 32); - FrontPanel2.addBox(0F, 0F, 0F, 3, 6, 2); - FrontPanel2.setRotationPoint(4F, 17F, -6F); - FrontPanel2.setTextureSize(64, 64); - FrontPanel2.mirror = true; - setRotation(FrontPanel2, 0F, 0F, 0F); - LeftPanel = new ModelRenderer(this, 28, 31); - LeftPanel.addBox(0F, 0F, 0F, 3, 7, 10); - LeftPanel.setRotationPoint(-7F, 16F, -4F); - LeftPanel.setTextureSize(64, 64); - LeftPanel.mirror = true; - setRotation(LeftPanel, 0F, 0F, 0F); - RightPanel = new ModelRenderer(this, 28, 31); - RightPanel.addBox(0F, 0F, 0F, 3, 7, 10); - RightPanel.setRotationPoint(4F, 16F, -4F); - RightPanel.setTextureSize(64, 64); - RightPanel.mirror = true; - setRotation(RightPanel, 0F, 0F, 0F); - BackPanel = new ModelRenderer(this, 28, 49); - BackPanel.addBox(0F, 0F, 0F, 10, 12, 3); - BackPanel.setRotationPoint(-5F, 11F, 5F); - BackPanel.setTextureSize(64, 64); - BackPanel.mirror = true; - setRotation(BackPanel, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 7, 16); + base.setRotationPoint(-8F, 17F, -8F); + base.setTextureSize(64, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + sideRight = new ModelRenderer(this, 0, 40); + sideRight.addBox(0F, 0F, 0F, 3, 9, 8); + sideRight.setRotationPoint(5F, 8F, -8F); + sideRight.setTextureSize(64, 64); + sideRight.mirror = true; + setRotation(sideRight, 0F, 0F, 0F); + sideRight.mirror = false; + back = new ModelRenderer(this, 0, 23); + back.addBox(0F, 0F, 0F, 16, 9, 8); + back.setRotationPoint(-8F, 8F, 0F); + back.setTextureSize(64, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + bar = new ModelRenderer(this, 0, 57); + bar.addBox(0F, 0F, 0F, 10, 1, 1); + bar.setRotationPoint(-5F, 8.5F, -7.5F); + bar.setTextureSize(64, 64); + bar.mirror = true; + setRotation(bar, 0F, 0F, 0F); + glass = new ModelRenderer(this, 22, 40); + glass.addBox(0F, 0F, 0F, 12, 8, 7); + glass.setRotationPoint(-6F, 9F, -7F); + glass.setTextureSize(64, 64); + glass.mirror = true; + setRotation(glass, 0F, 0F, 0F); + sideLeft = new ModelRenderer(this, 0, 40); + sideLeft.addBox(0F, 0F, 0F, 3, 9, 8); + sideLeft.setRotationPoint(-8F, 8F, -8F); + sideLeft.setTextureSize(64, 64); + sideLeft.mirror = true; + setRotation(sideLeft, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - Base.render(size); - Pipe1.render(size); - Pipe2.render(size); - ContainerLid.render(size); - ContainerRight.render(size); - ContainerBottom.render(size); - ContainerFront.render(size); - ContainerBack.render(size); - ContainerLeft.render(size); - Decor1.render(size); - Decor2.render(size); - BackTop.render(size); - FrontPanel1.render(size); - FrontPanel2.render(size); - LeftPanel.render(size); - RightPanel.render(size); - BackPanel.render(size); + base.render(size); + sideRight.render(size); + sideLeft.render(size); + back.render(size); + bar.render(size); + + MekanismRenderer.blendOn(); + glass.render(size); + MekanismRenderer.blendOff(); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java index 7b3325fee..c7e1d9bf3 100644 --- a/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelGasGenerator.java @@ -8,168 +8,168 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelGasGenerator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - ModelRenderer S; + ModelRenderer port4; + ModelRenderer baseStand; + ModelRenderer pillar4; + ModelRenderer port3; + ModelRenderer port2; + ModelRenderer connectorAngle1; + ModelRenderer pillar3; + ModelRenderer pillar2; + ModelRenderer pillar1; + ModelRenderer center; + ModelRenderer connector3; + ModelRenderer port1; + ModelRenderer connector4; + ModelRenderer connectorAngle4; + ModelRenderer base; + ModelRenderer connectorAngle3; + ModelRenderer connector2; + ModelRenderer connectorAngle2; + ModelRenderer connector1; - public ModelGasGenerator() + public ModelGasGenerator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(0F, 0F, 0F, 16, 1, 16); - A.setRotationPoint(-8F, 23F, -8F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 45); - B.addBox(0F, 0F, 0F, 16, 12, 6); - B.setRotationPoint(-8F, 11F, -3F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 64); - C.addBox(-3F, 0F, -8F, 6, 12, 12); - C.setRotationPoint(0F, 11F, 0F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 0F); - D = new ModelRenderer(this, 66, 0); - D.addBox(-3F, 0F, 0F, 6, 10, 4); - D.setRotationPoint(0F, 13F, 4F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 0F, 0F); - E = new ModelRenderer(this, 0, 20); - E.addBox(-5F, 0F, -3F, 10, 13, 6); - E.setRotationPoint(0F, 10F, 0F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 0.5235988F, 0F); - F = new ModelRenderer(this, 0, 20); - F.addBox(-5F, 0F, -3F, 10, 13, 6); - F.setRotationPoint(0F, 10F, 0F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, -0.5235988F, 0F); - G = new ModelRenderer(this, 34, 20); - G.addBox(-3F, 0F, -5F, 6, 13, 10); - G.setRotationPoint(0F, 10F, 0F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 0F, 0F); - H = new ModelRenderer(this, 67, 20); - H.addBox(-2F, 0F, -1F, 4, 2, 2); - H.setRotationPoint(0F, 8F, 0F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, -0.5235988F, 0F); - I = new ModelRenderer(this, 67, 20); - I.addBox(-2F, 0F, -1F, 4, 2, 2); - I.setRotationPoint(0F, 8F, 0F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0.5235988F, 0F); - J = new ModelRenderer(this, 67, 26); - J.addBox(-1F, 0F, -2F, 2, 2, 4); - J.setRotationPoint(0F, 8F, 0F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 88, 0); - K.addBox(-3F, 0F, 0F, 6, 2, 5); - K.setRotationPoint(0F, 10F, 4F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, -0.6457718F, 0F, 0F); - L = new ModelRenderer(this, 0, 97); - L.addBox(0F, 0F, 0F, 4, 10, 4); - L.setRotationPoint(2F, 13F, -5F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0.7853982F, 0F); - M = new ModelRenderer(this, 0, 90); - M.addBox(0F, 0F, 0F, 3, 1, 2); - M.setRotationPoint(2F, 12F, -4F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 0.7853982F, 0F); - N = new ModelRenderer(this, 0, 97); - N.addBox(0F, 0F, 0F, 4, 10, 4); - N.setRotationPoint(-8F, 13F, -5F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0.7853982F, 0F); - O = new ModelRenderer(this, 0, 90); - O.addBox(0F, 0F, 0F, 2, 1, 3); - O.setRotationPoint(-6F, 12F, -5F); - O.setTextureSize(128, 128); - O.mirror = true; - setRotation(O, 0F, 0.7853982F, 0F); - P = new ModelRenderer(this, 0, 118); - P.addBox(-5F, 0F, 0F, 10, 1, 1); - P.setRotationPoint(0F, 15F, -7F); - P.setTextureSize(128, 128); - P.mirror = true; - setRotation(P, 0F, 0F, 0F); - Q = new ModelRenderer(this, 0, 118); - Q.addBox(-5F, 0F, 0F, 10, 1, 1); - Q.setRotationPoint(0F, 19F, -7F); - Q.setTextureSize(128, 128); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 0, 112); - R.addBox(-7F, 0F, -3F, 14, 1, 3); - R.setRotationPoint(0F, 15F, -2F); - R.setTextureSize(128, 128); - R.mirror = true; - setRotation(R, 0F, 0F, 0F); - S = new ModelRenderer(this, 0, 112); - S.addBox(-7F, 0F, -3F, 14, 1, 3); - S.setRotationPoint(0F, 19F, -2F); - S.setTextureSize(128, 128); - S.mirror = true; - setRotation(S, 0F, 0F, 0F); + port4 = new ModelRenderer(this, 40, 34); + port4.addBox(0F, 0F, 0F, 1, 8, 8); + port4.setRotationPoint(7F, 12F, -4F); + port4.setTextureSize(128, 64); + port4.mirror = true; + setRotation(port4, 0F, 0F, 0F); + baseStand = new ModelRenderer(this, 0, 20); + baseStand.addBox(0F, 0F, 0F, 13, 1, 13); + baseStand.setRotationPoint(-6.5F, 19F, -6.5F); + baseStand.setTextureSize(128, 64); + baseStand.mirror = true; + setRotation(baseStand, 0F, 0F, 0F); + pillar4 = new ModelRenderer(this, 0, 0); + pillar4.addBox(0F, 0F, 0F, 3, 9, 3); + pillar4.setRotationPoint(4F, 10F, 4F); + pillar4.setTextureSize(128, 64); + pillar4.mirror = true; + setRotation(pillar4, 0F, 0F, 0F); + port3 = new ModelRenderer(this, 40, 50); + port3.addBox(0F, 0F, 0F, 8, 8, 1); + port3.setRotationPoint(-4F, 12F, 7F); + port3.setTextureSize(128, 64); + port3.mirror = true; + setRotation(port3, 0F, 0F, 0F); + port2 = new ModelRenderer(this, 40, 34); + port2.addBox(0F, 0F, 0F, 1, 8, 8); + port2.setRotationPoint(-8F, 12F, -4F); + port2.setTextureSize(128, 64); + port2.mirror = true; + setRotation(port2, 0F, 0F, 0F); + connectorAngle1 = new ModelRenderer(this, 48, 13); + connectorAngle1.addBox(0F, 0F, 0.5F, 8, 1, 2); + connectorAngle1.setRotationPoint(-4F, 13.5F, -6F); + connectorAngle1.setTextureSize(128, 64); + connectorAngle1.mirror = true; + setRotation(connectorAngle1, 0.986111F, 0F, 0F); + pillar3 = new ModelRenderer(this, 0, 0); + pillar3.addBox(0F, 0F, 0F, 3, 9, 3); + pillar3.setRotationPoint(-7F, 10F, 4F); + pillar3.setTextureSize(128, 64); + pillar3.mirror = true; + setRotation(pillar3, 0F, 0F, 0F); + pillar2 = new ModelRenderer(this, 0, 0); + pillar2.addBox(0F, 0F, 0F, 3, 9, 3); + pillar2.setRotationPoint(4F, 10F, -7F); + pillar2.setTextureSize(128, 64); + pillar2.mirror = true; + setRotation(pillar2, 0F, 0F, 0F); + pillar1 = new ModelRenderer(this, 0, 0); + pillar1.addBox(0F, 0F, 0F, 3, 9, 3); + pillar1.setRotationPoint(-7F, 10F, -7F); + pillar1.setTextureSize(128, 64); + pillar1.mirror = true; + setRotation(pillar1, 0F, 0F, 0F); + center = new ModelRenderer(this, 0, 34); + center.addBox(0F, 0F, 0F, 10, 12, 10); + center.setRotationPoint(-5F, 8F, -5F); + center.setTextureSize(128, 64); + center.mirror = true; + setRotation(center, 0F, 0F, 0F); + connector3 = new ModelRenderer(this, 39, 20); + connector3.addBox(0F, 0F, 0F, 1, 1, 8); + connector3.setRotationPoint(5F, 11F, -4F); + connector3.setTextureSize(128, 64); + connector3.mirror = true; + setRotation(connector3, 0F, 0F, 0F); + port1 = new ModelRenderer(this, 40, 50); + port1.addBox(0F, 0F, 0F, 8, 8, 1); + port1.setRotationPoint(-4F, 12F, -8F); + port1.setTextureSize(128, 64); + port1.mirror = true; + setRotation(port1, 0F, 0F, 0F); + connector4 = new ModelRenderer(this, 39, 29); + connector4.addBox(0F, 0F, 0F, 8, 1, 1); + connector4.setRotationPoint(-4F, 11F, 5F); + connector4.setTextureSize(128, 64); + connector4.mirror = true; + setRotation(connector4, 0F, 0F, 0F); + connectorAngle4 = new ModelRenderer(this, 48, 10); + connectorAngle4.addBox(0F, 0F, -1F, 8, 2, 1); + connectorAngle4.setRotationPoint(-4F, 11F, 6F); + connectorAngle4.setTextureSize(128, 64); + connectorAngle4.mirror = true; + setRotation(connectorAngle4, 0.7941248F, 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); + connectorAngle3 = new ModelRenderer(this, 48, 0); + connectorAngle3.addBox(-1F, 0F, 0F, 1, 2, 8); + connectorAngle3.setRotationPoint(6F, 11F, -4F); + connectorAngle3.setTextureSize(128, 64); + connectorAngle3.mirror = true; + setRotation(connectorAngle3, 0F, 0F, -0.7941248F); + connector2 = new ModelRenderer(this, 39, 20); + connector2.addBox(0F, 0F, 0F, 1, 1, 8); + connector2.setRotationPoint(-6F, 11F, -4F); + connector2.setTextureSize(128, 64); + connector2.mirror = true; + setRotation(connector2, 0F, 0F, 0F); + connectorAngle2 = new ModelRenderer(this, 48, 0); + connectorAngle2.addBox(0F, 0F, 0F, 1, 2, 8); + connectorAngle2.setRotationPoint(-6F, 11F, -4F); + connectorAngle2.setTextureSize(128, 64); + connectorAngle2.mirror = true; + setRotation(connectorAngle2, 0F, 0F, 0.7941248F); + connector1 = new ModelRenderer(this, 48, 13); + connector1.addBox(0F, 0F, 0F, 8, 1, 2); + connector1.setRotationPoint(-4F, 13F, -7.5F); + connector1.setTextureSize(128, 64); + connector1.mirror = true; + setRotation(connector1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); - P.render(size); - Q.render(size); - R.render(size); - S.render(size); + port4.render(size); + baseStand.render(size); + pillar4.render(size); + port3.render(size); + port2.render(size); + connectorAngle1.render(size); + pillar3.render(size); + pillar2.render(size); + pillar1.render(size); + center.render(size); + connector3.render(size); + port1.render(size); + connector4.render(size); + connectorAngle4.render(size); + base.render(size); + connectorAngle3.render(size); + connector2.render(size); + connectorAngle2.render(size); + connector1.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java index 245bab043..2e717a9af 100644 --- a/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelHeatGenerator.java @@ -8,136 +8,147 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelHeatGenerator extends ModelBase { - ModelRenderer A; - ModelRenderer B; - ModelRenderer C; - ModelRenderer D; - ModelRenderer E; - ModelRenderer F; - ModelRenderer G; - ModelRenderer H; - ModelRenderer I; - ModelRenderer J; - ModelRenderer K; - ModelRenderer L; - ModelRenderer M; - ModelRenderer N; - ModelRenderer O; + ModelRenderer drum; + ModelRenderer ring1; + ModelRenderer ring2; + ModelRenderer back; + ModelRenderer bar1; + ModelRenderer bar2; + ModelRenderer plate; + ModelRenderer fin8; + ModelRenderer fin7; + ModelRenderer fin1; + ModelRenderer fin2; + ModelRenderer fin3; + ModelRenderer fin4; + ModelRenderer fin5; + ModelRenderer fin6; + ModelRenderer base; - public ModelHeatGenerator() + public ModelHeatGenerator() { textureWidth = 128; - textureHeight = 128; + textureHeight = 64; - A = new ModelRenderer(this, 0, 0); - A.addBox(-8F, 0F, -8F, 16, 1, 16); - A.setRotationPoint(0F, 23F, 0F); - A.setTextureSize(128, 128); - A.mirror = true; - setRotation(A, 0F, 0F, 0F); - B = new ModelRenderer(this, 0, 85); - B.addBox(0F, 0F, 0F, 8, 6, 10); - B.setRotationPoint(-8F, 17F, -5F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 0F, 0F); - C = new ModelRenderer(this, 0, 67); - C.addBox(-1F, -2F, 0F, 2, 4, 12); - C.setRotationPoint(-5F, 20F, -6F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 0F, 1.570796F); - D = new ModelRenderer(this, 0, 67); - D.addBox(-1F, -2F, 0F, 2, 4, 12); - D.setRotationPoint(-5F, 20F, -6F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 0F, 0.5235988F); - E = new ModelRenderer(this, 0, 67); - E.addBox(-1F, -2F, 0F, 2, 4, 12); - E.setRotationPoint(-5F, 20F, -6F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 0F, -0.5235988F); - F = new ModelRenderer(this, 68, 0); - F.addBox(-2F, -4F, 0F, 4, 8, 10); - F.setRotationPoint(-4F, 13F, -5F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, 0F, 0.5235988F); - G = new ModelRenderer(this, 68, 0); - G.addBox(-2F, -4F, 0F, 4, 8, 10); - G.setRotationPoint(-4F, 13F, -5F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 0F, -0.5235988F); - H = new ModelRenderer(this, 68, 0); - H.addBox(-2F, -4F, 0F, 4, 8, 10); - H.setRotationPoint(-4F, 13F, -5F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, 0F, 1.570796F); - I = new ModelRenderer(this, 0, 18); - I.addBox(0F, 0F, 0F, 8, 13, 14); - I.setRotationPoint(0F, 10F, -6F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 0, 47); - J.addBox(0F, 0F, 0F, 6, 11, 1); - J.setRotationPoint(1F, 11F, -7F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 51, 21); - K.addBox(0F, 0F, 0F, 10, 4, 1); - K.setRotationPoint(-8F, 13F, -4F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 51, 21); - L.addBox(0F, 0F, 0F, 10, 4, 1); - L.setRotationPoint(-8F, 13F, 3F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 0, 103); - M.addBox(0F, 0F, 0F, 2, 4, 2); - M.setRotationPoint(-2F, 19F, -7F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 0F, 0F); - N = new ModelRenderer(this, 51, 0); - N.addBox(0F, 0F, 0F, 6, 1, 1); - N.setRotationPoint(-3F, 9F, 0F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0F, 0F); - O = new ModelRenderer(this, 51, 0); - O.addBox(0F, 0F, 0F, 6, 1, 1); - O.setRotationPoint(-3F, 9F, 2F); - O.setTextureSize(128, 128); - O.mirror = true; - setRotation(O, 0F, 0F, 0F); + drum = new ModelRenderer(this, 0, 22); + drum.addBox(0F, 0F, 0F, 16, 9, 9); + drum.setRotationPoint(-8F, 8.5F, -7.5F); + drum.setTextureSize(128, 64); + drum.mirror = true; + setRotation(drum, 0F, 0F, 0F); + ring1 = new ModelRenderer(this, 88, 0); + ring1.addBox(0F, 0F, 0F, 2, 10, 10); + ring1.setRotationPoint(3F, 8F, -8F); + ring1.setTextureSize(128, 64); + ring1.mirror = true; + setRotation(ring1, 0F, 0F, 0F); + ring2 = new ModelRenderer(this, 88, 0); + ring2.addBox(0F, 0F, 0F, 2, 10, 10); + ring2.setRotationPoint(-5F, 8F, -8F); + ring2.setTextureSize(128, 64); + ring2.mirror = true; + setRotation(ring2, 0F, 0F, 0F); + back = new ModelRenderer(this, 48, 0); + back.addBox(0F, 0F, 0F, 16, 10, 4); + back.setRotationPoint(-8F, 8F, 2F); + back.setTextureSize(128, 64); + back.mirror = true; + setRotation(back, 0F, 0F, 0F); + bar1 = new ModelRenderer(this, 88, 0); + bar1.addBox(0F, 0F, 0F, 2, 9, 1); + bar1.setRotationPoint(3F, 9F, 6F); + bar1.setTextureSize(128, 64); + bar1.mirror = true; + setRotation(bar1, 0F, 0F, 0F); + bar2 = new ModelRenderer(this, 88, 0); + bar2.addBox(0F, 0F, 0F, 2, 9, 1); + bar2.setRotationPoint(-5F, 9F, 6F); + bar2.setTextureSize(128, 64); + bar2.mirror = true; + setRotation(bar2, 0F, 0F, 0F); + plate = new ModelRenderer(this, 41, 22); + plate.addBox(0F, 0F, 0F, 8, 6, 2); + plate.setRotationPoint(-4F, 12F, 6F); + plate.setTextureSize(128, 64); + plate.mirror = true; + setRotation(plate, 0F, 0F, 0F); + fin8 = new ModelRenderer(this, 14, 40); + fin8.addBox(0F, 0F, 0F, 16, 1, 2); + fin8.setRotationPoint(-8F, 8F, 6F); + fin8.setTextureSize(128, 64); + fin8.mirror = true; + setRotation(fin8, 0F, 0F, 0F); + fin7 = new ModelRenderer(this, 14, 40); + fin7.addBox(0F, 0F, 0F, 16, 1, 2); + fin7.setRotationPoint(-8F, 10F, 6F); + fin7.setTextureSize(128, 64); + fin7.mirror = true; + setRotation(fin7, 0F, 0F, 0F); + fin1 = new ModelRenderer(this, 0, 40); + fin1.addBox(0F, 0F, 0F, 4, 1, 2); + fin1.setRotationPoint(4F, 12F, 6F); + fin1.setTextureSize(128, 64); + fin1.mirror = true; + setRotation(fin1, 0F, 0F, 0F); + fin1.mirror = false; + fin2 = new ModelRenderer(this, 0, 40); + fin2.addBox(0F, 0F, 0F, 4, 1, 2); + fin2.setRotationPoint(4F, 14F, 6F); + fin2.setTextureSize(128, 64); + fin2.mirror = true; + setRotation(fin2, 0F, 0F, 0F); + fin2.mirror = false; + fin3 = new ModelRenderer(this, 0, 40); + fin3.addBox(0F, 0F, 0F, 4, 1, 2); + fin3.setRotationPoint(4F, 16F, 6F); + fin3.setTextureSize(128, 64); + fin3.mirror = true; + setRotation(fin3, 0F, 0F, 0F); + fin3.mirror = false; + fin4 = new ModelRenderer(this, 0, 40); + fin4.addBox(0F, 0F, 0F, 4, 1, 2); + fin4.setRotationPoint(-8F, 12F, 6F); + fin4.setTextureSize(128, 64); + fin4.mirror = true; + setRotation(fin4, 0F, 0F, 0F); + fin5 = new ModelRenderer(this, 0, 40); + fin5.addBox(0F, 0F, 0F, 4, 1, 2); + fin5.setRotationPoint(-8F, 14F, 6F); + fin5.setTextureSize(128, 64); + fin5.mirror = true; + setRotation(fin5, 0F, 0F, 0F); + fin6 = new ModelRenderer(this, 0, 40); + fin6.addBox(0F, 0F, 0F, 4, 1, 2); + fin6.setRotationPoint(-8F, 16F, 6F); + fin6.setTextureSize(128, 64); + fin6.mirror = true; + setRotation(fin6, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 6, 16); + base.setRotationPoint(-8F, 18F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { - A.render(size); - B.render(size); - C.render(size); - D.render(size); - E.render(size); - F.render(size); - G.render(size); - H.render(size); - I.render(size); - J.render(size); - K.render(size); - L.render(size); - M.render(size); - N.render(size); - O.render(size); + drum.render(size); + ring1.render(size); + ring2.render(size); + back.render(size); + bar1.render(size); + bar2.render(size); + plate.render(size); + fin8.render(size); + fin7.render(size); + fin1.render(size); + fin2.render(size); + fin3.render(size); + fin4.render(size); + fin5.render(size); + fin6.render(size); + base.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java index 843f778e5..6020bf8fd 100644 --- a/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelSolarGenerator.java @@ -56,7 +56,7 @@ public class ModelSolarGenerator extends ModelBase solarPanelPipeConnector.mirror = true; setRotation(solarPanelPipeConnector, 0F, 0F, 0F); solarPanelPipeBase1 = new ModelRenderer(this, 36, 33); - solarPanelPipeBase1.addBox(0F, 0F, 0F, 2, 4, 4); + solarPanelPipeBase1.addBox(0F, 0F, 0F, 1, 4, 4); solarPanelPipeBase1.setRotationPoint(2F, 22F, -2F); solarPanelPipeBase1.setTextureSize(64, 64); solarPanelPipeBase1.mirror = true; @@ -69,7 +69,7 @@ public class ModelSolarGenerator extends ModelBase setRotation(solarPanelPipeU1, 0F, 0F, 0F); } - public void render(float size) + public void render(float size) { solarPanelPipeBase.render(size); solarPanel.render(size); diff --git a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java index 6b3e9a9e6..73bb3024f 100644 --- a/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderBioGenerator.java @@ -37,22 +37,6 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer private void renderAModelAt(TileEntityBioGenerator tileEntity, double x, double y, double z, float partialTick) { - GL11.glPushMatrix(); - GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); - - 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; - } - - GL11.glRotatef(180, 0F, 0F, 1F); - model.render(0.0625F); - GL11.glPopMatrix(); - if(tileEntity.bioFuelSlot.fluidStored > 0) { push(); @@ -65,6 +49,22 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer pop(); } + + GL11.glPushMatrix(); + GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "BioGenerator.png")); + + switch(tileEntity.facing) + { + 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(180, 0F, 0F, 1F); + model.render(0.0625F); + GL11.glPopMatrix(); } @SuppressWarnings("incomplete-switch") @@ -89,46 +89,46 @@ public class RenderBioGenerator extends TileEntitySpecialRenderer { case NORTH: { - model3D.minZ = 0.1875; - model3D.maxZ = 0.4375; + model3D.minZ = 0.5; + model3D.maxZ = 0.875; - model3D.minX = 0.375; - model3D.maxX = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minX = 0.1875; + model3D.maxX = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } case SOUTH: { - model3D.minZ = 0.5625; - model3D.maxZ = 0.8125; + model3D.minZ = 0.125; + model3D.maxZ = 0.5; - model3D.minX = 0.375; - model3D.maxX = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minX = 0.1875; + model3D.maxX = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } case WEST: { - model3D.minX = 0.1875; - model3D.maxX = 0.4375; + model3D.minX = 0.5; + model3D.maxX = 0.875; - model3D.minZ = 0.375; - model3D.maxZ = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minZ = 0.1875; + model3D.maxZ = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } case EAST: { - model3D.minX = 0.5625; - model3D.maxX = 0.8125; + model3D.minX = 0.125; + model3D.maxX = 0.5; - model3D.minZ = 0.375; - model3D.maxZ = 0.625; - model3D.minY = 0.125; - model3D.maxY = 0.125 + ((float)i/stages)*.34375; + model3D.minZ = 0.1875; + model3D.maxZ = 0.8215; + model3D.minY = 0.4375; + model3D.maxY = 0.4375 + ((float)i/stages)*0.4375; break; } } diff --git a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java index a8db431d2..3cab83c32 100644 --- a/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderGasGenerator.java @@ -31,10 +31,10 @@ public class RenderGasGenerator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + 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; } GL11.glRotatef(180F, 0.0F, 1.0F, 1.0F); diff --git a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java index af366eec4..2a2d2d324 100644 --- a/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/render/RenderHeatGenerator.java @@ -31,10 +31,10 @@ public class RenderHeatGenerator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(180, 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/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index e542ea7da..44ddf2a3c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -299,8 +299,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom + iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom - iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom - iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.25, y+.2, z+.5, 0.0D, 0.0D, 0.0D); @@ -314,8 +314,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom - iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom - iRandom), (double)yRandom, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom + iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom + iRandom), (double)yRandom + 0.5F, (double)(zRandom - jRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.75, y+.2, z+.5, 0.0D, 0.0D, 0.0D); @@ -329,8 +329,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.5, y+.2, z+.25, 0.0D, 0.0D, 0.0D); @@ -344,8 +344,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB switch(GeneratorType.getFromMetadata(metadata)) { case HEAT_GENERATOR: - world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom, (double)(zRandom - iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)(xRandom - jRandom), (double)yRandom + 0.5F, (double)(zRandom + iRandom), 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle("smoke", x+.5, y+.2, z+.75, 0.0D, 0.0D, 0.0D); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 96426d3c0..5bdce96d7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -3,7 +3,6 @@ package mekanism.generators.common.tile; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.EnumSet; import mekanism.api.MekanismConfig.generators; import mekanism.common.FluidSlot; @@ -211,12 +210,6 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui return data; } - @Override - public EnumSet getOutputtingSides() - { - return EnumSet.of(ForgeDirection.getOrientation(facing).getOpposite()); - } - private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getBioFuel", "getBioFuelNeeded"}; @Override diff --git a/src/main/resources/assets/mekanism/render/BioGenerator.png b/src/main/resources/assets/mekanism/render/BioGenerator.png index 40d39196418ee9616910a580cde1d490b4ebab71..7e557bee80b1d12345c47246f81b760696434a24 100644 GIT binary patch literal 5595 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 Kx)s{jZvPkarArL} literal 5331 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 diff --git a/src/main/resources/assets/mekanism/render/Chargepad.png b/src/main/resources/assets/mekanism/render/Chargepad.png index 4e096ad432f2f8c9a7e79b24dfad325b80e2ba2e..8da4e6ca045c8fdb9ba4b2c83cddd1fde7f1532d 100644 GIT binary patch literal 3389 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 literal 4717 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 Pc@F4k7^=h7oMQeDSP}5N diff --git a/src/main/resources/assets/mekanism/render/GasGenerator.png b/src/main/resources/assets/mekanism/render/GasGenerator.png index 6ce2bbc7b741537ee88bf405d1b1143a0e837104..221ff4985e60f96b5ab4555637781bd453d99bd5 100644 GIT binary patch literal 5356 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 Hu0mjfF$KnP delta 2221 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png index 7d7dd42ddeee24a98474bea8663a0b673e32adc9..bc5c2eddda38eb061caa4cffcb5b9b2e160ce754 100644 GIT binary patch delta 2934 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 literal 3238 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 bVU2(!32Ch!l4!8{2bY7Lvu&C6v6KG=P<0cl literal 2783 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 Ze*yKHUkO;$)ZWD29C;p>d@ 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 R9sR@svaYF4iIx-fzX0E78MXib diff --git a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png old mode 100755 new mode 100644 index bb09dc60e84e47ede7eccd6f93bb5f6eb8c0dc19..32d0c5ce78e0e7cef2c5261f67ee68fc09bbc075 GIT binary patch literal 5404 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