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 40d391964..7e557bee8 100644 Binary files a/src/main/resources/assets/mekanism/render/BioGenerator.png and b/src/main/resources/assets/mekanism/render/BioGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/Chargepad.png b/src/main/resources/assets/mekanism/render/Chargepad.png index 4e096ad43..8da4e6ca0 100644 Binary files a/src/main/resources/assets/mekanism/render/Chargepad.png and b/src/main/resources/assets/mekanism/render/Chargepad.png differ diff --git a/src/main/resources/assets/mekanism/render/GasGenerator.png b/src/main/resources/assets/mekanism/render/GasGenerator.png index 6ce2bbc7b..221ff4985 100644 Binary files a/src/main/resources/assets/mekanism/render/GasGenerator.png and b/src/main/resources/assets/mekanism/render/GasGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png index 98c797b73..0c89a6093 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png and b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankBasic.png b/src/main/resources/assets/mekanism/render/GasTankBasic.png index 7d7dd42dd..bc5c2eddd 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankBasic.png and b/src/main/resources/assets/mekanism/render/GasTankBasic.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankElite.png b/src/main/resources/assets/mekanism/render/GasTankElite.png index ecb928ddf..5e79e9525 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankElite.png and b/src/main/resources/assets/mekanism/render/GasTankElite.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankUltimate.png b/src/main/resources/assets/mekanism/render/GasTankUltimate.png index 3b7ad2ab2..6210edf9c 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankUltimate.png and b/src/main/resources/assets/mekanism/render/GasTankUltimate.png differ diff --git a/src/main/resources/assets/mekanism/render/HeatGenerator.png b/src/main/resources/assets/mekanism/render/HeatGenerator.png index acc8fb64e..9bbcdedcf 100644 Binary files a/src/main/resources/assets/mekanism/render/HeatGenerator.png and b/src/main/resources/assets/mekanism/render/HeatGenerator.png differ diff --git a/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png b/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png index 9bda77b28..d683512fd 100644 Binary files a/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png and b/src/main/resources/assets/mekanism/render/HeatGeneratorOn.png differ diff --git a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png index bd59c7541..462341192 100644 Binary files a/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png and b/src/main/resources/assets/mekanism/render/MetallurgicInfuser.png differ 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 bb09dc60e..32d0c5ce7 Binary files a/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png and b/src/main/resources/assets/mekanism/render/PressurizedReactionChamber.png differ