diff options
| author | â€huajijam <strhuaji@gmail.com> | 2019-02-05 12:26:34 +0800 |
|---|---|---|
| committer | â€huajijam <strhuaji@gmail.com> | 2019-02-05 12:26:34 +0800 |
| commit | 40d7e5da9f5b84213e2c3e4596fdc69b94bd523e (patch) | |
| tree | 900ad3e45065d8ab8229d0f01823054d3b99583f /src/Java/gtPlusPlus/core/recipe/common | |
| parent | 8e8a95f5a047a192a64d1e85fb297debac3decbc (diff) | |
| parent | 3187b70de7bd7bb6eee323dd0f7f9e191fd8e7cf (diff) | |
| download | GT5-Unofficial-40d7e5da9f5b84213e2c3e4596fdc69b94bd523e.tar.gz GT5-Unofficial-40d7e5da9f5b84213e2c3e4596fdc69b94bd523e.tar.bz2 GT5-Unofficial-40d7e5da9f5b84213e2c3e4596fdc69b94bd523e.zip | |
Automatic synchronization
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe/common')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index 13a30a510c..b473b30c3c 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -475,9 +475,10 @@ public class CI { public static void init() { //Set Explosives - try { - if (ItemList.valueOf("Block_Powderbarrel") != null){ - explosivePowderKeg = ItemList.valueOf("Block_Powderbarrel").get(1).copy(); + try { + ItemList PowerderBarrel = gtPlusPlus.core.util.Utils.getValueOfItemList("Block_Powderbarrel", null); + if (PowerderBarrel != null){ + explosivePowderKeg = PowerderBarrel.get(1).copy(); } } catch (java.lang.IllegalArgumentException Y) { explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder).copy(); @@ -530,7 +531,6 @@ public class CI { */ private static final Material[] aMaterial_Main = new Material[] { - MaterialEIO.REDSTONE_ALLOY, ALLOY.POTIN, ALLOY.ZIRCONIUM_CARBIDE, ALLOY.EGLIN_STEEL, @@ -541,11 +541,11 @@ public class CI { ALLOY.PIKYONIUM, ELEMENT.STANDALONE.ADVANCED_NITINOL, ALLOY.ABYSSAL, - ALLOY.QUANTUM + ALLOY.QUANTUM, + ELEMENT.STANDALONE.HYPOGEN }; private static final Material[] aMaterial_Secondary = new Material[] { - ELEMENT.getInstance().LEAD, ALLOY.TUMBAGA, ALLOY.SILICON_CARBIDE, ALLOY.TUNGSTEN_CARBIDE, @@ -556,11 +556,11 @@ public class CI { ALLOY.CINOBITE, ALLOY.TITANSTEEL, ALLOY.OCTIRON, - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN + ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, + ELEMENT.STANDALONE.HYPOGEN }; private static final Material[] aMaterial_Tertiary = new Material[] { - ELEMENT.getInstance().IRON, ALLOY.STEEL, ELEMENT.getInstance().ALUMINIUM, ALLOY.STAINLESSSTEEL, @@ -571,7 +571,8 @@ public class CI { ALLOY.TRINIUM_REINFORCED_STEEL, //Arceus ALLOY.TITANSTEEL, ELEMENT.STANDALONE.ASTRAL_TITANIUM, - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN + ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN, + ELEMENT.STANDALONE.HYPOGEN }; private static final Materials[] aMaterial_Cables = new Materials[] { |