Restore pams fish compat (#685)

* restore pams compat

* restore harvestcraft compat file

* cleanup

* ra2 and more cleanup

3 files changed, 74 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
new file mode 100644
index 0000000000..f3c83785c4
--- /dev/null
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.core.common.compat;
+
+import gtPlusPlus.xmod.pamsharvest.fishtrap.FishTrapHandler;
+
+public class COMPAT_HarvestCraft {
+
+    public static void OreDict() {
+        run();
+    }
+
+    private static final void run() {
+        FishTrapHandler.pamsHarvestCraftCompat();
+    }
+}
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 5f9cfb732e..0d8c9fc529 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.handler;
 import static gregtech.api.enums.Mods.EnderIO;
 import static gregtech.api.enums.Mods.ExtraUtilities;
 import static gregtech.api.enums.Mods.OpenBlocks;
+import static gregtech.api.enums.Mods.PamsHarvestCraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.Witchery;
 
@@ -21,6 +22,7 @@ import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.common.compat.COMPAT_EnderIO;
 import gtPlusPlus.core.common.compat.COMPAT_ExtraUtils;
+import gtPlusPlus.core.common.compat.COMPAT_HarvestCraft;
 import gtPlusPlus.core.common.compat.COMPAT_IC2;
 import gtPlusPlus.core.common.compat.COMPAT_OpenBlocks;
 import gtPlusPlus.core.common.compat.COMPAT_Thaumcraft;
@@ -226,6 +228,9 @@ public class COMPAT_HANDLER {
         if (ExtraUtilities.isModLoaded()) {
             COMPAT_ExtraUtils.OreDict();
         }
+        if (PamsHarvestCraft.isModLoaded()) {
+            COMPAT_HarvestCraft.OreDict();
+        }
         COMPAT_IC2.OreDict();
 
         if (Witchery.isModLoaded()) {
diff --git a/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java b/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java
new file mode 100644
index 0000000000..f183786f33
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/pamsharvest/fishtrap/FishTrapHandler.java
@@ -0,0 +1,55 @@
+package gtPlusPlus.xmod.pamsharvest.fishtrap;
+
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+
+import gregtech.api.enums.GT_Values;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+
+public class FishTrapHandler {
+
+    static final String prefix = "food";
+    static final String suffix = "raw";
+    static final String greenheartFish = "foodGreenheartfish";
+    private static final String[] harvestcraftFish = { "Anchovy", "Bass", "Calamari", "Carp", "Catfish", "Charr",
+            "Clam", "Crab", "Crayfish", "Eel", "Frog", "Grouper", "Herring", "Jellyfish", "Mudfish", "Octopus", "Perch",
+            "Scallop", "Shrimp", "Snail", "Snapper", "Tilapia", "Trout", "Tuna", "Turtle", "Walley" };
+
+    public static void pamsHarvestCraftCompat() {
+        for (String fish : harvestcraftFish) {
+            final String itemName = prefix + fish + suffix;
+            if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(itemName, 1) != null) {
+                GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1))
+                        .itemOutputs(
+                                ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1),
+                                ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1))
+                        .outputChances(10000, 1000).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2)
+                        .addTo(sMaceratorRecipes);
+                GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1))
+                        .noItemOutputs().noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("methane", 96))
+                        .duration(19 * SECONDS).eut(5).addTo(sCentrifugeRecipes);
+                GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(itemName, 1))
+                        .noItemOutputs().noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("fishoil", 50))
+                        .duration(16 * TICKS).eut(4).addTo(sFluidExtractionRecipes);
+            }
+        }
+        if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken(greenheartFish, 1) != null) {
+            GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1))
+                    .itemOutputs(
+                            ItemUtils.getItemStackOfAmountFromOreDict("dustMeatRaw", 1),
+                            ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBone", 1))
+                    .outputChances(10000, 1000).noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(2)
+                    .addTo(sMaceratorRecipes);
+            GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1))
+                    .noItemOutputs().noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("methane", 96))
+                    .duration(19 * SECONDS).eut(5).addTo(sCentrifugeRecipes);
+            GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict(greenheartFish, 1))
+                    .noItemOutputs().noFluidInputs().fluidOutputs(FluidUtils.getFluidStack("fishoil", 50))
+                    .duration(16 * TICKS).eut(4).addTo(sFluidExtractionRecipes);
+        }
+    }
+}