diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-27 22:30:15 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-27 22:30:15 +1000 |
| commit | b5d8a36adf5b886f681574338586b04e30cf55d6 (patch) | |
| tree | 2cdf1f6366b807e790eb9e4a9a06081006d3f7dc /src/Java/gtPlusPlus/core/material/ELEMENT.java | |
| parent | 64fd0818f6d9351166593f1d14152812c45aa80a (diff) | |
| download | GT5-Unofficial-b5d8a36adf5b886f681574338586b04e30cf55d6.tar.gz GT5-Unofficial-b5d8a36adf5b886f681574338586b04e30cf55d6.tar.bz2 GT5-Unofficial-b5d8a36adf5b886f681574338586b04e30cf55d6.zip | |
$ Tried to fix console spam for invalid tooltip handling.
$ Fixed NEI handler not showing % chances for recipes. (maybe?)
$ Fixed Trinium not working correctly in GTNH.
$ Fixed invalid cape lookups.
% Tweaked recipe for Max tier Redox cells.
% Tweaked name of Control Circuit.
Diffstat (limited to 'src/Java/gtPlusPlus/core/material/ELEMENT.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index f399e16cca..5bb82fc38e 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -152,14 +152,43 @@ public final class ELEMENT { public ELEMENT(){ //GTNH Trinium Handling - if (CORE.GTNH){ - TRINIUM = MaterialUtils.generateMaterialFromGtENUM(MaterialUtils.getMaterialByName("Trinium")); - TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material + if (CORE.GTNH){ + //yay + Materials a1 = MaterialUtils.getMaterialByName("Trinium"); + Materials a2 = Materials.valueOf("Trinium"); + Materials a3 = Materials.get("Trinium"); + Materials a4; + if (a1 == null) { + Logger.INFO("[Material] First attempt to find Trinium failed, using backup method."); + if (a2 == null) { + Logger.INFO("[Material] Fallback attempt to find Trinium failed, using second fallback."); + if (a3 == null) { + Logger.INFO("[Material] Fallback attempt to find Trinium failed, dumping materials."); + for (Materials m : Materials.values()) { + Logger.INFO("[Material] Found "+m.mName); + } + a4 = null; + } + else { + Logger.INFO("[Material] a3 Found "+a3.mName); + a4 = a3; + } + } + else { + Logger.INFO("[Material] a2 Found "+a2.mName); + a4 = a2; + } + TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a4); + } + else { + Logger.INFO("[Material] a1 Found "+a1.mName); + TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1); + } } else { TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{70, 110, 30}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material - TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material - } + } + TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material } public static ELEMENT getInstance(){ |