From 918d763dabd82d47db739a1b0a51c01f0803adc0 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 5 Feb 2019 04:22:53 +0000
Subject: + Added Charge Packs, which can be worn in the Bauble belt slot. +
 Added more recipes for particle related content. + Added recipe for Hydrogen
 Plasma. + Added Plasma Tanks. + Added Alternative Fusion Reactor. + Added
 recipe for the Super Jukebox. % Updated Locale files. $ Hopefully made calls
 to possibly invalid ItemList values safer. $ Fixed Large Mixer not working
 with fluids correctly. $ Fixed ABS and Adv. EBF not allowing a muffler in the
 center of the top layer. $ Fixed Fusion bug, making all recipes take 4x
 longer than originally required. $ Fixed recipes using Redstone Alloy as a
 material in tiered recipes. (Makes ULV Energy Cores craftable again) $ Fixed
 Nano Healing Bauble. $ Fixed annoying low transfer rate of Railcraft. (This
 should be higher when playing with GT anyway, it's now 4x, disabled in ASM
 config). $ Fixed the fact that Portable tanks were still portable in GTNH.

---
 src/Java/gtPlusPlus/core/recipe/common/CI.java | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/recipe/common')

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[] {
-- 
cgit