From dbe1827984f9dd1e87d500882c541181bdaeb542 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 12 Mar 2019 05:08:33 +0000
Subject: + Added framework for additional Oil chemistry in future updates. +
 Added additional processes for obtaining Kerosene. % Mild rebalance to GT++
 Rocket Fuels. % Swapped Coal by-products (Coal Tar, Coal Tar Oil and Sulfuric
 Coal Tar Oil) from Gas Turbine fuel to Semifluid fuel. % Allowed ItemPackages
 to register themselves to the onLoadComplete() event. $ Fixed GT++ Rocket
 Fuels being unusable in Rocket Engines. $ Fixed Tooltip on GC Fuel loader
 when the GC-ASM is not active.

---
 .../gtPlusPlus/core/util/minecraft/MaterialUtils.java  | 18 ++++++++++++++++++
 .../gtPlusPlus/core/util/minecraft/RecipeUtils.java    |  9 +++++++++
 2 files changed, 27 insertions(+)

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

diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index 842b8eecb2..a7fc4507e8 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -348,12 +348,30 @@ public class MaterialUtils {
 		TextureSet o =  (r != null && r.isPresent() && r.get() != null) ? r.get() : null;
 		return o;*/
 	}
+	
+
+
+	public static Materials getMaterial(String aMaterialName, String aFallbackMaterialName) {
+		Materials g = getMaterial(aMaterialName);
+		if (g == null) {
+			g = getMaterial(aFallbackMaterialName);
+		}
+		if (g == null) {
+			Logger.INFO("Failed finding material '"+aMaterialName+"' & fallback '"+aFallbackMaterialName+"', returning _NULL.");
+			g = Materials._NULL;
+		}
+		return g;		
+	}
 
 	public static Materials getMaterial(String aMaterialName) {
 		Materials m = gtPlusPlus.xmod.gregtech.common.StaticFields59.getMaterial(aMaterialName);
 		if (m == null) {
 			m = getMaterialByName(aMaterialName);
 		}
+		if (m == null) {
+			Logger.INFO("Failed finding material '"+aMaterialName+"', returning _NULL.");
+			m = Materials._NULL;
+		}
 		return m;
 	}
 
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
index cc71b910c6..774c8b6f13 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java
@@ -8,6 +8,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
@@ -573,5 +574,13 @@ public static int mInvalidID = 1;
 	}
 
 
+	public static boolean removeGtRecipe(GT_Recipe aRecipeToRemove, GT_Recipe_Map aRecipeMap) {		
+		if (aRecipeMap.mRecipeList.contains(aRecipeToRemove)) {
+			return aRecipeMap.mRecipeList.remove(aRecipeToRemove);
+		}
+		return false;		
+	}
+
+
 
 }
-- 
cgit