From 98967e51e9c07edb3f7c695a965edee7ec496dc5 Mon Sep 17 00:00:00 2001 From: CrossVas Date: Sat, 27 Nov 2021 23:56:19 +0900 Subject: [PATCH] Squash of pull request #151 Closes #149 and #150. * Fix recipes not getting removed * Fix LithiumPack not being registered properly Co-authored-by: CrossVas --- .../loaders/postload/GT_CraftingRecipeLoader.java | 12 ++++++------ .../gregtechmod/loaders/preload/GT_ItemLoader.java | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/gregtechmod/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtechmod/loaders/postload/GT_CraftingRecipeLoader.java index ad51b95..af0af26 100644 --- a/src/main/java/gregtechmod/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtechmod/loaders/postload/GT_CraftingRecipeLoader.java @@ -464,12 +464,12 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe(new ItemStack(GregTech_API.sBlockList[1], 1,113), new Object[] {"PCP", "GSG", "PMP", 'M', GT_OreDictNames.craftingRawMachineTier02, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'G', OrePrefixes.gearGt.get(Materials.Steel), 'P', GT_OreDictNames.craftingPlateSteel, 'S', GT_OreDictNames.craftingDiamondBlade}); - GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("canner", 1)); - GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("macerator", 1)); - GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("extractor", 1)); - GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("compressor", 1)); - GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("recycler", 1)); - GT_ModHandler.removeRecipe(GT_ModHandler.getIC2Item("electroFurnace", 1)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("canner", 1)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("macerator", 1)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("extractor", 1)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("compressor", 1)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("recycler", 1)); + GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("electroFurnace", 1)); GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("canner", 1), new Object[] {"PCP", "PMP", "PPP", 'M', tNeedsSteel?GT_OreDictNames.craftingRawMachineTier02:GT_OreDictNames.craftingRawMachineTier01, 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plate.get(Materials.Tin)}); diff --git a/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java b/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java index f4912be..d3a288f 100644 --- a/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java +++ b/src/main/java/gregtechmod/loaders/preload/GT_ItemLoader.java @@ -451,6 +451,8 @@ public class GT_ItemLoader implements Runnable { GameRegistry.registerItem(GregTech_API.sItemList[ 48], "aluminium_scoop"); GameRegistry.registerItem(GregTech_API.sItemList[ 55], "debug_scanner"); + + GameRegistry.registerItem(GregTech_API.sItemList[58], "lithiumpack"); GameRegistry.registerItem(GregTech_API.sItemList[ 60], "nak_coolantcell_60"); GameRegistry.registerItem(GregTech_API.sItemList[ 61], "nak_coolantcell_180");