From 74fe40b728aa223c7f6f43560dee5aab9ab06de2 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sat, 27 Jan 2024 19:39:40 -0600 Subject: [PATCH 1/7] Removing recipe removals --- .../gthandler/GT_Recipe_Remover.java | 41 ------ .../dreammaster/recipes/RecipeRemover.java | 120 ------------------ .../scripts/ScriptAppliedEnergistics2.java | 33 ++--- 3 files changed, 11 insertions(+), 183 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java index 6b385767e..4e569273f 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java @@ -39,47 +39,6 @@ public void run() { // Vanilla GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Blocks.iron_bars, 1, wildcard), true, false, true); - // AE - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, 2), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1, 3), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 36), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 536), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 556), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 56), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 76), - true, - false, - true); - GT_ModHandler.removeRecipeByOutputDelayed( - getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 576), - true, - false, - true); // ASP GT_ModHandler.removeRecipeByOutputDelayed( getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0), diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index f91ae29d1..1673f8284 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -355,126 +355,6 @@ public static void run() { GT_ModHandler.removeFurnaceSmelting(getModItem("TConstruct", "CraftedSoil", 1, 1, missing)); GT_ModHandler.removeFurnaceSmelting(getModItem("TConstruct", "CraftedSoil", 1, 6, missing)); GT_ModHandler.removeFurnaceSmelting(getModItem("TwilightForest", "item.ironwoodRaw", 1, wildcard, missing)); - - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockFluix", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartz", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzChiseled", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockController", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockEnergyCell", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockDenseEnergyCell", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockChest", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockDrive", 1, 0, missing)); - removeRecipeByOutputDelayed( - getModItem("appliedenergistics2", "tile.BlockQuartzGrowthAccelerator", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingUnit", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingUnit", 1, 1, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockMolecularAssembler", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCharger", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockInscriber", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuantumRing", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuantumLinkChamber", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSpatialPylon", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSpatialIOPort", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockInterface", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCellWorkbench", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockIOPort", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCondenser", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockEnergyAcceptor", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockVibrationChamber", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSecurity", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 140, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 16, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 7, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 12, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 9, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 44, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 43, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 41, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyCompass", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 180, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 380, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 360, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 480, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 340, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolWirelessTerminal", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzGlass", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzLamp", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockQuartzTorch", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockLightDetector", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockTinyTNT", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 28, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 52, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 25, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 52, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 27, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 53, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 26, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 29, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 31, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 30, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 42, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 300, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 120, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 260, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 320, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 240, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 460, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 180, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 80, missing)); - removeRecipeByOutputDelayed( - getModItem("appliedenergistics2", "item.ToolCertusQuartzCuttingKnife", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolCertusQuartzWrench", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolMassCannon", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolMemoryCard", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolChargedStaff", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolEntropyManipulator", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolColorApplicator", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolBiometricCard", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 600, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemCrystalSeed", 1, 1200, missing)); - removeRecipeByOutputDelayed( - getModItem("appliedenergistics2", "item.ToolNetherQuartzCuttingKnife", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolNetherQuartzWrench", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 1, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 2, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyStone", 1, 3, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyChest", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockSkyChest", 1, 1, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockWireless", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 1, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 2, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingStorage", 1, 3, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "tile.BlockCraftingMonitor", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 420, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 200, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 160, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 400, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 220, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 280, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 80, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiPart", 1, 100, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.1k", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.4k", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.16k", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemBasicStorageCell.64k", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 39, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 35, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 36, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 37, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 38, missing)); - removeRecipeByOutputDelayed( - getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.2Cubed", 1, 0, missing)); - removeRecipeByOutputDelayed( - getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.16Cubed", 1, 0, missing)); - removeRecipeByOutputDelayed( - getModItem("appliedenergistics2", "item.ItemSpatialStorageCell.128Cubed", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemViewCell", 1, 0, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 32, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 33, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1, 34, missing)); - removeRecipeByOutputDelayed(getModItem("appliedenergistics2", "item.ToolPortableCell", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("ae2stuff", "Encoder", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("ae2stuff", "Grower", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem("ae2stuff", "Inscriber", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index dfd3fd0f5..1202fb53c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -113,7 +113,6 @@ public void loadRecipes() { .itemOutputs(CoCraftingUnit16x).duration(5 * SECONDS).eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes); // Advanced Storage Housing - GT_ModHandler.removeRecipeByOutput(AE2_ADVANCED_HOUSING); GT_Values.RA.stdBuilder() .itemInputs( GLASS_PANE, @@ -135,21 +134,18 @@ public void loadRecipes() { // Advanced Storage Cells final ItemStack[] components = new ItemStack[] { - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 57), // 256k - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 58), // 1024k - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), // 4096k - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 60), // 16384k + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 57), // 256k // + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 58), // 1024k // + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), // 4096k // + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 60), // 16384k // }; final ItemStack[] cells = new ItemStack[] { - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.256k", 1), // 256k - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.1024k", 1), // 1024k - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.4096k", 1), // 4096k - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.16384k", 1), // 16384k + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.256k", 1), // 256k // + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.1024k", 1), // 1024k // + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.4096k", 1), // 4096k // + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.16384k", 1), // 16384k // }; - for (int i = 0; i < components.length; i++) { - GT_ModHandler.removeRecipeByOutput(cells[i]); - GT_ModHandler.removeRecipeByOutput(components[i]); - } + for (int i = 0; i < components.length; i++) { GT_ModHandler.addCraftingRecipe( cells[i], @@ -233,14 +229,12 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "tile.BlockAdvancedCraftingStorage", 1, 3), // 16384k }; for (int i = 0; i < storage.length; i++) { - GT_ModHandler.removeRecipeByOutput(storage[i]); GT_Values.RA.stdBuilder() .itemInputs(components[i], getModItem(AppliedEnergistics2.ID, "tile.BlockCraftingUnit", 1)) .itemOutputs(storage[i]).duration(20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(assemblerRecipes); } // ME Block Container - GT_ModHandler.removeRecipeByOutput(AE2_BLOCK_CONTAINER); GT_ModHandler.addCraftingRecipe( AE2_BLOCK_CONTAINER, new Object[] { " K ", "SMS", "dHw", 'K', @@ -505,8 +499,6 @@ public void loadRecipes() { .addTo(assemblerRecipes); // ME Quantum Storage - GT_ModHandler - .removeRecipeByOutput(getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Quantum", 1)); ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Quantum", 1), "---------", @@ -530,8 +522,6 @@ public void loadRecipes() { AE2_ADVANCED_HOUSING); // ME Digital Singularity - GT_ModHandler - .removeRecipeByOutput(getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1)); ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1), "----a----", @@ -558,7 +548,7 @@ public void loadRecipes() { // ME Singularity crafting storage GT_ModHandler - .removeRecipeByOutput(getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1)); + .removeRecipeByOutput(getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1)); // stays ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1), "abcfhfcba", @@ -592,7 +582,6 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1)); // ME Void Storage - GT_ModHandler.removeRecipeByOutput(getModItem(AppliedEnergistics2.ID, "item.ItemVoidStorageCell", 1)); addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemVoidStorageCell", 1), "craftingToolHardHammer", @@ -606,7 +595,7 @@ public void loadRecipes() { "craftingToolScrewdriver"); AvaritiaHelper.removeExtremeCraftingRecipe( - getModItem(AppliedEnergistics2.ID, "tile.BlockCreativeEnergyCell", 1, 0, missing)); + getModItem(AppliedEnergistics2.ID, "tile.BlockCreativeEnergyCell", 1, 0, missing)); // stays ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(AppliedEnergistics2.ID, "tile.BlockCreativeEnergyCell", 1, 0, missing), "aaaaaaaaa", From 2b77a7aa46326966773a8e782f6e8b07ddf15e06 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sat, 27 Jan 2024 20:05:19 -0600 Subject: [PATCH 2/7] Getting rid of one more --- .../java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index 1202fb53c..9b89dbbef 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -547,8 +547,6 @@ public void loadRecipes() { getModItem(EternalSingularity.ID, "eternal_singularity", 1)); // ME Singularity crafting storage - GT_ModHandler - .removeRecipeByOutput(getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1)); // stays ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1), "abcfhfcba", From ca1696f96c66bbfea6f3b08e6c6d77670a9c82d0 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sun, 28 Jan 2024 00:29:01 -0600 Subject: [PATCH 3/7] A little more love --- src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java index 4e569273f..a029ad597 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java @@ -2,7 +2,6 @@ import static com.dreammaster.scripts.IScriptLoader.wildcard; import static gregtech.api.enums.Mods.AdvancedSolarPanel; -import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Forestry; From 1072e998ad991eb036a1a71c996a3afa10ab1365 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sun, 28 Jan 2024 01:41:02 -0600 Subject: [PATCH 4/7] Fixing some silliness in a comment --- .../scripts/ScriptAppliedEnergistics2.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index 9b89dbbef..bab674536 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -134,16 +134,16 @@ public void loadRecipes() { // Advanced Storage Cells final ItemStack[] components = new ItemStack[] { - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 57), // 256k // - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 58), // 1024k // - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), // 4096k // - getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 60), // 16384k // + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 57), // 256k + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 58), // 1024k + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 59), // 4096k + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 60), // 16384k }; final ItemStack[] cells = new ItemStack[] { - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.256k", 1), // 256k // - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.1024k", 1), // 1024k // - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.4096k", 1), // 4096k // - getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.16384k", 1), // 16384k // + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.256k", 1), // 256k + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.1024k", 1), // 1024k + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.4096k", 1), // 4096k + getModItem(AppliedEnergistics2.ID, "item.ItemAdvancedStorageCell.16384k", 1), // 16384k }; for (int i = 0; i < components.length; i++) { From feac6da64707fdad894a794f2bb1648d2f5f3a53 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sun, 28 Jan 2024 21:44:32 -0600 Subject: [PATCH 5/7] Adding in some more comments and adding sticky card because I forgot it --- .../scripts/ScriptAppliedEnergistics2.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index bab674536..fdb8c3c0a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -1145,48 +1145,63 @@ public void loadRecipes() { "plateAluminium", "plateAluminium", "plateAluminium"); + // capacity card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 27, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 25, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 35, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 35, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 1, missing)); + // stick + addShapelessRecipe( + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 64, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 25, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 35, missing), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 35, missing), + "slimeball"); + // crafting card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 53, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 25, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 35, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 35, missing), "craftingWorkBench"); + // redstone card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 26, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 25, missing), "craftingRedstoneTorch", "craftingRedstoneTorch", getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing)); + // fuzzy card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 29, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing)); + // inverter card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 31, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), getModItem(IndustrialCraft2.ID, "upgradeModule", 1, 5, missing), getModItem(IndustrialCraft2.ID, "upgradeModule", 1, 5, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing)); + // acceleration card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 30, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 22, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing)); + // oredictionary card addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 55, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 28, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), ItemList.Automation_TypeFilter_IV.get(1L)); + // wireless booster addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 42, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 8, missing), @@ -1198,6 +1213,7 @@ public void loadRecipes() { null, null, null); + // Me Annihilation plane addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 300, missing), "craftingToolScrewdriver", @@ -1209,6 +1225,7 @@ public void loadRecipes() { "gemFluix", "gemFluix", "gemFluix"); + // cable anchor block addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 120, missing), "boltIron", @@ -1287,6 +1304,7 @@ public void loadRecipes() { null, null, "boltTitanium"); + // ME export bus addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 260, missing), "craftingToolScrewdriver", @@ -1298,6 +1316,7 @@ public void loadRecipes() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), ItemList.Electric_Piston_LV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); + // ME formation plane addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 320, missing), "craftingToolScrewdriver", @@ -1309,6 +1328,7 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing)); + // ME import bus addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 240, missing), "craftingToolScrewdriver", @@ -1320,6 +1340,7 @@ public void loadRecipes() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), ItemList.Electric_Piston_LV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); + // p2p tunnel - ME addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 460, missing), "craftingToolScrewdriver", @@ -1331,6 +1352,7 @@ public void loadRecipes() { getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing)); + // certuz quartz wrench addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolCertusQuartzWrench", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 1, missing), @@ -1353,6 +1375,7 @@ public void loadRecipes() { null, "gemQuartz", null); + // mass cannon addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolMassCannon", 1, 0, missing), "plateTitanium", @@ -1364,6 +1387,7 @@ public void loadRecipes() { "plateTitanium", null, null); + // memory card addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolMemoryCard", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 23, missing), @@ -1375,6 +1399,7 @@ public void loadRecipes() { null, null, null); + // charged staff addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolChargedStaff", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 1, missing), @@ -1386,6 +1411,7 @@ public void loadRecipes() { null, null, "stickThaumium"); + // entropy manipulator addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolEntropyManipulator", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 7, missing), @@ -1397,6 +1423,7 @@ public void loadRecipes() { null, null, "stickThaumium"); + // color applicator addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolColorApplicator", 1, 0, missing), "wireGt01Aluminium", @@ -1408,6 +1435,7 @@ public void loadRecipes() { null, "stickSteel", null); + // biometric card addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ToolBiometricCard", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 24, missing), @@ -1419,6 +1447,7 @@ public void loadRecipes() { null, null, null); + // ME wireless access point addShapedRecipe( getModItem(AppliedEnergistics2.ID, "tile.BlockWireless", 1, 0, missing), null, @@ -1430,6 +1459,7 @@ public void loadRecipes() { "craftingToolScrewdriver", getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 16, missing), "craftingToolWrench"); + // ME storage monitor addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 400, missing), "craftingToolScrewdriver", @@ -1441,6 +1471,7 @@ public void loadRecipes() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); + // ME storage bus addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 220, missing), "craftingToolScrewdriver", @@ -1452,6 +1483,7 @@ public void loadRecipes() { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L), ItemList.Electric_Piston_LV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherQuartz, 1L)); + // 1k storage cell addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemBasicStorageCell.1k", 1, 0, missing), "craftingToolHardHammer", @@ -1474,6 +1506,7 @@ public void loadRecipes() { "screwCertusQuartz", "plateAluminium", "craftingToolHardHammer"); + // 4k storage cell addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemBasicStorageCell.4k", 1, 0, missing), "craftingToolHardHammer", @@ -1496,6 +1529,7 @@ public void loadRecipes() { "screwCertusQuartz", "plateAluminium", "craftingToolHardHammer"); + // 16k storage cell addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemBasicStorageCell.16k", 1, 0, missing), "craftingToolHardHammer", @@ -1518,6 +1552,7 @@ public void loadRecipes() { "screwCertusQuartz", "plateAluminium", "craftingToolHardHammer"); + // 64k storage cell addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemBasicStorageCell.64k", 1, 0, missing), "craftingToolHardHammer", @@ -1540,6 +1575,7 @@ public void loadRecipes() { "screwCertusQuartz", "plateAluminium", "craftingToolHardHammer"); + // viewing cell addShapedRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemViewCell", 1, 0, missing), "craftingToolScrewdriver", From be315c86b21c0345aa43a07900d9da9e1ce78404 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sun, 28 Jan 2024 21:47:10 -0600 Subject: [PATCH 6/7] Adding comments and sticky --- .../java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index fdb8c3c0a..e54a32a0c 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -1601,7 +1601,7 @@ public void loadRecipes() { addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemViewCell", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 39, missing), - "gemCertusQuartz"); + "gemCertusQuartz");git addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemBasicStorageCell.1k", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 39, missing), From d661889def301a8076272d708e87c742053272e5 Mon Sep 17 00:00:00 2001 From: rjnasers Date: Sun, 28 Jan 2024 21:48:28 -0600 Subject: [PATCH 7/7] Whoops --- .../java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index e54a32a0c..fdb8c3c0a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -1601,7 +1601,7 @@ public void loadRecipes() { addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemViewCell", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 39, missing), - "gemCertusQuartz");git + "gemCertusQuartz"); addShapelessRecipe( getModItem(AppliedEnergistics2.ID, "item.ItemBasicStorageCell.1k", 1, 0, missing), getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 39, missing),