From 548282e29dd4cc6fbf9071b509ef35cee5c99a7b Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
Date: Sun, 18 Feb 2018 23:00:01 +1000
Subject: ^ Version Bump to PreRelease5. % Updated CommandUtils.java. % Made
 AnimalFarm abstract, as it's currently an empty class. $ Fixed Recycling
 recipes not generating properly for all material components. They now get
 queued and run at the end of postInit().

---
 .../multi/GregtechMetaTileEntityAnimalFarm.java       |  2 +-
 .../xmod/gregtech/loaders/RecipeGen_Recycling.java    | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityAnimalFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityAnimalFarm.java
index f2f752a0eb..7b7e4414b3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityAnimalFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityAnimalFarm.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import net.minecraft.item.ItemStack;
 
-public class GregtechMetaTileEntityAnimalFarm extends GT_MetaTileEntity_MultiBlockBase {
+public abstract class GregtechMetaTileEntityAnimalFarm extends GT_MetaTileEntity_MultiBlockBase {
 
 	public GregtechMetaTileEntityAnimalFarm(String aName) {
 		super(aName);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 98fb6050d4..72c09eed0a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -14,6 +14,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.array.AutoMap;
 import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -22,6 +23,16 @@ import net.minecraftforge.oredict.OreDictionary;
 
 public class RecipeGen_Recycling implements Runnable {
 
+	public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<Runnable>();
+	
+	public static void executeGenerators() {
+		if (mQueuedRecyclingGenerators.size() > 0) {
+			for (Runnable R : mQueuedRecyclingGenerators.values()) {
+				R.run();
+			}
+		}
+	}
+	
 	final Material toGenerate;
 	public static Map<String, ItemStack> mNameMap;
 
@@ -30,14 +41,14 @@ public class RecipeGen_Recycling implements Runnable {
 		if (mNameMap == null){
 			mNameMap = this.getNameMap();			
 		}
-		if (mNameMap != null){
-			generateRecipes(this.toGenerate);		
-		}
+		mQueuedRecyclingGenerators.put(this);
 	}
 
 	@Override
 	public void run() {
-		
+		if (mNameMap != null){
+			generateRecipes(this.toGenerate);		
+		}
 	}
 
 	public static void generateRecipes(final Material material) {
-- 
cgit