diff options
| author | Richard Hendricks <richardhendricks@pobox.com> | 2018-07-21 14:46:42 -0500 |
|---|---|---|
| committer | Richard Hendricks <richardhendricks@pobox.com> | 2018-07-21 19:35:57 -0500 |
| commit | b10ffbbffb71ab223e147a0fe195e5cee0306bd7 (patch) | |
| tree | 35e455d0923a3d13c24d31f15a4e5730515e8e87 /src/main/java/gregtech/api | |
| parent | 3f1dbea050ca43850a006c04cf928a3203ca216c (diff) | |
| download | GT5-Unofficial-b10ffbbffb71ab223e147a0fe195e5cee0306bd7.tar.gz GT5-Unofficial-b10ffbbffb71ab223e147a0fe195e5cee0306bd7.tar.bz2 GT5-Unofficial-b10ffbbffb71ab223e147a0fe195e5cee0306bd7.zip | |
Revert changes for machine metal support, using different method now via coremod to enable disable.
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Textures.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index d0540181e5..9bd00b2836 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -703,7 +703,7 @@ public class Textures { static {
for (byte i = 0; i < MACHINE_CASINGS.length; i++)
for (byte j = 0; j < MACHINE_CASINGS[i].length; j++)
- MACHINE_CASINGS[i][j] = new GT_SidedTexture(MACHINECASINGS_BOTTOM[i], MACHINECASINGS_TOP[i], MACHINECASINGS_SIDE[i], Dyes.getModulation(j - 1, (GregTech_API.sUseMachineMetal) ? Dyes.MACHINE_METAL.mRGBa : Dyes.dyeWhite.mRGBa));
+ MACHINE_CASINGS[i][j] = new GT_SidedTexture(MACHINECASINGS_BOTTOM[i], MACHINECASINGS_TOP[i], MACHINECASINGS_SIDE[i], Dyes.getModulation(j - 1, Dyes.MACHINE_METAL.mRGBa));
casingTexturePages[0]=CASING_BLOCKS;
if(casingTexturePages[8]==null)
casingTexturePages[8]=new ITexture[128];
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java index db4a070072..9cdb74c2f1 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java @@ -31,7 +31,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer { byte colorByte=mContainer.mTileEntity.getColorization(); Dyes color; if(colorByte != -1) color= Dyes.get(colorByte); - else color=(GregTech_API.sUseMachineMetal) ? Dyes.MACHINE_METAL : Dyes.dyeWhite; // Maybe not use white here? + else color=Dyes.MACHINE_METAL; GL11.glColor3ub((byte)color.mRGBa[0], (byte)color.mRGBa[1], (byte)color.mRGBa[2]); } else GL11.glColor3ub((byte)255,(byte)255,(byte)255); } |