From b2cd76d74d56658293c00cfa25a39fae1c22364f Mon Sep 17 00:00:00 2001 From: Connor Colenso Date: Mon, 9 Dec 2024 02:22:40 +0000 Subject: [PATCH] Remove removed stuff --- .../com/dreammaster/detrav/ScannerTools.java | 1 - .../gthandler/GT_CraftingRecipeLoader.java | 14 +--- .../dreammaster/recipes/RecipeRemover.java | 17 +---- .../dreammaster/scripts/ScriptGregtech.java | 55 ---------------- .../scripts/ScriptIndustrialCraft.java | 66 +------------------ 5 files changed, 3 insertions(+), 150 deletions(-) diff --git a/src/main/java/com/dreammaster/detrav/ScannerTools.java b/src/main/java/com/dreammaster/detrav/ScannerTools.java index d7f65f4ce..9b9fc2970 100644 --- a/src/main/java/com/dreammaster/detrav/ScannerTools.java +++ b/src/main/java/com/dreammaster/detrav/ScannerTools.java @@ -13,7 +13,6 @@ public class ScannerTools implements IOreRecipeRegistrator { public ScannerTools() { - OrePrefixes.toolHeadPickaxe.add(this); } public void registerOre(OrePrefixes o, Materials material, String s, String s2, ItemStack i) { diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java index ba2b2d9c8..99bbcfb3a 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java +++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java @@ -1053,11 +1053,6 @@ public void run() { GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { " h ", "SSS", "SSS", 'S', GTOreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1) }); - GTModHandler.addCraftingRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Steel, 1L), - GTProxy.tBits, - new Object[] { "PIh", "f ", 'P', OrePrefixes.plate.get(Materials.Steel), 'I', - OrePrefixes.ingot.get(Materials.Steel) }); GTModHandler.addShapelessCraftingRecipe( GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L), @@ -1116,14 +1111,7 @@ public void run() { GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E', GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'S', screw.get(Materials.Steel) }); - GTModHandler.addCraftingRecipe( - GTModHandler.getModItem(IndustrialCraft2.ID, "itemToolHoe", 1, GTValues.W), - bits, - new Object[] { "dPH", "PGB", "ECS", 'S', screw.get(Materials.Steel), 'H', - OrePrefixes.toolHeadHoe.get(Materials.Steel), 'G', OrePrefixes.gearGtSmall.get(Materials.Steel), - 'B', GTModHandler.getModItem(IndustrialCraft2.ID, "itemBatRE", 1, GTValues.W), 'E', - GTModHandler.getModItem(IndustrialCraft2.ID, "itemRecipePart", 1, 3), 'P', - OrePrefixes.plate.get(Materials.Steel) }); + if (OpenComputers.isModLoaded()) GTModHandler.addCraftingRecipe( GTModHandler.getModItem(OpenComputers.ID, "wrench", 1, 0), diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 8462213b2..77b7e169d 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -328,10 +328,7 @@ public static void run() { GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Sunnarium, 1L)); GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Sunnarium, 1L)); - GTModHandler - .removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Sunnarium, 1L)); - GTModHandler.removeFurnaceSmelting( - GTOreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, Materials.Sunnarium, 1L)); + GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.spring, Materials.Sunnarium, 1L)); GTModHandler.removeFurnaceSmelting(GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Sunnarium, 1L)); GTModHandler.removeFurnaceSmelting(getModItem(Backpack.ID, "boundLeather", 1, wildcard, missing)); @@ -1240,11 +1237,6 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(GraviSuite.ID, "graviTool", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(GraviSuite.ID, "ultimateLappack", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(GraviSuiteNEO.ID, "epicLappack", 1, wildcard, missing)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1L)); removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemRTGPellet", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemOreIridium", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(ThaumicBases.ID, "resource", 1, 0, missing)); @@ -1558,14 +1550,7 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "blockMiningPipe", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "blockGenerator", 1, 5, missing)); removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSense, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iridium, 1L)); removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, Materials.Iridium, 1L)); - removeRecipeByOutputDelayed(GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iridium, 1L)); removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemBatLamaCrystal", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemDust2", 1, 2, missing)); removeRecipeByOutputDelayed(getModItem(IndustrialCraft2.ID, "itemPartCFPowder", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java index 63267cd57..d246231de 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtech.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtech.java @@ -98,61 +98,6 @@ public void loadRecipes() { getModItem(SGCraft.ID, "ic2Capacitor", 1, 0, missing), getModItem(SGCraft.ID, "ocInterface", 1, 0, missing), getModItem(SGCraft.ID, "ic2Capacitor", 1, 0, missing)); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Diamond, 1L), - null, - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - null, - "craftingToolFile", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - "craftingToolHardHammer", - null, - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Diamond, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - "gemDiamond", - "gemDiamond", - "craftingToolFile", - null, - "craftingToolHardHammer", - null, - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Diamond, 1L), - "craftingToolFile", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - "craftingToolHardHammer", - null, - null, - null, - null, - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Diamond, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - "gemDiamond", - "craftingToolHardHammer", - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - null, - null, - "craftingToolFile", - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Diamond, 1L), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1L), - "gemDiamond", - "craftingToolHardHammer", - "craftingToolFile", - null, - null, - null, - null, - null); addShapedRecipe( GTOreDictUnificator.get(OrePrefixes.ring, Materials.Wood, 1L), "craftingToolKnife", diff --git a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java index 210c116ae..491539883 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java +++ b/src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java @@ -1018,33 +1018,7 @@ public void loadRecipes() { GTOreDictUnificator.get(OrePrefixes.ingotDouble, Materials.Iridium, 1L), null, null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadAxe, Materials.Iridium, 1L), - "plateIridium", - "ingotIridium", - "craftingToolHardHammer", - "plateIridium", - null, - null, - "craftingToolFile", - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadHoe, Materials.Iridium, 1L), - "plateIridium", - "ingotIridium", - "craftingToolHardHammer", - "craftingToolFile", - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadSense, Materials.Iridium, 1L), - "plateIridium", - "plateIridium", - "ingotIridium", - "craftingToolHardHammer", - "craftingToolFile", - null); + addShapedRecipe( createItemStack( GregTech.ID, @@ -1062,39 +1036,6 @@ public void loadRecipes() { "ingotIridium", "ingotIridium", null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadPickaxe, Materials.Iridium, 1L), - "plateIridium", - "ingotIridium", - "ingotIridium", - "craftingToolFile", - null, - "craftingToolHardHammer", - null, - null, - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadPlow, Materials.Iridium, 1L), - "plateIridium", - "plateIridium", - null, - "plateIridium", - "plateIridium", - null, - "craftingToolHardHammer", - "craftingToolFile", - null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadSword, Materials.Iridium, 1L), - null, - "plateIridium", - null, - "craftingToolFile", - "plateIridium", - "craftingToolHardHammer", - null, - null, - null); addShapedRecipe( GTOreDictUnificator.get(OrePrefixes.toolHeadSaw, Materials.Iridium, 1L), "plateIridium", @@ -1106,11 +1047,6 @@ public void loadRecipes() { null, null, null); - addShapedRecipe( - GTOreDictUnificator.get(OrePrefixes.toolHeadShovel, Materials.Iridium, 1L), - "craftingToolFile", - "plateIridium", - "craftingToolHardHammer"); addShapedRecipe( getModItem(IndustrialCraft2.ID, "itemWeedingTrowel", 1, 0, missing), "screwSteel",