From 0fd60ac639521d74f0026505c8f2c8db13750ae5 Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Sun, 29 Mar 2020 04:35:20 +0100
Subject: + Added code to remove GT recipes for rocket_fuel and
 1,1dimethylhydrazine. % Made Formaldehyde Catalyst handled correctly in
 Chemical Plant.

---
 src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 18 +++++++++++++++++-
 .../gtPlusPlus/core/util/minecraft/MaterialUtils.java  |  9 +++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core/util/minecraft')

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index cd5b98557b..b2f048565f 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -27,6 +27,7 @@ import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
 import gtPlusPlus.core.item.base.plates.BaseItemPlate_OLD;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
+import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
 import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
 import gtPlusPlus.core.lib.CORE;
@@ -1245,7 +1246,9 @@ public class ItemUtils {
 	}
 	
 	public static boolean isCatalyst(ItemStack aStack) {
-
+		if (GT_Utility.areStacksEqual(aStack, RocketFuels.Formaldehyde_Catalyst_Stack, true)) {
+			return true;
+		}
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
 			return true;
 		}
@@ -1278,6 +1281,18 @@ public class ItemUtils {
 	}
 	
 
+	
+	public static boolean doesItemListEntryExist(String string) {		
+		ItemList[] aListValues = ItemList.class.getEnumConstants();		
+		for (ItemList aItem : aListValues) {
+			if (aItem != null) {
+				if (aItem.name().equals(string) || aItem.name().toLowerCase().equals(string.toLowerCase())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 
 	public static ItemList getValueOfItemList(String string, ItemList aOther) {		
 		ItemList[] aListValues = ItemList.class.getEnumConstants();		
@@ -1294,6 +1309,7 @@ public class ItemUtils {
 		}
 		return aOther;
 	}
+	
 	public static ItemStack getValueOfItemList(String string, int aAmount, ItemList aOther) {	
 		return getValueOfItemList(string, aOther).get(aAmount);
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 2108087542..64a6c9e820 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -501,5 +501,14 @@ public class MaterialUtils {
 		
 	}
 
+	public static boolean doesMaterialExist(String aMatName) {
+		for (Materials m : Materials.values()) {
+			if (m.name().toLowerCase().equals(aMatName.toLowerCase())) {
+				return true;
+			}
+		}
+		return false;		
+	}
+
 
 }
\ No newline at end of file
-- 
cgit