$ Tried to fix GT ItemList values being called too early when certain mods are loaded, causing them to not be loaded when GT++ is running PreInit().

$ Rewrote system that Autogenerates Recipes for Materials, migrating all recipes to be generated in PostInit() stage now.

1 files changed, 12 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 4066592f88..7f35c3b9b9 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -4,6 +4,7 @@ import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
 
 import java.util.LinkedList;
 import java.util.Queue;
+import java.util.Set;
 
 import net.minecraft.item.ItemStack;
 
@@ -16,9 +17,11 @@ import gtPlusPlus.core.handler.Recipes.LateRegistrationHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.recipe.*;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
+import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_Recycling;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.*;
 
 public class COMPAT_HANDLER {
@@ -167,6 +170,14 @@ public class COMPAT_HANDLER {
 	}
 
 	public static void startLoadingGregAPIBasedRecipes(){
-		RECIPES_GREGTECH.run();
+		//Add hand-made recipes
+		RECIPES_GREGTECH.run();		
+		//Add autogenerated Recipes from Item Components
+		for (Set<Runnable> m : MaterialGenerator.mRecipeMapsToGenerate) {
+			for (Runnable r : m) {
+				r.run();
+			}
+		}
+		RecipeGen_Recycling.executeGenerators();		
 	}
 }