diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 6755ec719..658579891 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -52,12 +52,11 @@ public class ModelChargepad extends ModelBase stand.mirror = true; setRotation(stand, 0F, 0F, 0F); pillar2 = new ModelRenderer(this, 48, 0); + pillar2.mirror = true; 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); diff --git a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java index 9519791fd..c3a28875a 100644 --- a/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java +++ b/src/main/java/mekanism/client/model/ModelChemicalOxidizer.java @@ -12,188 +12,96 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelChemicalOxidizer extends ModelBase { - ModelRenderer Base; - ModelRenderer TSSW; - ModelRenderer TSNW; - ModelRenderer TSSE; - ModelRenderer TSNE; - ModelRenderer TTN; - ModelRenderer TTS; - ModelRenderer TTE; - ModelRenderer TTW; - ModelRenderer Connection; - ModelRenderer ItemEntry; - ModelRenderer GasExit; - ModelRenderer GasConnection; - ModelRenderer Machine; - ModelRenderer Post; - ModelRenderer GlassN; - ModelRenderer GlassS; - ModelRenderer GlassW; - ModelRenderer GlassE; - ModelRenderer GlassU; + ModelRenderer stand; + ModelRenderer tank; + ModelRenderer pipe2; + ModelRenderer bridge; + ModelRenderer pipe1; + ModelRenderer tower2; + ModelRenderer tower1; + ModelRenderer base; + ModelRenderer connector; + ModelRenderer connectorToggle; - public ModelChemicalOxidizer() + public ModelChemicalOxidizer() { 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); - TSSW = new ModelRenderer(this, 0, 17); - TSSW.addBox(0F, 0F, 0F, 1, 15, 1); - TSSW.setRotationPoint(-1F, 8F, 3F); - TSSW.setTextureSize(128, 128); - TSSW.mirror = true; - setRotation(TSSW, 0F, 0F, 0F); - TSNW = new ModelRenderer(this, 0, 17); - TSNW.addBox(0F, 0F, 0F, 1, 15, 1); - TSNW.setRotationPoint(-1F, 8F, -4F); - TSNW.setTextureSize(128, 128); - TSNW.mirror = true; - setRotation(TSNW, 0F, 0F, 0F); - TSSE = new ModelRenderer(this, 0, 17); - TSSE.addBox(0F, 0F, 0F, 1, 15, 1); - TSSE.setRotationPoint(6F, 8F, 3F); - TSSE.setTextureSize(128, 128); - TSSE.mirror = true; - setRotation(TSSE, 0F, 0F, 0F); - TSNE = new ModelRenderer(this, 0, 17); - TSNE.addBox(0F, 0F, 0F, 1, 15, 1); - TSNE.setRotationPoint(6F, 8F, -4F); - TSNE.setTextureSize(128, 128); - TSNE.mirror = true; - setRotation(TSNE, 0F, 0F, 0F); - TTN = new ModelRenderer(this, 4, 17); - TTN.addBox(0F, 0F, 0F, 6, 1, 1); - TTN.setRotationPoint(0F, 8F, -4F); - TTN.setTextureSize(128, 128); - TTN.mirror = true; - setRotation(TTN, 0F, 0F, 0F); - TTS = new ModelRenderer(this, 4, 17); - TTS.addBox(0F, 0F, 0F, 6, 1, 1); - TTS.setRotationPoint(0F, 8F, 3F); - TTS.setTextureSize(128, 128); - TTS.mirror = true; - setRotation(TTS, 0F, 0F, 0F); - TTE = new ModelRenderer(this, 18, 17); - TTE.addBox(0F, 0F, 0F, 1, 1, 6); - TTE.setRotationPoint(6F, 8F, -3F); - TTE.setTextureSize(128, 128); - TTE.mirror = true; - setRotation(TTE, 0F, 0F, 0F); - TTW = new ModelRenderer(this, 18, 17); - TTW.addBox(0F, 0F, 0F, 1, 1, 6); - TTW.setRotationPoint(-1F, 8F, -3F); - TTW.setTextureSize(128, 128); - TTW.mirror = true; - setRotation(TTW, 0F, 0F, 0F); - Connection = new ModelRenderer(this, 32, 17); - Connection.addBox(0F, 0F, 0F, 7, 4, 4); - Connection.setRotationPoint(-7F, 14F, -2F); - Connection.setTextureSize(128, 128); - Connection.mirror = true; - setRotation(Connection, 0F, 0F, 0F); - ItemEntry = new ModelRenderer(this, 64, 0); - ItemEntry.addBox(0F, 0F, 0F, 1, 8, 8); - ItemEntry.setRotationPoint(-8F, 12F, -4F); - ItemEntry.setTextureSize(128, 128); - ItemEntry.mirror = true; - setRotation(ItemEntry, 0F, 0F, 0F); - GasExit = new ModelRenderer(this, 0, 33); - GasExit.addBox(0F, 1F, 0F, 1, 6, 6); - GasExit.setRotationPoint(7F, 12F, -3F); - GasExit.setTextureSize(128, 128); - GasExit.mirror = true; - setRotation(GasExit, 0F, 0F, 0F); - GasConnection = new ModelRenderer(this, 82, 0); - GasConnection.addBox(0F, 1F, 0F, 1, 4, 4); - GasConnection.setRotationPoint(6F, 13F, -2F); - GasConnection.setTextureSize(128, 128); - GasConnection.mirror = true; - setRotation(GasConnection, 0F, 0F, 0F); - Machine = new ModelRenderer(this, 0, 45); - Machine.addBox(0F, 0F, 0F, 4, 6, 6); - Machine.setRotationPoint(-6F, 13F, -3F); - Machine.setTextureSize(128, 128); - Machine.mirror = true; - setRotation(Machine, 0F, 0F, 0F); - Post = new ModelRenderer(this, 0, 57); - Post.addBox(0F, 0F, 0F, 2, 4, 2); - Post.setRotationPoint(-5F, 19F, -1F); - Post.setTextureSize(128, 128); - Post.mirror = true; - setRotation(Post, 0F, 0F, 0F); - GlassN = new ModelRenderer(this, 92, 0); - GlassN.addBox(0F, 0F, 0F, 6, 14, 1); - GlassN.setRotationPoint(0F, 9F, -4F); - GlassN.setTextureSize(128, 128); - GlassN.mirror = true; - setRotation(GlassN, 0F, 0F, 0F); - GlassS = new ModelRenderer(this, 92, 0); - GlassS.addBox(0F, 0F, 0F, 6, 14, 1); - GlassS.setRotationPoint(0F, 9F, 3F); - GlassS.setTextureSize(128, 128); - GlassS.mirror = true; - setRotation(GlassS, 0F, 0F, 0F); - GlassW = new ModelRenderer(this, 0, 70); - GlassW.addBox(0F, 0F, 0F, 1, 14, 6); - GlassW.setRotationPoint(-1F, 9F, -3F); - GlassW.setTextureSize(128, 128); - GlassW.mirror = true; - setRotation(GlassW, 0F, 0F, 0F); - GlassE = new ModelRenderer(this, 0, 70); - GlassE.addBox(0F, 0F, 0F, 1, 14, 6); - GlassE.setRotationPoint(6F, 9F, -3F); - GlassE.setTextureSize(128, 128); - GlassE.mirror = true; - setRotation(GlassE, 0F, 0F, 0F); - GlassU = new ModelRenderer(this, 0, 63); - GlassU.addBox(0F, 0F, 0F, 6, 1, 6); - GlassU.setRotationPoint(0F, 8F, -3F); - GlassU.setTextureSize(128, 128); - GlassU.mirror = true; - setRotation(GlassU, 0F, 0F, 0F); + stand = new ModelRenderer(this, 0, 20); + stand.addBox(0F, 0F, 0F, 5, 1, 13); + stand.setRotationPoint(-5.5F, 19F, -6.5F); + stand.setTextureSize(128, 64); + stand.mirror = true; + setRotation(stand, 0F, 0F, 0F); + tank = new ModelRenderer(this, 66, 0); + tank.addBox(0F, 0F, 0F, 7, 12, 16); + tank.setRotationPoint(1F, 8F, -8F); + tank.setTextureSize(128, 64); + tank.mirror = true; + setRotation(tank, 0F, 0F, 0F); + pipe2 = new ModelRenderer(this, 82, 28); + pipe2.addBox(0F, 0F, 0F, 2, 6, 6); + pipe2.setRotationPoint(-7F, 13F, -3F); + pipe2.setTextureSize(128, 64); + pipe2.mirror = true; + setRotation(pipe2, 0F, 0F, 0F); + bridge = new ModelRenderer(this, 70, 0); + bridge.addBox(0F, 0F, 0F, 5, 10, 1); + bridge.setRotationPoint(-5.5F, 8.5F, -2F); + bridge.setTextureSize(128, 64); + bridge.mirror = true; + setRotation(bridge, 0F, 0F, 0F); + pipe1 = new ModelRenderer(this, 0, 0); + pipe1.addBox(0F, 0F, 0F, 1, 3, 3); + pipe1.setRotationPoint(0F, 14F, 1F); + pipe1.setTextureSize(128, 64); + pipe1.mirror = true; + setRotation(pipe1, 0F, 0F, 0F); + tower2 = new ModelRenderer(this, 36, 20); + tower2.addBox(0F, 0F, 0F, 6, 11, 8); + tower2.setRotationPoint(-6F, 8F, -1F); + tower2.setTextureSize(128, 64); + tower2.mirror = true; + setRotation(tower2, 0F, 0F, 0F); + tower1 = new ModelRenderer(this, 48, 0); + tower1.addBox(0F, 0F, 0F, 6, 11, 5); + tower1.setRotationPoint(-6F, 8F, -7F); + tower1.setTextureSize(128, 64); + tower1.mirror = true; + setRotation(tower1, 0F, 0F, 0F); + base = new ModelRenderer(this, 0, 0); + base.addBox(0F, 0F, 0F, 16, 4, 16); + base.setRotationPoint(-8F, 20F, -8F); + base.setTextureSize(128, 64); + base.mirror = true; + setRotation(base, 0F, 0F, 0F); + connector = new ModelRenderer(this, 64, 28); + connector.addBox(0F, 0F, 0F, 1, 8, 8); + connector.setRotationPoint(-8F, 12F, -4F); + connector.setTextureSize(128, 64); + connector.mirror = true; + setRotation(connector, 0F, 0F, 0F); + connectorToggle = new ModelRenderer(this, 64, 28); + connectorToggle.addBox(0F, 0F, 0F, 1, 8, 8); + connectorToggle.setRotationPoint(7.01F, 12F, -4F); + connectorToggle.setTextureSize(128, 64); + connectorToggle.mirror = true; + setRotation(connectorToggle, 0F, 0F, 0F); } public void render(float size) { - Base.render(size); - TSSW.render(size); - TSNW.render(size); - TSSE.render(size); - TSNE.render(size); - TTN.render(size); - TTS.render(size); - TTE.render(size); - TTW.render(size); - Connection.render(size); - ItemEntry.render(size); - GasExit.render(size); - GasConnection.render(size); - Machine.render(size); - Post.render(size); - } - - public void renderGlass(float size) - { - GL11.glPushMatrix(); - MekanismRenderer.blendOn(); - GL11.glColor4f(1, 1, 1, 0.2F); - - GlassN.render(size); - GlassS.render(size); - GlassW.render(size); - GlassE.render(size); - GlassU.render(size); - - MekanismRenderer.blendOff(); - GL11.glColor4f(1, 1, 1, 1); - GL11.glPopMatrix(); + stand.render(size); + tank.render(size); + pipe2.render(size); + bridge.render(size); + pipe1.render(size); + tower2.render(size); + tower1.render(size); + base.render(size); + connector.render(size); + connectorToggle.render(size); } private void setRotation(ModelRenderer model, float x, float y, float z) diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java index ab6a84ec3..4ce2a350c 100644 --- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java @@ -8,192 +8,152 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ModelElectrolyticSeparator 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 OUTPUT; - ModelRenderer P; - ModelRenderer Q; - ModelRenderer R; - ModelRenderer S; - ModelRenderer T; - ModelRenderer U; - ModelRenderer V; + ModelRenderer tank2; + ModelRenderer tank1; + ModelRenderer tank3; + ModelRenderer tube6; + ModelRenderer tube5; + ModelRenderer tube4; + ModelRenderer tube3; + ModelRenderer tube2; + ModelRenderer tube1; + ModelRenderer base; + ModelRenderer portToggle1; + ModelRenderer portToggle2a; + ModelRenderer portToggle2b; + ModelRenderer portToggle3a; + ModelRenderer portToggle3b; + ModelRenderer portToggle4a; + ModelRenderer portToggle4b; - public ModelElectrolyticSeparator() + public ModelElectrolyticSeparator() { 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, 85, 0); - B.addBox(-2F, 0F, -2F, 4, 10, 4); - B.setRotationPoint(4F, 12F, -4F); - B.setTextureSize(128, 128); - B.mirror = true; - setRotation(B, 0F, 1.570796F, 0F); - C = new ModelRenderer(this, 66, 0); - C.addBox(-2F, 0F, -2F, 4, 10, 4); - C.setRotationPoint(-4F, 12F, -4F); - C.setTextureSize(128, 128); - C.mirror = true; - setRotation(C, 0F, 1.570796F, 0F); - D = new ModelRenderer(this, 48, 19); - D.addBox(-1F, -1F, 0F, 2, 2, 6); - D.setRotationPoint(-2F, 18F, -4F); - D.setTextureSize(128, 128); - D.mirror = true; - setRotation(D, 0F, 1.570796F, 0F); - E = new ModelRenderer(this, 0, 19); - E.addBox(0F, 0F, -6F, 4, 15, 14); - E.setRotationPoint(0F, 8F, 8F); - E.setTextureSize(128, 128); - E.mirror = true; - setRotation(E, 0F, 1.570796F, 0F); - F = new ModelRenderer(this, 103, 0); - F.addBox(-3F, -1F, -1F, 6, 2, 2); - F.setRotationPoint(4F, 20F, 1F); - F.setTextureSize(128, 128); - F.mirror = true; - setRotation(F, 0F, 1.570796F, 0F); - G = new ModelRenderer(this, 103, 0); - G.addBox(-3F, 0F, 0F, 6, 2, 2); - G.setRotationPoint(-5F, 20F, 1F); - G.setTextureSize(128, 128); - G.mirror = true; - setRotation(G, 0F, 1.570796F, 0F); - H = new ModelRenderer(this, 0, 50); - H.addBox(-2F, 0F, 0F, 4, 12, 2); - H.setRotationPoint(-8F, 11F, 6F); - H.setTextureSize(128, 128); - H.mirror = true; - setRotation(H, 0F, 1.570796F, 0F); - I = new ModelRenderer(this, 41, 28); - I.addBox(0F, 0F, 0F, 6, 1, 6); - I.setRotationPoint(-7F, 22F, -7F); - I.setTextureSize(128, 128); - I.mirror = true; - setRotation(I, 0F, 0F, 0F); - J = new ModelRenderer(this, 41, 28); - J.addBox(0F, 0F, 0F, 6, 1, 6); - J.setRotationPoint(1F, 22F, -7F); - J.setTextureSize(128, 128); - J.mirror = true; - setRotation(J, 0F, 0F, 0F); - K = new ModelRenderer(this, 66, 16); - K.addBox(0F, 0F, 0F, 2, 1, 2); - K.setRotationPoint(-5F, 11F, -5F); - K.setTextureSize(128, 128); - K.mirror = true; - setRotation(K, 0F, 0F, 0F); - L = new ModelRenderer(this, 85, 15); - L.addBox(0F, 0F, 0F, 2, 2, 2); - L.setRotationPoint(3F, 10F, -5F); - L.setTextureSize(128, 128); - L.mirror = true; - setRotation(L, 0F, 0F, 0F); - M = new ModelRenderer(this, 66, 22); - M.addBox(-1F, 0F, -1F, 2, 2, 6); - M.setRotationPoint(-4F, 9F, -4F); - M.setTextureSize(128, 128); - M.mirror = true; - setRotation(M, 0F, 1.570796F, 0F); - N = new ModelRenderer(this, 66, 32); - N.addBox(-1F, -1F, -1F, 2, 6, 2); - N.setRotationPoint(0F, 12F, -4F); - N.setTextureSize(128, 128); - N.mirror = true; - setRotation(N, 0F, 0F, 0F); - OUTPUT = new ModelRenderer(this, 66, 42); - OUTPUT.addBox(-1F, -1F, -1F, 4, 2, 2); - OUTPUT.setRotationPoint(0F, 16F, -5F); - OUTPUT.setTextureSize(128, 128); - OUTPUT.mirror = true; - setRotation(OUTPUT, 0F, 1.570796F, 0F); - P = new ModelRenderer(this, 85, 21); - P.addBox(-1F, -1F, -1F, 2, 3, 2); - P.setRotationPoint(5F, 9F, -4F); - P.setTextureSize(128, 128); - P.mirror = true; - setRotation(P, 0F, 0F, 0.6457718F); - Q = new ModelRenderer(this, 0, 65); - Q.addBox(0F, 0F, -2F, 3, 11, 6); - Q.setRotationPoint(-8F, 12F, 0F); - Q.setTextureSize(128, 128); - Q.mirror = true; - setRotation(Q, 0F, 0F, 0F); - R = new ModelRenderer(this, 0, 65); - R.addBox(0F, 0F, -3F, 3, 11, 6); - R.setRotationPoint(8F, 12F, 1F); - R.setTextureSize(128, 128); - R.mirror = true; - setRotation(R, 0F, 3.141593F, 0F); - S = new ModelRenderer(this, 0, 84); - S.addBox(0F, 0F, 0F, 4, 1, 1); - S.setRotationPoint(2F, 16F, 3F); - S.setTextureSize(128, 128); - S.mirror = true; - setRotation(S, 0F, 0F, 0F); - T = new ModelRenderer(this, 0, 84); - T.addBox(0F, 0F, 0F, 4, 1, 1); - T.setRotationPoint(-6F, 16F, 3F); - T.setTextureSize(128, 128); - T.mirror = true; - setRotation(T, 0F, 0F, 0F); - U = new ModelRenderer(this, 0, 87); - U.addBox(0F, 0F, 0F, 4, 1, 1); - U.setRotationPoint(-6F, 18F, 3F); - U.setTextureSize(128, 128); - U.mirror = true; - setRotation(U, 0F, 0F, 0F); - V = new ModelRenderer(this, 0, 87); - V.addBox(0F, 0F, 0F, 4, 1, 1); - V.setRotationPoint(2F, 18F, 3F); - V.setTextureSize(128, 128); - V.mirror = true; - setRotation(V, 0F, 0F, 0F); + tank2 = new ModelRenderer(this, 64, 0); + tank2.addBox(0F, 0F, 0F, 7, 10, 7); + tank2.setRotationPoint(1F, 10F, 1F); + tank2.setTextureSize(128, 64); + tank2.mirror = true; + setRotation(tank2, 0F, 0F, 0F); + tank1 = new ModelRenderer(this, 0, 20); + tank1.addBox(0F, 0F, 0F, 8, 12, 16); + tank1.setRotationPoint(-8F, 8F, -8F); + tank1.setTextureSize(128, 64); + tank1.mirror = true; + setRotation(tank1, 0F, 0F, 0F); + tank3 = new ModelRenderer(this, 64, 0); + tank3.addBox(0F, 0F, 0F, 7, 10, 7); + tank3.setRotationPoint(1F, 10F, -8F); + tank3.setTextureSize(128, 64); + tank3.mirror = true; + setRotation(tank3, 0F, 0F, 0F); + tube6 = new ModelRenderer(this, 0, 0); + tube6.addBox(0F, 0F, 0F, 1, 1, 1); + tube6.setRotationPoint(4F, 9F, 4F); + tube6.setTextureSize(128, 64); + tube6.mirror = true; + setRotation(tube6, 0F, 0F, 0F); + tube5 = new ModelRenderer(this, 0, 0); + tube5.addBox(0F, 0F, 0F, 1, 1, 1); + tube5.setRotationPoint(4F, 9F, -5F); + tube5.setTextureSize(128, 64); + tube5.mirror = true; + setRotation(tube5, 0F, 0F, 0F); + tube4 = new ModelRenderer(this, 0, 48); + tube4.addBox(0F, 0F, 0F, 1, 1, 10); + tube4.setRotationPoint(4F, 8F, -5F); + tube4.setTextureSize(128, 64); + tube4.mirror = true; + setRotation(tube4, 0F, 0F, 0F); + tube3 = new ModelRenderer(this, 0, 0); + tube3.addBox(0F, 0F, 0F, 1, 3, 1); + tube3.setRotationPoint(4F, 9F, -0.5F); + tube3.setTextureSize(128, 64); + tube3.mirror = true; + setRotation(tube3, 0F, 0F, 0F); + tube2 = new ModelRenderer(this, 0, 0); + tube2.addBox(-4F, -1F, 0F, 4, 1, 1); + tube2.setRotationPoint(5F, 12F, -0.5F); + tube2.setTextureSize(128, 64); + tube2.mirror = true; + setRotation(tube2, 0F, 0F, -0.5235988F); + tube1 = new ModelRenderer(this, 0, 0); + tube1.addBox(-3F, -1F, 0F, 3, 1, 1); + tube1.setRotationPoint(1.5F, 14F, -0.5F); + tube1.setTextureSize(128, 64); + tube1.mirror = true; + setRotation(tube1, 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); + portToggle1 = new ModelRenderer(this, 48, 20); + portToggle1.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle1.setRotationPoint(-8.01F, 12F, -4F); + portToggle1.setTextureSize(128, 64); + portToggle1.mirror = true; + setRotation(portToggle1, 0F, 0F, 0F); + portToggle2a = new ModelRenderer(this, 48, 20); + portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8); + portToggle2a.setRotationPoint(7.01F, 12F, -4F); + portToggle2a.setTextureSize(128, 64); + portToggle2a.mirror = true; + setRotation(portToggle2a, 0F, 0F, 0F); + portToggle2b = new ModelRenderer(this, 0, 4); + portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2); + portToggle2b.setRotationPoint(5F, 13F, -1F); + portToggle2b.setTextureSize(128, 64); + portToggle2b.mirror = true; + setRotation(portToggle2b, 0F, 0F, 0F); + portToggle3a = new ModelRenderer(this, 66, 20); + portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle3a.setRotationPoint(-4F, 12F, -8.01F); + portToggle3a.setTextureSize(128, 64); + portToggle3a.mirror = true; + setRotation(portToggle3a, 0F, 0F, 0F); + portToggle3b = new ModelRenderer(this, 0, 4); + portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle3b.setRotationPoint(0F, 13F, -7F); + portToggle3b.setTextureSize(128, 64); + portToggle3b.mirror = true; + setRotation(portToggle3b, 0F, 0F, 0F); + portToggle4a = new ModelRenderer(this, 66, 20); + portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1); + portToggle4a.setRotationPoint(-4F, 12F, 7.01F); + portToggle4a.setTextureSize(128, 64); + portToggle4a.mirror = true; + setRotation(portToggle4a, 0F, 0F, 0F); + portToggle4b = new ModelRenderer(this, 0, 4); + portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2); + portToggle4b.setRotationPoint(0F, 13F, 5F); + portToggle4b.setTextureSize(128, 64); + portToggle4b.mirror = true; + setRotation(portToggle4b, 0F, 0F, 0F); } 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); - OUTPUT.render(size); - P.render(size); - Q.render(size); - R.render(size); - S.render(size); - T.render(size); - U.render(size); - V.render(size); + tank2.render(size); + tank1.render(size); + tank3.render(size); + tube6.render(size); + tube5.render(size); + tube4.render(size); + tube3.render(size); + tube2.render(size); + tube1.render(size); + base.render(size); + portToggle1.render(size); + portToggle2a.render(size); + portToggle2b.render(size); + portToggle3a.render(size); + portToggle3b.render(size); + portToggle4a.render(size); + portToggle4b.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 3876d2122..b12adbee3 100644 --- a/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java @@ -56,12 +56,11 @@ public class ModelMetallurgicInfuser extends ModelBase connector2.mirror = true; setRotation(connector2, 0F, 0F, 0F); sideRight = new ModelRenderer(this, 64, 0); + sideRight.mirror = true; sideRight.addBox(0F, 0F, 0F, 1, 11, 7); sideRight.setRotationPoint(7F, 9F, 0F); sideRight.setTextureSize(128, 64); - 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); diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 38f9fc0f5..0ccade6ec 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -122,16 +122,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.CHEMICAL_OXIDIZER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); - GL11.glTranslatef(0.0F, -1.06F, 0.05F); + GL11.glRotatef(180F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(0.0F, -1.00F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); chemicalOxidizer.render(0.0625F); - chemicalOxidizer.renderGlass(0.0625F); } else if(type == MachineType.CHEMICAL_INFUSER) { GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.06F, 0.05F); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); chemicalInfuser.render(0.0625F); @@ -140,6 +138,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler else if(type == MachineType.ELECTROLYTIC_SEPARATOR) { 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, "ElectrolyticSeparator.png")); electrolyticSeparator.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 3d929fd07..5d3c71939 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -293,12 +293,14 @@ public class ItemRenderingHandler implements IItemRenderer else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { GL11.glPushMatrix(); + 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(180F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); + GL11.glPopMatrix(); } else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java index 6d094c4a2..dcb6040ee 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java @@ -35,21 +35,6 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer private void renderAModelAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick) { render(false, x, y, z, tileEntity); - - if(tileEntity.gasTank.getGas() != null) - { - push(); - - GL11.glTranslatef((float)x, (float)y, (float)z); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (float)tileEntity.gasTank.getStored()/tileEntity.gasTank.getMaxGas()); - bindTexture(MekanismRenderer.getBlocksTexture()); - getListAndRender(ForgeDirection.getOrientation(tileEntity.facing), tileEntity.gasTank.getGas().getGas()).render(); - GL11.glColor4f(1, 1, 1, 1); - - pop(); - } - - render(true, x, y, z, tileEntity); } /* @@ -72,13 +57,7 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - if(!glass) - { - model.render(0.0625F); - } - else { - model.renderGlass(0.0625F); - } + model.render(0.0625F); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index 79b1885ba..9f3aaee6f 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -31,10 +31,10 @@ public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer switch(tileEntity.facing) { - case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; - case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; - case 4: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; - case 5: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java b/src/main/java/mekanism/client/render/tileentity/RenderGasTank.java index b19069212..af4af146d 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(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(0, 0.0F, 1.0F, 0.0F); break; + case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break; + case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; + case 5: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index faa159e1a..5b57092aa 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -76,9 +76,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp /** Type type of gas this block is dumping. */ public GasMode dumpRight = GasMode.IDLE; - public boolean clientDumpLeft = false; - public boolean clientDumpRight = false; - public double BASE_ENERGY_USAGE; public double energyPerTick; @@ -210,9 +207,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } int dumpAmount = 8*(int)Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED)); - - boolean dumpedLeft = false; - boolean dumpedRight = false; if(leftTank.getGas() != null) { @@ -233,15 +227,11 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp else if(dumpLeft == GasMode.DUMPING) { leftTank.draw(dumpAmount, true); - - dumpedLeft = true; } if(dumpLeft == GasMode.DUMPING_EXCESS && leftTank.getNeeded() < output) { leftTank.draw(output-leftTank.getNeeded(), true); - - dumpedLeft = true; } } @@ -264,39 +254,16 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp else if(dumpRight == GasMode.DUMPING) { rightTank.draw(dumpAmount, true); - - dumpedRight = true; } if(dumpRight == GasMode.DUMPING_EXCESS && rightTank.getNeeded() < output) { rightTank.draw(output-rightTank.getNeeded(), true); - - dumpedRight = true; } } - - if(clientDumpLeft != dumpedLeft || clientDumpRight != dumpedRight) - { - clientDumpLeft = dumpedLeft; - clientDumpRight = dumpedRight; - - Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(this))); - } prevEnergy = getEnergy(); } - else { - if(clientDumpLeft) - { - spawnParticle(0); - } - - if(clientDumpRight) - { - spawnParticle(1); - } - } } public int getUpgradedUsage(SeparatorRecipe recipe) @@ -356,37 +323,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp && rightTank.canReceive(gases.rightGas.getGas()) && rightTank.getNeeded() >= gases.rightGas.amount); } - public void spawnParticle(int type) - { - if(type == 0) - { - ForgeDirection side = ForgeDirection.getOrientation(facing); - - double x = xCoord + (side.offsetX == 0 ? 0.5 : Math.max(side.offsetX, 0)); - double z = zCoord + (side.offsetZ == 0 ? 0.5 : Math.max(side.offsetZ, 0)); - - worldObj.spawnParticle("smoke", x, yCoord + 0.5, z, 0.0D, 0.0D, 0.0D); - } - else if(type == 1) - { - switch(facing) - { - case 3: - worldObj.spawnParticle("smoke", xCoord+0.9, yCoord+1, zCoord+0.75, 0.0D, 0.0D, 0.0D); - break; - case 4: - worldObj.spawnParticle("smoke", xCoord+0.25, yCoord+1, zCoord+0.9, 0.0D, 0.0D, 0.0D); - break; - case 2: - worldObj.spawnParticle("smoke", xCoord+0.1, yCoord+1, zCoord+0.25, 0.0D, 0.0D, 0.0D); - break; - case 5: - worldObj.spawnParticle("smoke", xCoord+0.75, yCoord+1, zCoord+0.1, 0.0D, 0.0D, 0.0D); - break; - } - } - } - @Override public boolean canExtractItem(int slotID, ItemStack itemstack, int side) { @@ -493,8 +429,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp controlType = RedstoneControl.values()[dataStream.readInt()]; dumpLeft = GasMode.values()[dataStream.readInt()]; dumpRight = GasMode.values()[dataStream.readInt()]; - clientDumpLeft = dataStream.readBoolean(); - clientDumpRight = dataStream.readBoolean(); clientActive = dataStream.readBoolean(); clientEnergyUsed = dataStream.readDouble(); @@ -544,8 +478,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp data.add(controlType.ordinal()); data.add(dumpLeft.ordinal()); data.add(dumpRight.ordinal()); - data.add(clientDumpLeft); - data.add(clientDumpRight); data.add(isActive); data.add(clientEnergyUsed); diff --git a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java index 93e9435d9..190381f51 100644 --- a/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java +++ b/src/main/java/mekanism/generators/client/model/ModelBioGenerator.java @@ -25,12 +25,11 @@ public class ModelBioGenerator extends ModelBase base.mirror = true; setRotation(base, 0F, 0F, 0F); sideRight = new ModelRenderer(this, 0, 40); + sideRight.mirror = true; 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); diff --git a/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png b/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png old mode 100644 new mode 100755 index 95172c1db..a6d93d1fa Binary files a/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png and b/src/main/resources/assets/mekanism/render/ChemicalOxidizer.png differ diff --git a/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png index 1e369ee9a..2a7dc215b 100644 Binary files a/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png and b/src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png differ diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png index 0c89a6093..e98d268b7 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 bc5c2eddd..bb4ab7a12 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 5e79e9525..38c89e00c 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 6210edf9c..9fb692fc9 100644 Binary files a/src/main/resources/assets/mekanism/render/GasTankUltimate.png and b/src/main/resources/assets/mekanism/render/GasTankUltimate.png differ