tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

New models and fixes

Browse source
This commit is contained in:
aidancbrady 2016-03-27 20:08:02 -04:00
parent 14aea16e3a
commit b64108d1c6
17 changed files with 238 additions and 461 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/mekanism/client/model/ModelChargepad.java
View file

@ -52,12 +52,11 @@ public class ModelChargepad extends ModelBase
stand.mirror = true; stand.mirror = true;
setRotation(stand, 0F, 0F, 0F); setRotation(stand, 0F, 0F, 0F);
pillar2 = new ModelRenderer(this, 48, 0); pillar2 = new ModelRenderer(this, 48, 0);
pillar2.mirror = true;
pillar2.addBox(0F, 0F, 0F, 2, 7, 2); pillar2.addBox(0F, 0F, 0F, 2, 7, 2);
pillar2.setRotationPoint(2F, 16F, 3.99F); pillar2.setRotationPoint(2F, 16F, 3.99F);
pillar2.setTextureSize(64, 64); pillar2.setTextureSize(64, 64);
pillar2.mirror = true;
setRotation(pillar2, 0F, 0F, 0F); setRotation(pillar2, 0F, 0F, 0F);
pillar2.mirror = false;
pillar1 = new ModelRenderer(this, 48, 0); pillar1 = new ModelRenderer(this, 48, 0);
pillar1.addBox(0F, 0F, 0F, 2, 7, 2); pillar1.addBox(0F, 0F, 0F, 2, 7, 2);
pillar1.setRotationPoint(-4F, 16F, 3.99F); pillar1.setRotationPoint(-4F, 16F, 3.99F);

256
src/main/java/mekanism/client/model/ModelChemicalOxidizer.java
View file

@ -12,188 +12,96 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ModelChemicalOxidizer extends ModelBase public class ModelChemicalOxidizer extends ModelBase
{ {
ModelRenderer Base; ModelRenderer stand;
ModelRenderer TSSW; ModelRenderer tank;
ModelRenderer TSNW; ModelRenderer pipe2;
ModelRenderer TSSE; ModelRenderer bridge;
ModelRenderer TSNE; ModelRenderer pipe1;
ModelRenderer TTN; ModelRenderer tower2;
ModelRenderer TTS; ModelRenderer tower1;
ModelRenderer TTE; ModelRenderer base;
ModelRenderer TTW; ModelRenderer connector;
ModelRenderer Connection; ModelRenderer connectorToggle;
ModelRenderer ItemEntry;
ModelRenderer GasExit;
ModelRenderer GasConnection;
ModelRenderer Machine;
ModelRenderer Post;
ModelRenderer GlassN;
ModelRenderer GlassS;
ModelRenderer GlassW;
ModelRenderer GlassE;
ModelRenderer GlassU;
public ModelChemicalOxidizer() public ModelChemicalOxidizer()
{ {
textureWidth = 128; textureWidth = 128;
textureHeight = 128; textureHeight = 64;
Base = new ModelRenderer(this, 0, 0); stand = new ModelRenderer(this, 0, 20);
Base.addBox(0F, 0F, 0F, 16, 1, 16); stand.addBox(0F, 0F, 0F, 5, 1, 13);
Base.setRotationPoint(-8F, 23F, -8F); stand.setRotationPoint(-5.5F, 19F, -6.5F);
Base.setTextureSize(128, 128); stand.setTextureSize(128, 64);
Base.mirror = true; stand.mirror = true;
setRotation(Base, 0F, 0F, 0F); setRotation(stand, 0F, 0F, 0F);
TSSW = new ModelRenderer(this, 0, 17); tank = new ModelRenderer(this, 66, 0);
TSSW.addBox(0F, 0F, 0F, 1, 15, 1); tank.addBox(0F, 0F, 0F, 7, 12, 16);
TSSW.setRotationPoint(-1F, 8F, 3F); tank.setRotationPoint(1F, 8F, -8F);
TSSW.setTextureSize(128, 128); tank.setTextureSize(128, 64);
TSSW.mirror = true; tank.mirror = true;
setRotation(TSSW, 0F, 0F, 0F); setRotation(tank, 0F, 0F, 0F);
TSNW = new ModelRenderer(this, 0, 17); pipe2 = new ModelRenderer(this, 82, 28);
TSNW.addBox(0F, 0F, 0F, 1, 15, 1); pipe2.addBox(0F, 0F, 0F, 2, 6, 6);
TSNW.setRotationPoint(-1F, 8F, -4F); pipe2.setRotationPoint(-7F, 13F, -3F);
TSNW.setTextureSize(128, 128); pipe2.setTextureSize(128, 64);
TSNW.mirror = true; pipe2.mirror = true;
setRotation(TSNW, 0F, 0F, 0F); setRotation(pipe2, 0F, 0F, 0F);
TSSE = new ModelRenderer(this, 0, 17); bridge = new ModelRenderer(this, 70, 0);
TSSE.addBox(0F, 0F, 0F, 1, 15, 1); bridge.addBox(0F, 0F, 0F, 5, 10, 1);
TSSE.setRotationPoint(6F, 8F, 3F); bridge.setRotationPoint(-5.5F, 8.5F, -2F);
TSSE.setTextureSize(128, 128); bridge.setTextureSize(128, 64);
TSSE.mirror = true; bridge.mirror = true;
setRotation(TSSE, 0F, 0F, 0F); setRotation(bridge, 0F, 0F, 0F);
TSNE = new ModelRenderer(this, 0, 17); pipe1 = new ModelRenderer(this, 0, 0);
TSNE.addBox(0F, 0F, 0F, 1, 15, 1); pipe1.addBox(0F, 0F, 0F, 1, 3, 3);
TSNE.setRotationPoint(6F, 8F, -4F); pipe1.setRotationPoint(0F, 14F, 1F);
TSNE.setTextureSize(128, 128); pipe1.setTextureSize(128, 64);
TSNE.mirror = true; pipe1.mirror = true;
setRotation(TSNE, 0F, 0F, 0F); setRotation(pipe1, 0F, 0F, 0F);
TTN = new ModelRenderer(this, 4, 17); tower2 = new ModelRenderer(this, 36, 20);
TTN.addBox(0F, 0F, 0F, 6, 1, 1); tower2.addBox(0F, 0F, 0F, 6, 11, 8);
TTN.setRotationPoint(0F, 8F, -4F); tower2.setRotationPoint(-6F, 8F, -1F);
TTN.setTextureSize(128, 128); tower2.setTextureSize(128, 64);
TTN.mirror = true; tower2.mirror = true;
setRotation(TTN, 0F, 0F, 0F); setRotation(tower2, 0F, 0F, 0F);
TTS = new ModelRenderer(this, 4, 17); tower1 = new ModelRenderer(this, 48, 0);
TTS.addBox(0F, 0F, 0F, 6, 1, 1); tower1.addBox(0F, 0F, 0F, 6, 11, 5);
TTS.setRotationPoint(0F, 8F, 3F); tower1.setRotationPoint(-6F, 8F, -7F);
TTS.setTextureSize(128, 128); tower1.setTextureSize(128, 64);
TTS.mirror = true; tower1.mirror = true;
setRotation(TTS, 0F, 0F, 0F); setRotation(tower1, 0F, 0F, 0F);
TTE = new ModelRenderer(this, 18, 17); base = new ModelRenderer(this, 0, 0);
TTE.addBox(0F, 0F, 0F, 1, 1, 6); base.addBox(0F, 0F, 0F, 16, 4, 16);
TTE.setRotationPoint(6F, 8F, -3F); base.setRotationPoint(-8F, 20F, -8F);
TTE.setTextureSize(128, 128); base.setTextureSize(128, 64);
TTE.mirror = true; base.mirror = true;
setRotation(TTE, 0F, 0F, 0F); setRotation(base, 0F, 0F, 0F);
TTW = new ModelRenderer(this, 18, 17); connector = new ModelRenderer(this, 64, 28);
TTW.addBox(0F, 0F, 0F, 1, 1, 6); connector.addBox(0F, 0F, 0F, 1, 8, 8);
TTW.setRotationPoint(-1F, 8F, -3F); connector.setRotationPoint(-8F, 12F, -4F);
TTW.setTextureSize(128, 128); connector.setTextureSize(128, 64);
TTW.mirror = true; connector.mirror = true;
setRotation(TTW, 0F, 0F, 0F); setRotation(connector, 0F, 0F, 0F);
Connection = new ModelRenderer(this, 32, 17); connectorToggle = new ModelRenderer(this, 64, 28);
Connection.addBox(0F, 0F, 0F, 7, 4, 4); connectorToggle.addBox(0F, 0F, 0F, 1, 8, 8);
Connection.setRotationPoint(-7F, 14F, -2F); connectorToggle.setRotationPoint(7.01F, 12F, -4F);
Connection.setTextureSize(128, 128); connectorToggle.setTextureSize(128, 64);
Connection.mirror = true; connectorToggle.mirror = true;
setRotation(Connection, 0F, 0F, 0F); setRotation(connectorToggle, 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);
} }
public void render(float size) public void render(float size)
{ {
Base.render(size); stand.render(size);
TSSW.render(size); tank.render(size);
TSNW.render(size); pipe2.render(size);
TSSE.render(size); bridge.render(size);
TSNE.render(size); pipe1.render(size);
TTN.render(size); tower2.render(size);
TTS.render(size); tower1.render(size);
TTE.render(size); base.render(size);
TTW.render(size); connector.render(size);
Connection.render(size); connectorToggle.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();
} }
private void setRotation(ModelRenderer model, float x, float y, float z) private void setRotation(ModelRenderer model, float x, float y, float z)

316
src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java
View file

@ -8,192 +8,152 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ModelElectrolyticSeparator extends ModelBase public class ModelElectrolyticSeparator extends ModelBase
{ {
ModelRenderer A; ModelRenderer tank2;
ModelRenderer B; ModelRenderer tank1;
ModelRenderer C; ModelRenderer tank3;
ModelRenderer D; ModelRenderer tube6;
ModelRenderer E; ModelRenderer tube5;
ModelRenderer F; ModelRenderer tube4;
ModelRenderer G; ModelRenderer tube3;
ModelRenderer H; ModelRenderer tube2;
ModelRenderer I; ModelRenderer tube1;
ModelRenderer J; ModelRenderer base;
ModelRenderer K; ModelRenderer portToggle1;
ModelRenderer L; ModelRenderer portToggle2a;
ModelRenderer M; ModelRenderer portToggle2b;
ModelRenderer N; ModelRenderer portToggle3a;
ModelRenderer OUTPUT; ModelRenderer portToggle3b;
ModelRenderer P; ModelRenderer portToggle4a;
ModelRenderer Q; ModelRenderer portToggle4b;
ModelRenderer R;
ModelRenderer S;
ModelRenderer T;
ModelRenderer U;
ModelRenderer V;
public ModelElectrolyticSeparator() public ModelElectrolyticSeparator()
{ {
textureWidth = 128; textureWidth = 128;
textureHeight = 128; textureHeight = 64;
A = new ModelRenderer(this, 0, 0); tank2 = new ModelRenderer(this, 64, 0);
A.addBox(-8F, 0F, -8F, 16, 1, 16); tank2.addBox(0F, 0F, 0F, 7, 10, 7);
A.setRotationPoint(0F, 23F, 0F); tank2.setRotationPoint(1F, 10F, 1F);
A.setTextureSize(128, 128); tank2.setTextureSize(128, 64);
A.mirror = true; tank2.mirror = true;
setRotation(A, 0F, 0F, 0F); setRotation(tank2, 0F, 0F, 0F);
B = new ModelRenderer(this, 85, 0); tank1 = new ModelRenderer(this, 0, 20);
B.addBox(-2F, 0F, -2F, 4, 10, 4); tank1.addBox(0F, 0F, 0F, 8, 12, 16);
B.setRotationPoint(4F, 12F, -4F); tank1.setRotationPoint(-8F, 8F, -8F);
B.setTextureSize(128, 128); tank1.setTextureSize(128, 64);
B.mirror = true; tank1.mirror = true;
setRotation(B, 0F, 1.570796F, 0F); setRotation(tank1, 0F, 0F, 0F);
C = new ModelRenderer(this, 66, 0); tank3 = new ModelRenderer(this, 64, 0);
C.addBox(-2F, 0F, -2F, 4, 10, 4); tank3.addBox(0F, 0F, 0F, 7, 10, 7);
C.setRotationPoint(-4F, 12F, -4F); tank3.setRotationPoint(1F, 10F, -8F);
C.setTextureSize(128, 128); tank3.setTextureSize(128, 64);
C.mirror = true; tank3.mirror = true;
setRotation(C, 0F, 1.570796F, 0F); setRotation(tank3, 0F, 0F, 0F);
D = new ModelRenderer(this, 48, 19); tube6 = new ModelRenderer(this, 0, 0);
D.addBox(-1F, -1F, 0F, 2, 2, 6); tube6.addBox(0F, 0F, 0F, 1, 1, 1);
D.setRotationPoint(-2F, 18F, -4F); tube6.setRotationPoint(4F, 9F, 4F);
D.setTextureSize(128, 128); tube6.setTextureSize(128, 64);
D.mirror = true; tube6.mirror = true;
setRotation(D, 0F, 1.570796F, 0F); setRotation(tube6, 0F, 0F, 0F);
E = new ModelRenderer(this, 0, 19); tube5 = new ModelRenderer(this, 0, 0);
E.addBox(0F, 0F, -6F, 4, 15, 14); tube5.addBox(0F, 0F, 0F, 1, 1, 1);
E.setRotationPoint(0F, 8F, 8F); tube5.setRotationPoint(4F, 9F, -5F);
E.setTextureSize(128, 128); tube5.setTextureSize(128, 64);
E.mirror = true; tube5.mirror = true;
setRotation(E, 0F, 1.570796F, 0F); setRotation(tube5, 0F, 0F, 0F);
F = new ModelRenderer(this, 103, 0); tube4 = new ModelRenderer(this, 0, 48);
F.addBox(-3F, -1F, -1F, 6, 2, 2); tube4.addBox(0F, 0F, 0F, 1, 1, 10);
F.setRotationPoint(4F, 20F, 1F); tube4.setRotationPoint(4F, 8F, -5F);
F.setTextureSize(128, 128); tube4.setTextureSize(128, 64);
F.mirror = true; tube4.mirror = true;
setRotation(F, 0F, 1.570796F, 0F); setRotation(tube4, 0F, 0F, 0F);
G = new ModelRenderer(this, 103, 0); tube3 = new ModelRenderer(this, 0, 0);
G.addBox(-3F, 0F, 0F, 6, 2, 2); tube3.addBox(0F, 0F, 0F, 1, 3, 1);
G.setRotationPoint(-5F, 20F, 1F); tube3.setRotationPoint(4F, 9F, -0.5F);
G.setTextureSize(128, 128); tube3.setTextureSize(128, 64);
G.mirror = true; tube3.mirror = true;
setRotation(G, 0F, 1.570796F, 0F); setRotation(tube3, 0F, 0F, 0F);
H = new ModelRenderer(this, 0, 50); tube2 = new ModelRenderer(this, 0, 0);
H.addBox(-2F, 0F, 0F, 4, 12, 2); tube2.addBox(-4F, -1F, 0F, 4, 1, 1);
H.setRotationPoint(-8F, 11F, 6F); tube2.setRotationPoint(5F, 12F, -0.5F);
H.setTextureSize(128, 128); tube2.setTextureSize(128, 64);
H.mirror = true; tube2.mirror = true;
setRotation(H, 0F, 1.570796F, 0F); setRotation(tube2, 0F, 0F, -0.5235988F);
I = new ModelRenderer(this, 41, 28); tube1 = new ModelRenderer(this, 0, 0);
I.addBox(0F, 0F, 0F, 6, 1, 6); tube1.addBox(-3F, -1F, 0F, 3, 1, 1);
I.setRotationPoint(-7F, 22F, -7F); tube1.setRotationPoint(1.5F, 14F, -0.5F);
I.setTextureSize(128, 128); tube1.setTextureSize(128, 64);
I.mirror = true; tube1.mirror = true;
setRotation(I, 0F, 0F, 0F); setRotation(tube1, 0F, 0F, 0F);
J = new ModelRenderer(this, 41, 28); base = new ModelRenderer(this, 0, 0);
J.addBox(0F, 0F, 0F, 6, 1, 6); base.addBox(0F, 0F, 0F, 16, 4, 16);
J.setRotationPoint(1F, 22F, -7F); base.setRotationPoint(-8F, 20F, -8F);
J.setTextureSize(128, 128); base.setTextureSize(128, 64);
J.mirror = true; base.mirror = true;
setRotation(J, 0F, 0F, 0F); setRotation(base, 0F, 0F, 0F);
K = new ModelRenderer(this, 66, 16); portToggle1 = new ModelRenderer(this, 48, 20);
K.addBox(0F, 0F, 0F, 2, 1, 2); portToggle1.addBox(0F, 0F, 0F, 1, 8, 8);
K.setRotationPoint(-5F, 11F, -5F); portToggle1.setRotationPoint(-8.01F, 12F, -4F);
K.setTextureSize(128, 128); portToggle1.setTextureSize(128, 64);
K.mirror = true; portToggle1.mirror = true;
setRotation(K, 0F, 0F, 0F); setRotation(portToggle1, 0F, 0F, 0F);
L = new ModelRenderer(this, 85, 15); portToggle2a = new ModelRenderer(this, 48, 20);
L.addBox(0F, 0F, 0F, 2, 2, 2); portToggle2a.addBox(0F, 0F, 0F, 1, 8, 8);
L.setRotationPoint(3F, 10F, -5F); portToggle2a.setRotationPoint(7.01F, 12F, -4F);
L.setTextureSize(128, 128); portToggle2a.setTextureSize(128, 64);
L.mirror = true; portToggle2a.mirror = true;
setRotation(L, 0F, 0F, 0F); setRotation(portToggle2a, 0F, 0F, 0F);
M = new ModelRenderer(this, 66, 22); portToggle2b = new ModelRenderer(this, 0, 4);
M.addBox(-1F, 0F, -1F, 2, 2, 6); portToggle2b.addBox(0F, 0F, 0F, 2, 7, 2);
M.setRotationPoint(-4F, 9F, -4F); portToggle2b.setRotationPoint(5F, 13F, -1F);
M.setTextureSize(128, 128); portToggle2b.setTextureSize(128, 64);
M.mirror = true; portToggle2b.mirror = true;
setRotation(M, 0F, 1.570796F, 0F); setRotation(portToggle2b, 0F, 0F, 0F);
N = new ModelRenderer(this, 66, 32); portToggle3a = new ModelRenderer(this, 66, 20);
N.addBox(-1F, -1F, -1F, 2, 6, 2); portToggle3a.addBox(0F, 0F, 0F, 8, 8, 1);
N.setRotationPoint(0F, 12F, -4F); portToggle3a.setRotationPoint(-4F, 12F, -8.01F);
N.setTextureSize(128, 128); portToggle3a.setTextureSize(128, 64);
N.mirror = true; portToggle3a.mirror = true;
setRotation(N, 0F, 0F, 0F); setRotation(portToggle3a, 0F, 0F, 0F);
OUTPUT = new ModelRenderer(this, 66, 42); portToggle3b = new ModelRenderer(this, 0, 4);
OUTPUT.addBox(-1F, -1F, -1F, 4, 2, 2); portToggle3b.addBox(0F, 0F, 0F, 1, 7, 2);
OUTPUT.setRotationPoint(0F, 16F, -5F); portToggle3b.setRotationPoint(0F, 13F, -7F);
OUTPUT.setTextureSize(128, 128); portToggle3b.setTextureSize(128, 64);
OUTPUT.mirror = true; portToggle3b.mirror = true;
setRotation(OUTPUT, 0F, 1.570796F, 0F); setRotation(portToggle3b, 0F, 0F, 0F);
P = new ModelRenderer(this, 85, 21); portToggle4a = new ModelRenderer(this, 66, 20);
P.addBox(-1F, -1F, -1F, 2, 3, 2); portToggle4a.addBox(0F, 0F, 0F, 8, 8, 1);
P.setRotationPoint(5F, 9F, -4F); portToggle4a.setRotationPoint(-4F, 12F, 7.01F);
P.setTextureSize(128, 128); portToggle4a.setTextureSize(128, 64);
P.mirror = true; portToggle4a.mirror = true;
setRotation(P, 0F, 0F, 0.6457718F); setRotation(portToggle4a, 0F, 0F, 0F);
Q = new ModelRenderer(this, 0, 65); portToggle4b = new ModelRenderer(this, 0, 4);
Q.addBox(0F, 0F, -2F, 3, 11, 6); portToggle4b.addBox(0F, 0F, 0F, 1, 7, 2);
Q.setRotationPoint(-8F, 12F, 0F); portToggle4b.setRotationPoint(0F, 13F, 5F);
Q.setTextureSize(128, 128); portToggle4b.setTextureSize(128, 64);
Q.mirror = true; portToggle4b.mirror = true;
setRotation(Q, 0F, 0F, 0F); setRotation(portToggle4b, 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);
} }
public void render(float size) public void render(float size)
{ {
A.render(size); tank2.render(size);
B.render(size); tank1.render(size);
C.render(size); tank3.render(size);
D.render(size); tube6.render(size);
E.render(size); tube5.render(size);
F.render(size); tube4.render(size);
G.render(size); tube3.render(size);
H.render(size); tube2.render(size);
I.render(size); tube1.render(size);
J.render(size); base.render(size);
K.render(size); portToggle1.render(size);
L.render(size); portToggle2a.render(size);
M.render(size); portToggle2b.render(size);
N.render(size); portToggle3a.render(size);
OUTPUT.render(size); portToggle3b.render(size);
P.render(size); portToggle4a.render(size);
Q.render(size); portToggle4b.render(size);
R.render(size);
S.render(size);
T.render(size);
U.render(size);
V.render(size);
} }
private void setRotation(ModelRenderer model, float x, float y, float z) private void setRotation(ModelRenderer model, float x, float y, float z)

3
src/main/java/mekanism/client/model/ModelMetallurgicInfuser.java
View file

@ -56,12 +56,11 @@ public class ModelMetallurgicInfuser extends ModelBase
connector2.mirror = true; connector2.mirror = true;
setRotation(connector2, 0F, 0F, 0F); setRotation(connector2, 0F, 0F, 0F);
sideRight = new ModelRenderer(this, 64, 0); sideRight = new ModelRenderer(this, 64, 0);
sideRight.mirror = true;
sideRight.addBox(0F, 0F, 0F, 1, 11, 7); sideRight.addBox(0F, 0F, 0F, 1, 11, 7);
sideRight.setRotationPoint(7F, 9F, 0F); sideRight.setRotationPoint(7F, 9F, 0F);
sideRight.setTextureSize(128, 64); sideRight.setTextureSize(128, 64);
sideRight.mirror = true;
setRotation(sideRight, 0F, 0F, 0F); setRotation(sideRight, 0F, 0F, 0F);
sideRight.mirror = false;
top = new ModelRenderer(this, 80, 0); top = new ModelRenderer(this, 80, 0);
top.addBox(0F, 0F, 0F, 16, 1, 7); top.addBox(0F, 0F, 0F, 16, 1, 7);
top.setRotationPoint(-8F, 8F, 0F); top.setRotationPoint(-8F, 8F, 0F);

7
src/main/java/mekanism/client/render/block/MachineRenderingHandler.java
View file

@ -122,16 +122,14 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
else if(type == MachineType.CHEMICAL_OXIDIZER) else if(type == MachineType.CHEMICAL_OXIDIZER)
{ {
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); 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.06F, 0.05F); GL11.glTranslatef(0.0F, -1.00F, 0.05F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png")); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalOxidizer.png"));
chemicalOxidizer.render(0.0625F); chemicalOxidizer.render(0.0625F);
chemicalOxidizer.renderGlass(0.0625F);
} }
else if(type == MachineType.CHEMICAL_INFUSER) else if(type == MachineType.CHEMICAL_INFUSER)
{ {
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); 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.glTranslatef(0.0F, -1.06F, 0.05F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png")); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ChemicalInfuser.png"));
chemicalInfuser.render(0.0625F); chemicalInfuser.render(0.0625F);
@ -140,6 +138,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler
else if(type == MachineType.ELECTROLYTIC_SEPARATOR) else if(type == MachineType.ELECTROLYTIC_SEPARATOR)
{ {
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); 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); GL11.glTranslated(0.0F, -1.0F, 0.0F);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png"));
electrolyticSeparator.render(0.0625F); electrolyticSeparator.render(0.0625F);

4
src/main/java/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -293,12 +293,14 @@ public class ItemRenderingHandler implements IItemRenderer
else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank)
{ {
GL11.glPushMatrix(); GL11.glPushMatrix();
BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item); BaseTier tier = ((ItemBlockGasTank)item.getItem()).getBaseTier(item);
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank" + tier.getName() + ".png")); 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, 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); GL11.glTranslatef(0.0F, -1.0F, 0.0F);
gasTank.render(0.0625F); gasTank.render(0.0625F);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT)

23
src/main/java/mekanism/client/render/tileentity/RenderChemicalOxidizer.java
View file

@ -35,21 +35,6 @@ public class RenderChemicalOxidizer extends TileEntitySpecialRenderer
private void renderAModelAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick) private void renderAModelAt(TileEntityChemicalOxidizer tileEntity, double x, double y, double z, float partialTick)
{ {
render(false, x, y, z, tileEntity); 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); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
if(!glass) model.render(0.0625F);
{
model.render(0.0625F);
}
else {
model.renderGlass(0.0625F);
}
GL11.glPopMatrix(); GL11.glPopMatrix();
} }

8
src/main/java/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java
View file

@ -31,10 +31,10 @@ public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer
switch(tileEntity.facing) switch(tileEntity.facing)
{ {
case 2: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break;
case 3: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break;
case 4: 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(0, 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); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);

8
src/main/java/mekanism/client/render/tileentity/RenderGasTank.java
View file

@ -32,10 +32,10 @@ public class RenderGasTank extends TileEntitySpecialRenderer
switch(tileEntity.facing) switch(tileEntity.facing)
{ {
case 2: GL11.glRotatef(270, 0.0F, 1.0F, 0.0F); break; case 2: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break;
case 3: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break; case 3: GL11.glRotatef(180, 0.0F, 1.0F, 0.0F); break;
case 4: GL11.glRotatef(0, 0.0F, 1.0F, 0.0F); break; case 4: GL11.glRotatef(90, 0.0F, 1.0F, 0.0F); break;
case 5: GL11.glRotatef(180, 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); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);

68
src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
View file

@ -76,9 +76,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
/** Type type of gas this block is dumping. */ /** Type type of gas this block is dumping. */
public GasMode dumpRight = GasMode.IDLE; public GasMode dumpRight = GasMode.IDLE;
public boolean clientDumpLeft = false;
public boolean clientDumpRight = false;
public double BASE_ENERGY_USAGE; public double BASE_ENERGY_USAGE;
public double energyPerTick; public double energyPerTick;
@ -210,9 +207,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
} }
int dumpAmount = 8*(int)Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED)); int dumpAmount = 8*(int)Math.pow(2, upgradeComponent.getUpgrades(Upgrade.SPEED));
boolean dumpedLeft = false;
boolean dumpedRight = false;
if(leftTank.getGas() != null) if(leftTank.getGas() != null)
{ {
@ -233,15 +227,11 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
else if(dumpLeft == GasMode.DUMPING) else if(dumpLeft == GasMode.DUMPING)
{ {
leftTank.draw(dumpAmount, true); leftTank.draw(dumpAmount, true);
dumpedLeft = true;
} }
if(dumpLeft == GasMode.DUMPING_EXCESS && leftTank.getNeeded() < output) if(dumpLeft == GasMode.DUMPING_EXCESS && leftTank.getNeeded() < output)
{ {
leftTank.draw(output-leftTank.getNeeded(), true); leftTank.draw(output-leftTank.getNeeded(), true);
dumpedLeft = true;
} }
} }
@ -264,39 +254,16 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
else if(dumpRight == GasMode.DUMPING) else if(dumpRight == GasMode.DUMPING)
{ {
rightTank.draw(dumpAmount, true); rightTank.draw(dumpAmount, true);
dumpedRight = true;
} }
if(dumpRight == GasMode.DUMPING_EXCESS && rightTank.getNeeded() < output) if(dumpRight == GasMode.DUMPING_EXCESS && rightTank.getNeeded() < output)
{ {
rightTank.draw(output-rightTank.getNeeded(), true); 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(); prevEnergy = getEnergy();
} }
else {
if(clientDumpLeft)
{
spawnParticle(0);
}
if(clientDumpRight)
{
spawnParticle(1);
}
}
} }
public int getUpgradedUsage(SeparatorRecipe recipe) 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); && 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 @Override
public boolean canExtractItem(int slotID, ItemStack itemstack, int side) public boolean canExtractItem(int slotID, ItemStack itemstack, int side)
{ {
@ -493,8 +429,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
controlType = RedstoneControl.values()[dataStream.readInt()]; controlType = RedstoneControl.values()[dataStream.readInt()];
dumpLeft = GasMode.values()[dataStream.readInt()]; dumpLeft = GasMode.values()[dataStream.readInt()];
dumpRight = GasMode.values()[dataStream.readInt()]; dumpRight = GasMode.values()[dataStream.readInt()];
clientDumpLeft = dataStream.readBoolean();
clientDumpRight = dataStream.readBoolean();
clientActive = dataStream.readBoolean(); clientActive = dataStream.readBoolean();
clientEnergyUsed = dataStream.readDouble(); clientEnergyUsed = dataStream.readDouble();
@ -544,8 +478,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
data.add(controlType.ordinal()); data.add(controlType.ordinal());
data.add(dumpLeft.ordinal()); data.add(dumpLeft.ordinal());
data.add(dumpRight.ordinal()); data.add(dumpRight.ordinal());
data.add(clientDumpLeft);
data.add(clientDumpRight);
data.add(isActive); data.add(isActive);
data.add(clientEnergyUsed); data.add(clientEnergyUsed);

3
src/main/java/mekanism/generators/client/model/ModelBioGenerator.java
View file

@ -25,12 +25,11 @@ public class ModelBioGenerator extends ModelBase
base.mirror = true; base.mirror = true;
setRotation(base, 0F, 0F, 0F); setRotation(base, 0F, 0F, 0F);
sideRight = new ModelRenderer(this, 0, 40); sideRight = new ModelRenderer(this, 0, 40);
sideRight.mirror = true;
sideRight.addBox(0F, 0F, 0F, 3, 9, 8); sideRight.addBox(0F, 0F, 0F, 3, 9, 8);
sideRight.setRotationPoint(5F, 8F, -8F); sideRight.setRotationPoint(5F, 8F, -8F);
sideRight.setTextureSize(64, 64); sideRight.setTextureSize(64, 64);
sideRight.mirror = true;
setRotation(sideRight, 0F, 0F, 0F); setRotation(sideRight, 0F, 0F, 0F);
sideRight.mirror = false;
back = new ModelRenderer(this, 0, 23); back = new ModelRenderer(this, 0, 23);
back.addBox(0F, 0F, 0F, 16, 9, 8); back.addBox(0F, 0F, 0F, 16, 9, 8);
back.setRotationPoint(-8F, 8F, 0F); back.setRotationPoint(-8F, 8F, 0F);

BIN
src/main/resources/assets/mekanism/render/ChemicalOxidizer.png Normal file → Executable file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
src/main/resources/assets/mekanism/render/ElectrolyticSeparator.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/resources/assets/mekanism/render/GasTankAdvanced.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
src/main/resources/assets/mekanism/render/GasTankBasic.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
src/main/resources/assets/mekanism/render/GasTankElite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
src/main/resources/assets/mekanism/render/GasTankUltimate.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB