diff options
| author | Dream-Master <dream-master@gmx.net> | 2020-03-17 22:21:40 +0100 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2020-03-17 22:21:40 +0100 |
| commit | 0f6b03f927b2c482100b2ba46964db72c96156a0 (patch) | |
| tree | 141bab113db4dbd76f6b3701d876f1c8e3f28b20 /src/main/java/gregtech/api/enums/Dyes.java | |
| parent | 28ed289c626555dda9f369780b28651a8c5f442e (diff) | |
| parent | 5959633bc9eea56859e4e569c2aa8b8a427e5ea2 (diff) | |
| download | GT5-Unofficial-0f6b03f927b2c482100b2ba46964db72c96156a0.tar.gz GT5-Unofficial-0f6b03f927b2c482100b2ba46964db72c96156a0.tar.bz2 GT5-Unofficial-0f6b03f927b2c482100b2ba46964db72c96156a0.zip | |
Merge branch 'Refactor' into Bees
Diffstat (limited to 'src/main/java/gregtech/api/enums/Dyes.java')
| -rw-r--r-- | src/main/java/gregtech/api/enums/Dyes.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index 656afc4890..c8aec75f9e 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -39,14 +39,14 @@ public enum Dyes implements IColorModulationContainer { CONSTRUCTION_FOAM(-1, 64, 64, 64, "Construction Foam"), MACHINE_METAL(-1, 210, 220, 255, "Machine Metal"); - public static final Dyes VALUES[] = {dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite}; + public static final Dyes[] VALUES = {dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite}; public final byte mIndex; public final String mName; public final short[] mRGBa; private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<Fluid>(false, 1); - private Dyes(int aIndex, int aR, int aG, int aB, String aName) { + Dyes(int aIndex, int aR, int aG, int aB, String aName) { mIndex = (byte) aIndex; mName = aName; mRGBa = new short[]{(short) aR, (short) aG, (short) aB, 0}; |