diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-03 23:30:55 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-03 23:30:55 +1000 |
| commit | a06b75f0761681ebf57b142b30a5eb4d3ee0fe49 (patch) | |
| tree | 6d8a6140eb406348f1e3e5e2cfe63af8b5d93d2a /src/Java | |
| parent | 6493e0e0649efa1410b178daab61414f5529e5a6 (diff) | |
| download | GT5-Unofficial-a06b75f0761681ebf57b142b30a5eb4d3ee0fe49.tar.gz GT5-Unofficial-a06b75f0761681ebf57b142b30a5eb4d3ee0fe49.tar.bz2 GT5-Unofficial-a06b75f0761681ebf57b142b30a5eb4d3ee0fe49.zip | |
$ Small fixes to Yellorium ore component additions.
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index d2cff13461..cf4e5f780c 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -145,7 +145,7 @@ public final class ELEMENT { public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater); //Fictional - public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yellorium); + public final Material YELLORIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Yellorium, new short[] {255, 242, 10}); public final Material NAQUADAH = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadah); public final Material TRINIUM; public final Material TRINIUM_REFINED; diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index b286eeb45b..f8e777dd35 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -43,10 +43,15 @@ public class MaterialUtils { return null; } + public static Material generateMaterialFromGtENUM(final Materials material){ + return generateMaterialFromGtENUM(material, null); + } + + public static Material generateMaterialFromGtENUM(final Materials material, short[] customRGB){ @SuppressWarnings("deprecation") String name = material.name(); - final short[] rgba = material.mRGBa; + final short[] rgba = (customRGB == null ? material.mRGBa : customRGB); final int melting = material.mMeltingPoint; final int boiling = material.mBlastFurnaceTemp; final long protons = material.getProtons(); |