+ Re-added the processing recipes for all of Pam's fish. Closes #307.

4 files changed, 26 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
new file mode 100644
index 0000000000..9e148f0102
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
@@ -0,0 +1,15 @@
+package gtPlusPlus.core.common.compat;
+
+import gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler;
+
+public class COMPAT_HarvestCraft {
+
+	public static void OreDict(){
+		run();
+	}
+
+	private static final void run(){
+		FishTrapHandler.pamsHarvestCraftCompat();
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index a274ccd378..822fca6a26 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -2,15 +2,10 @@ package gtPlusPlus.core.handler;
 
 import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
 
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
-
-import net.minecraft.item.ItemStack;
+import java.util.*;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_OreDictUnificator;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.common.compat.*;
@@ -25,6 +20,7 @@ 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.*;
+import net.minecraft.item.ItemStack;
 
 public class COMPAT_HANDLER {
 
@@ -157,6 +153,9 @@ public class COMPAT_HANDLER {
 		if (LoadedMods.IndustrialCraft2){
 			COMPAT_IC2.OreDict();
 		}
+		if (LoadedMods.PamsHarvestcraft){
+			COMPAT_HarvestCraft.OreDict();
+		}
 	}
 
 	public static void RemoveRecipesFromOtherMods(){
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java b/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
index 1ad7f2a298..d2f85e5daa 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.growthcraft;
 
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler;
 
 public class HANDLER_GC {
 
@@ -20,7 +19,7 @@ public class HANDLER_GC {
 
 	public static void postInit(){
 		if (LoadedMods.Growthcraft){
-			FishTrapHandler.pamsHarvestCraftCompat();
+			
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
index 2eb8377036..99d6b3d875 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/fishtrap/FishTrapHandler.java
@@ -3,16 +3,14 @@ package gtPlusPlus.xmod.growthcraft.fishtrap;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class FishTrapHandler {
 
@@ -96,7 +94,7 @@ public class FishTrapHandler {
 		}
 
 	}
-
+	//FishTrapHandler.pamsHarvestCraftCompat();
 	final static String prefix = "food";
 	final static String suffix = "raw";
 	final static String seaweed = "cropSeaweed";
@@ -109,20 +107,20 @@ public class FishTrapHandler {
 			final String itemName = prefix+harvestcraftFish[i]+suffix;
 			final int lootChance = getLootChance(harvestcraftFish[i]);
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null){
-				addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1), lootChance);
+				//addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1), lootChance);
 				addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1));
 				addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1));
 				addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1));
 			}
 		}
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null){
-			addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1), getLootChance(greenheartFish));
+			//addFish("fish", ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1), getLootChance(greenheartFish));
 			addGregtechMaceratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1));
 			addGregtechCentrifugeRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1));
 			addGregtechFluidRecipe(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1));
 		}
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(seaweed, 1) != null){
-			addFish("junk", ItemUtils.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed));
+			//addFish("junk", ItemUtils.getItemStackOfAmountFromOreDict(seaweed, 1), getLootChance(seaweed));
 		}
 	}