diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-27 22:55:17 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-05-27 22:55:17 +1000 |
| commit | 3915e405a70be4d9523ace59a9194a3757cb5a37 (patch) | |
| tree | 2a7b022f4a1c214a31165707426c376319279be6 | |
| parent | b5d8a36adf5b886f681574338586b04e30cf55d6 (diff) | |
| download | GT5-Unofficial-3915e405a70be4d9523ace59a9194a3757cb5a37.tar.gz GT5-Unofficial-3915e405a70be4d9523ace59a9194a3757cb5a37.tar.bz2 GT5-Unofficial-3915e405a70be4d9523ace59a9194a3757cb5a37.zip | |
% Tweaked Trinium again in GTNH.
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/material/ELEMENT.java | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 785b29ff61..8be003a410 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -515,8 +515,8 @@ public final class ModItems { //Generate Fictional Materials if (!CORE.GTNH) { MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false); + MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false); } - MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false); MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM); MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false); MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON); diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index 5bb82fc38e..8ae2bff37b 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -183,12 +183,16 @@ public final class ELEMENT { else { Logger.INFO("[Material] a1 Found "+a1.mName); TRINIUM = MaterialUtils.generateMaterialFromGtENUM(a1); - } + } + + TRINIUM_REFINED = TRINIUM; + } - 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 + 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(){ |