diff options
| author | Richard Hendricks <richardhendricks@pobox.com> | 2018-06-05 18:25:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 18:25:54 -0500 |
| commit | 5c15ec845dd4c655a927cc02550ed964c8864655 (patch) | |
| tree | 5240e9762ea06e3ce5a4685f9ec26c7e151ff767 /src/main/java/gregtech/api | |
| parent | 1ba415a2c3ff0e939382da84eecce7242a6f403b (diff) | |
| parent | 4ddcc361027a994a93859302322a24c6a303d6cf (diff) | |
| download | GT5-Unofficial-5c15ec845dd4c655a927cc02550ed964c8864655.tar.gz GT5-Unofficial-5c15ec845dd4c655a927cc02550ed964c8864655.tar.bz2 GT5-Unofficial-5c15ec845dd4c655a927cc02550ed964c8864655.zip | |
Merge pull request #126 from GTNewHorizons/feature/machinemetal
Added option for disabling machinemetal tinting.
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 6 | ||||
| -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 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 150e1fb798..f5009aed66 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -199,6 +199,12 @@ public class GregTech_API { public static boolean mTranslocator = false;
public static boolean mTConstruct = false;
+ /**
+ * Option to not use MACHINE_METAL mixing into colors
+ */
+ public static boolean sUseMachineMetal = false;
+
+
public static boolean mUseOnlyGoodSolderingMaterials = false;
private static final String aTextIC2Lower = MOD_ID_IC2.toLowerCase(Locale.ENGLISH);
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 9bd00b2836..d0540181e5 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, Dyes.MACHINE_METAL.mRGBa));
+ 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));
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 9cdb74c2f1..db4a070072 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=Dyes.MACHINE_METAL; + else color=(GregTech_API.sUseMachineMetal) ? Dyes.MACHINE_METAL : Dyes.dyeWhite; // Maybe not use white here? GL11.glColor3ub((byte)color.mRGBa[0], (byte)color.mRGBa[1], (byte)color.mRGBa[2]); } else GL11.glColor3ub((byte)255,(byte)255,(byte)255); } |