Move fish trap recipe from gt++ to coremod (#1192)

GTNewHorizons · Feb 12, 2025 · 10ae3e7 · 10ae3e7
1 parent 9d3326d
commit 10ae3e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java
@@ -104,7 +104,6 @@
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
-import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 
 public class RecipeRemover {
@@ -1163,7 +1162,6 @@ public static void run() {
         removeRecipeByOutputDelayed(getModItem(Forestry.ID, "fences", 1, wildcard, missing));
         removeRecipeByOutputDelayed(getModItem(Forestry.ID, "cart.beehouse", 1, wildcard, missing));
         removeRecipeByOutputDelayed(new ItemStack(ModItems.itemPersonalCloakingDevice));
-        removeRecipeByOutputDelayed(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5));
         removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "IndustrialApiary", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "MutagenProducer", 1, 0, missing));
         removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "Mutatron", 1, 0, missing));

diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java
@@ -21,6 +21,7 @@
 import net.minecraftforge.fluids.FluidRegistry;
 
 import com.dreammaster.gthandler.CustomItemList;
+import com.dreammaster.item.NHItemList;
 
 import cpw.mods.fml.common.Optional;
 import forestry.api.recipes.RecipeManagers;
@@ -34,6 +35,7 @@
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.material.MaterialsAlloy;
 import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry;
@@ -94,6 +96,19 @@ public void loadRecipes() {
                 MaterialsAlloy.TUMBAGA.getPlate(1),
                 MaterialsAlloy.TUMBAGA.getRod(1));
 
+        // Fish Trap
+        addShapedRecipe(
+                new ItemStack(ModBlocks.blockFishTrap),
+                NHItemList.SteelBars.getIS(),
+                NHItemList.SteelBars.getIS(),
+                NHItemList.SteelBars.getIS(),
+                NHItemList.SteelBars.getIS(),
+                GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.WroughtIron, 1),
+                NHItemList.SteelBars.getIS(),
+                NHItemList.SteelBars.getIS(),
+                NHItemList.SteelBars.getIS(),
+                NHItemList.SteelBars.getIS());
+
         // Shirabon and Eternity
         GTValues.RA.stdBuilder()
                 .itemInputs(