From b64108d1c682554fb64a44ba8b8f12be21a99276 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 27 Mar 2016 20:08:02 -0400 Subject: [PATCH] New models and fixes --- .../mekanism/client/model/ModelChargepad.java | 3 +- .../client/model/ModelChemicalOxidizer.java | 256 +++++--------- .../model/ModelElectrolyticSeparator.java | 316 ++++++++---------- .../client/model/ModelMetallurgicInfuser.java | 3 +- .../render/block/MachineRenderingHandler.java | 7 +- .../render/item/ItemRenderingHandler.java | 4 +- .../tileentity/RenderChemicalOxidizer.java | 23 +- .../RenderElectrolyticSeparator.java | 8 +- .../render/tileentity/RenderGasTank.java | 8 +- .../tile/TileEntityElectrolyticSeparator.java | 68 ---- .../client/model/ModelBioGenerator.java | 3 +- .../mekanism/render/ChemicalOxidizer.png | Bin 2279 -> 5535 bytes .../mekanism/render/ElectrolyticSeparator.png | Bin 4529 -> 19898 bytes .../mekanism/render/GasTankAdvanced.png | Bin 3928 -> 3951 bytes .../assets/mekanism/render/GasTankBasic.png | Bin 3953 -> 3974 bytes .../assets/mekanism/render/GasTankElite.png | Bin 3980 -> 4003 bytes .../mekanism/render/GasTankUltimate.png | Bin 3201 -> 3958 bytes 17 files changed, 238 insertions(+), 461 deletions(-) mode change 100644 => 100755 src/main/resources/assets/mekanism/render/ChemicalOxidizer.png 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 95172c1dba343a315df5335527afe30fefac5d11..a6d93d1fa1fdb597cf3a99212021f5483e4b6004 GIT binary patch literal 5535 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 literal 2279 zcma)8doCT`lE;27S*|PEgY>KjYjX>kTZBBn$BN&h z9wALA$p}N9D3uYJyK-5vE}C6_>pbWD{{Ef!dB0!h{W`C6-k;C;ygui=b9{dG+ODdr z3IM=%{80~IIWm4ER7qaDUBU+CpcH=0%L9=8h?`Gt7t0xyb4LSz0|5Bb9|_uF>dlao z%2Yf7r~D3PpuNxV@aeMSa!NniFM#SE7ZXE{rOI0Xa6eBDqmm<$3DMLjq!*sx6KO?O z1_0v368d!rGi*e>-F(uWNT_glZ$x&JFLfv5NWO^U;dlcv;H z7kH$LI&Eee5G^BcILh#Y#n7cCy$@)@EIQxP)fL(taV%QwB9#8_>e#8}c=+(jAUnfW z2`D7%T$YMe>c33WMuXZfOLQ+)Dga_iUGs~e?x1ae;4KR8qYarwdlHHLY}lpB#~&3s zTjTifPt11OR?EjWIG;mz4d7icpnsM`2)=MQ@XECWSY=W=3Lnah=MD;Y2T@S?S!Qsl z@q^K!&C#GUVif)ym72k}C_)Wj(3dLZWBx2jh6A`0H!Y6+dKC#Bz4$I7kF$J8PYZKG zd+1ykqU|L~8^X5G%SOW7OUOBMa}ho9Fu;Zz>cZ+qq*s|vCbKQlZI!&dyrL#{#_u+Q zxqmx2Vt3)&m}grRt+8AIlx%JeBYUu9Sn(a~98k2iuSfkH& z#O__&?rD)omvdQielIjF^wS|cC_8u8F01trrhlpNGxqMDly%sKaTsb?=yu33Z6nig z;53nFWsn#wO3Eg zP_%vEw+;BT{APcd10q6h!`RqZ`Q?M5MdB`w;IH725WZuT#HMlo4GCAzO>^$LZ~Dvq z@xh+S6D^6t#k}0_v)qZ63&S+`5E9AF3=#n=@wL)n&LtWN=z$je#SB5Ot{WF2f047_ z?oWKBBydvp4{8d(PxeyR_l<}MuU;R@IV(x&?>A0e!wr5XD3_`s-2H zE~95h%P4X?p3rWfBa2--S_`c?zinz(%kCS`wy;ahJ6TZ8ZaadI_2Cph+rh!%MbP6$ zWK39&?DAv($tQehkjb^R0zKC`df&jbIXH3XuXjW=TK>T$%qfGw12O?mKws|WCp>|6 zvDDN-hzRv7Gt)^Nlg4}&XH~Rx>UiVYZlJTb7k97ZX_<8h9GDi1+sh!jZt57b1*(wX@1C0I=En-ZM+JRWV@O$2dv0#-p3O5Yg4x+BPJ8=mI+D@6 zGYnC+;?#;Xf`a{96&Sv%-e&)1vA)rtsd4Y7@2Q~T160yFou@oxbQW6M=;}*Xy0m?? z2=$Ey8`-<_*7r(GEkw3nQ-Ll13>-+11?$9U<0zD;(3lCQ>Q|eTJK(o1G<#kW|9y!4 zz=+**q%xvlgZvc1&vNWiaK>ok(ou2mqUsGMZ30JwcFbjkWh0^IXf)^Y_Vvs`aVSL1 zhu8eu8|mk@h;=Qu`a|;_vmh&L>#ep1(sq5EMqP9H@X}EKwM~33vBP>`iG~eF2e<*@ ziMC_4M;`ora;>(n6nFG-ft$nFtyMCFYv-2ANNit7ZJf@)5 z_&HOho@TNiI_+qZ-4BN{a%L*G0n?wCPnD!5Jh90nS~nA#*8(wl?*`0g$Wy73)SOHPc|{;5=nRS!euA3>K(bHt zcE(I#&Azb8hZkS;)G{8QN|Z@yvfIC)U1*{n^H6X6bU8X-IoG4g6wA91jAmPd0Y+QH zA6+YLr@;^7z=hBCHUh?8e?Kx0fgn9gPsG*Zv~hPBr*ejJA(OM>#Cs&-^93a0^}+2`rs1)TcfsoJ zTVD6G)guR6EOf7PAb|K4w$wZIQCGg|%@wED7uM{vM9L1i{=jrgTyEc|BE_QBJz3|^ z-i{P&!o{TS!6b#fy6c+kZ>-gFWrSWZ(;~K`figKY1-H7kbpH9nNYr6JNWX&PjQeS2 zf9FrBt5F7+p^X`Ap|cQ>_LmW=q$SqQT|Lf>5K$oIWs7ARGT;OCI6EDjUDdCzX7ndg zEpN;SBtOQ^3~zDS8%$(DEyH%=v&qnaQZ0Z5sjD)4fDAA)*$;BWeu8dM2ftWS;3|?n z>UBeap%9GeKblovo&JsdJ^yI6fpHRCMtHA;-Q2AHDDeI|wx>oJsSVr$`ca`q+5b}+ iW~gJK|9>gmwG?M;6RRYF7zxRVq#Mb>7&B%vW0-Ln_lb%VhfaMfm*SMu zRiT9B-UZcUIF69qLZjR%V{-ewgUXp|e&_f6zJJaY&*?EWt05VH?KO#W#1!Vv*!V&j7`Z?O# z7-1=7ZHx!S9j8qv`|xZ5lquZ@gZ0AsLELekL~j%I!NO8?2+_kt-2rI}v-L5@5r{j3 zsknW?yZ2**y|9KJ>Za($D7q2ofQ<9QKL)9U(UHrUE)XjJU zLL6=PK+Gvr90aMYr-g;X;Sha8Z8*{Zp@ZBC(SgB{P?#YU4%33cjo>gN9T;T(qmEt- zKB1@{c%!`*JLZQ2B@=ampP!Er6dD*9s2zyVrcgbha6>~wC`<>cqoW1((4qx-`(fx> z-ZYIlC!hUT;AmJX(Z`QS@rLmHV%#bIekSVbyn()a=GR5`v9@_&$M`_u z+At`Y4E>%Z&2KO6>m`g|1JO@0>zI)BT#-YTK4DtHYr2U zOWMybbv7rBh~Li1LKkMHgVM-I1*`Q4mUS|Z#UP~(Xl{5zcKwfAJ92!PVMn6 z#Cgva|C{Fpre8gO#;{A%afZ_Ix@Mj!#_ zjRtpWJuMhQOGke{T;B+WFwy}<@B#LDs>;U+nC;z7g*efIIAXz_e3=*jN`Ji|ROewcsdWnte1emt;7cnXz_@k0~I7*8D3$J-MH z{o1&o=a;j<$eco=P{C>8&E;7-e{QW{@Wd7<8p@%(4&*DC!#?D#)U znt%FVIC(*{L-CF>BXIu#s{u1x_iz;So3;gup4B<>Hh7Z%Y=3p1ME;sYXB6yg%hhfgcS#Ro*ND8wb051&?uiw}rkQHV=0A3m)R z7atJ8q7av0K73jsEH)1U{N5h#b4hY#d(7-j0S>l zhMv7bmjmA_gP!Z98gJada0*cLKy z`|dkGcy)3;J!}`+?-$|EYlfPm^i`+ zp@%T+a#w}vRhStQAla+eMu$l-vrVTy?5kNbwKlD?(m#v!D^i1bK1`X^8`57mRcJP? zbmEvOhi?Z-f77Ok&$UOv-8-W?W=A zkf^rgsftuWLXgJKWywnz!^Sw5I8J|lTXIrUgKNaa=R>L=Hyvr)>|;9VT-Kg?wT5VF zrow9*uQo^R9tUm}+s|WiukH{A!+FdJ~ zx|?uxWhzb0sDI;5F$Hl~Tc5Z#d$}=wF0)zBUZU?RPQViE! zHD0tGnV1r|Zu`=5_NiFzofG1CDCm&TmT{{jJiRU`Iq8D*Ux2uovb8LOa{__&ooszR zh^N32x#x`;obs+lDF(MJgcaBMTY~1`w#TUP=^8mS&^6fhz+dxzL{->_TC1o4)Xe3v zQ?b6aGd;EG1<60ntj=^To!+KqUf9HlQkl)ahu4n)q{88o)y#^#jR@4I;fd@!hs4^4 z;cKi`Cl(lfVl)&jO+W&9n6+txGI~aXgf3Kg6*=GJmG6{jTm*LnhiJaR%D!_)5f)&d z*Kyu89DJRsGJf^*kC%MzU2E%HG`oZYvJB0EY;ruuL=C9yGz=~~bQGlxth$hNk!-sr zt=s2`Ix`_qawH6!nq6O;uu_#;6Q91?vj31a+ga6+x{eUtV0kF4(SdO>OtpUK)5j3h zY&xXh6v6N3S0q259dF9_}VvVsZz4gk+bLxlCUee5=Q&KygET4j*o9~^HzgiMB ziXTE}-Z!<_Tob>t___(2JtYmiUo})B(dQ_BUv1!wrtxx|*w|<917c;12m7--Cqu_Z z(oJ8{UZ7hID~&nyLA3IPz`meEk=fmbs}z_b{NS2q2cC^e9huHtgg)!zF=17*)V5u_}jiB1IK#NT@C7z*g}O+`C=l!%JD!KJkp zNWJaq5%=0~>nT7=nI3v1Ur@3nGbn~LtXkG{>e0p-pFFI6NEOai;%)3$_MNqZHJ8kf zs*XK~`1J1DQ54FK{*fClg-o5TMf-Z7F@)t3o_Q&HEVTP1`hMhaSx=uv`zD~W-jK3p z$z!y1wQF=Jz2H)9cKc>cGS(O$Dxoh_js~#6IG1kv0Fj!N4AXZ;r zpBA>L#`)x{9A`@9+PB98CQ;>oXEzxpm)Wm+*&{hOV{tpNp^?ERy|!GcfulrJ2YIx+n|Ba4bWW0o*mp+^;7ym)a1Z@h8Rr{5SVSIw+E;F|O< z`|_gbVP;%vxTxt_K%k3BlQlhvLq)D3dX7dn_z;+8@GD*g;lZ} zV-s%Ok5z(#yX0X?@!32b6}C7mJ!p7h_e7c@?d>Ie*^yk8Ns)$zhQbGFOE>NopU^Y7 z`A{V~KjPu@g2s#s!NslhQ#-|Y^N5Uk=*$4SbiKMk`QB zk8>5Rq#pFoWM6K$#vY+{27_77eC+a6arPM5DhueLJUz>mfU-Oe$#`0Im|Q*f(8ZgT zF~vl%x^zOWO_`(&V}3ouN#1-Y-4Pv7wnB6H;fx0IjlFm3gIiXxx8wz^$@0qEpOjxe zkv20;$uK#qu_Q=Dp<-3+*^^Ua37%T<*bsKQZS3W$)~Ru^*v>}YuU&P2x4MKxxKWRZ zK!KqFFj3M^q&euPv2Jy40=j~m0&<YC@D zH}%#B-yQ@9^aA%t+HxoF%CiCEwD8|T{m@s=m4|c{WJX+@GIT0u%hCPcaWu!L5BBD^ zQxc%Q>9x`&W%kROyhddL-bS#g-D5w;gB7U^Id^lku;l&=JYwSR8;(Id**~lp^uNXn zpcD=7(0?YKO{l~!~QUQWzz|EPtx00_q;jnm`j|FSXTE8s7VR z>7^Xpa`sje$*I7(+R@myu8-XS4XQt=eX%z~72F|V;%eK{YqNKxW2{d*CSQF?(nGwg zP~w;|TQm)~gM0dgEV;L$>23FYH5y(@(IbG7>ZWs&<4mKXw@ZUjcw9pL{aX&5UI#8yr{aW?n(Nyq1t)JiJH4pCXLMHMLy$;~ zhQi5E;J$m|z$@+pt%Flk45Y`SNd99Y*|w|+iSf|j zOa<`*$6=G^mKMMKePwPqr@2L?X1Ai5Z?N{WZ@Ij9FH1 zObfkCEgun)j;c6P>`locH#U2%I&?xc6OSJZ{U8rk!E{k@%kG(hKYQ2po>j%ztN<=N zuMX+Hv?z4+g?<6^siA0%a*=^?nq+K)n+?n$ZF!YV?}57hd#0?MO&kA+>EJw@OdNdU zynf;@_g!0m@^pISi7y?vIeJq%P}Ay^{5Iv2l6#)7NTn8BC`1;5^p{yCSrw;IkHKpJ z@0JJ4C!-iichuS+9+wHbSe8O5A>xhMg(26(5ws9?^RHG60`+Ej^9lMmKBx`e*a>WO#<{MTf&>XBxE5-K@7kZ(-j{bt27}cE-s&DQkigbWZ(4V}6_4s?}`C zdphKd7c4Ym_e6-x)a7y03Bc&~@|aC!dvlLOa9L7EU&*brK7Hl+RpJpZcCYtp#@rq# z_7XUy(U!cnAz4#?gX_)xpR}!%m&!6S-VK};33)O(^eV)E!uPU#fcn_Y(#rNVb%CFP zYNw#p2m0*TnYgpQ_9(Hfa#y`|Rq~v&3RQOHgK!T6AEb9!h+S{!%er=soa>VFSqLNkncfawYP2+Z(_IvsCw2e$F=xxxz^lQXde||^h^po0j`N$Kn3YIswb@t z(%g)Q%jcvyxMjVEaX8AYy)3ruAEpVtFEXmmL6c{Wib*|4o_Y4{WSkFi?wCT|-Beba zZbc*GLgmr`63O}Z<5F!RnLVsS!St}HPahd8<<-z6yfISRggf*m-CgmmzOnHt!m^%0 zE`U0mNRx)483fS^sWaH=>t|{PCM9O?bB}6)ahu}j=b}Pb?k0!9X%#Ev#I)@I_vn%PABL$`|=?@jX zAgwpbtHR3I&Wh5b(crbN*KgY8gN4HE$>%7`D1KcfCyvM~bV%(j%Gm(mkCEku#;@<~ zd&=3;0XS!zN-{ajy+GQA$Cp5vX zpuROqcJQf{ta+-`+ox=C`Y0v;K^A-0(5HU?>B!kTTn7P&u^T0pxS=wY7~{x>Cg{i! z>;>~^If?#Zbl0%8<<_VbDTWZ09Ju)!MpGj1c(MgEKce3~&n_Q}l68 zEq>oq=|V*xjaix0IlfiReld%~7^cgkU)|AfHP%pY7+jWv~iAQ-`Sl%@tMgQCc#G zlXJ#S9;v>xI#kjPPiGgPfloBmi`}z_Pu>YtrrJjtRK-})G?RHMsz;#?e@+dw3$?it*Pj?dRV66JMzUBFXONue`)eMwAZNR z%{*LEBMOP@6|JFg0<*fUiXEk$lte6nW4^~9G9qCWF^|J%D*^Nn33^o!H)A+eRa6s?gUsJ*wMq^0(*QAAMmR@&Nbty(2Uxru6RVzf1D zQ!{9V*n0%Qug~ZA{14BIbFMdMe6F)zoOlx>?Q0A-82|vdrmLf2_6MW>BlNU?^jDR~ zeEap@wquVKc{j8Gh?8gJ^zjzbq`!-XyE{u)@Tf<(>4#x`^xB0O1Vz|kSra#6! zYxQrm(w&jr>u6{9Av>dTU{Ef@(_zoe4<>!dH4CEo`fY}m&05jHRDM*OuFSGAy?QS54&jj0eapKkqaz*K$J7}7fxC}G zuXA`+B(lOK%=P;8Bu!H;=X7!&VPqqamMe4;*$kIjriIMdkC{2v7Pe`xXlMu;aolzs z|EPz+n&ir)e{0c_QxcZxj(zd9@3FLi@d&FIAyhGGu`Bj=hFkE z`4kle>iBu%4v#Avwn~2T{RX{$JG`BVhT*9Y}whka@5aw z&fCHj$ne?2um*j57tD2+S(rA5cB0ebdu(|ihs{i0TCtg2cjx4RU`g=9?4^GaLg2Xx zqB`;0uZ+KS{gwsQj!@4w4FxFja`tiGk=RiO|*Mj&xTZSD-O8BAdG z-m=q(yX-)$Te;blvSBt^4qI^ChMo73Hh_PK7moznpF5(XtD$BQLbaK#|I%WH{qORo zayzzmReCDnQt5%1hDkSwUbc&*!oZ!>$F%JWVlf6eE;qq3)J5-)I@?|-T#aY; za)ODl$oTmU*Frx=*3Iv3+n1Cz8s)5&ncMJ`O-y^@&QC9Eph0D2BwNAaSDaE?rSUIb zyimUF?d{Djw~8$)D#A7z2JOyIPPX0C_2q7I|zvHxq!& zcq4d=zW0=0;qTP|&$CfU`jfKlu(@0-yq6If7R?Uc;KHF=`RdtTLjXnHn^kFg4tA|< zVu+p@znn+y#v@n!37EB^nkCQj<8g-<9&WUep**OmRRFJ%*CAaS^!fL$|9ZE5n5;r2L~+%r6o`z+Q+%lweWuYBmn;73R!j zDgsjQ7vFKO{8xUsI+MU?VC8|>3^y&|3M9$&&^8#jrXEYYVz!@=B(=oHm_E!AdXleS zuqaD&SHnP3ZGL>lb86!7X&Vdr!CDlTsh-}Yq-U5>M0|u z)!@IMq{{{AqB^^XT;*xPgnhCA75Jmvj&|?gt=Nrb3oGr$(0!L-x^ulScsSW_{c9Yv zkKSVPd2fcq3w!U6k_d>CWEwb1+&toNZM>kuUjohiHlc+o9qV8ayPSTUo{4@paU3=m zN9jQm;DOVcWrm&nd(Ow1y>l(-iSc^@*hS z)2k(wS^zrzq0;Nit(F1eVgbr`zK`Hgy!a}eIiPRmsCnIa^QSkDB5)UGID+ySm0O8l z8EiM<&c)T9RufgyWqqZn1;dNg5+OiVervdyL2mq6XdKfJ*(6Tx zmUUBlC^Ts8K==JYU48vqgXuM8da+~aUen+yqW(Lq1DFD3Q)y7xk#c&^muL zGsP%fx;v}6vyzd%edk)k<8)8TF@Xai*To5EBFQbNPCezlJ%7TwfgWzjK8o34!7UXK zBv7UKGDYwG%P7^io?4=Od?;-(>^qOQw3r~pfbk_XW>h<9DcAMrp6C|a zf}(n)uZt{|L)vzPad0L*2O~aYc#Fz;qQK?F60>5$C~qq;{v@)C82^OrFjqK zg3_Q1I!n z7z%lJj7DoFZ^<)1n_v`8i>d`JF{`EO#k~A5J7diL87W@kEwy)AjcN>Zr+bg>>`A;o z=R9X+#E^&G{m@r#jq~8YMrpouAM$)Rd)EM4DV?q0??|^d?veq(#P-_+OQ9;^3is+K z!oXvi9YWLBch{_m`_lgk9i4~Q4%BNlr_w*Wl~ZkThbB^7+mZA&>C2% zJ^3N5#66mgPyf?Z45VvpQ$2&a?YZ-k@r>SRh}N~<(Gp`()*$GR=i8&aLRWJ2oD}O$`LE#@V_EAORcdCaYv*KT!$*2u`gCXUY0lT*w2 zfY5*d*$RsIa~LF?k+_P!Nz|cgiw#d5IfR#LRO!m_9p{eR5V|HzA+F zy|3WB1OOq|BqxrqTJW;*e2LcHypI6lx9O7eXlxV#ji=nZK0NZO;gba_`}qOy0|};k zqze@lNguC6o#SE6ZZX_m_uIy_^bBgCfGR7BWk`{GF$?CzH3oHBmuI?O`OO>p zZlZmF5EZ^PkskghpM`G9fZ!uTh$9mNI666^=j;J3jjp-%PAQjl#ElKuz7-uvi+3zy z{l0j+&gF*s>l8}F%z5Nqc{8W}bWcbi+13 zP^D!i#;^-ds<1Hnx6S2ysAeLl<|-9AZl*-lV-ai^!GK&shm|&z)nDnA5xcXR{3fx~IG_It{QmeIlQ7 z7IrWBFH|DqT6{QbP>->?M~#FU+^Kti(p9q<@Tn7VE-I(LrNZN5sjK`{&KMr2VUcoApUEPm*rXgF(+#VRwwc2~f?IP=ME6 zVp->rUGBkIKqp7F12|z2!d=L&G8=^5wi!*{k1l;xzN?!PTb$ zBcGUO{K)du&jkRk%G%JDJyny?cW=V@-^Z)^gUL<~grkfH=Pb}?Q7);ozGIre0(hzc zt3>qTH=#%Z9X3n7g@ZrSo#YZ#?PipXDfA%7UN{)s{Ub3uZY%v2=v9)=J;eN>T=J@_!XWrb5&~HH zk+{JP7=ZUyxB6iv6e=#$SZZwIZVVwZ!hT8l}Idkr|Rl&t5fjnvr>$QWr` z<--^gW?CK675J40FrkQb7pZ|MQ9gbTy4MD%BrF{~!AUk;DK1 diff --git a/src/main/resources/assets/mekanism/render/GasTankAdvanced.png b/src/main/resources/assets/mekanism/render/GasTankAdvanced.png index 0c89a60930f513044a8f32a2ff3b1921b99539d5..e98d268b782f4fca2eb9a05ca644acaddb14b4b5 100644 GIT binary patch delta 2896 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 X!|SNd`_9V%00000NkvXXu0mjfHjO}O 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 Rqmcjr002ovPDHLkV1fWQ(6#^o delta 2898 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 diff --git a/src/main/resources/assets/mekanism/render/GasTankElite.png b/src/main/resources/assets/mekanism/render/GasTankElite.png index 5e79e95252074bdf6362c2eecf6e8f170ce8ab26..38c89e00c1f436a0a4435f177e320982dae86df0 100644 GIT binary patch delta 2948 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 literal 3201 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