From 2a95907d0801634dd2ce53f6aace82f5252f5534 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:10:24 +0100 Subject: [PATCH] GCcore recipe cleanup (#1136) --- .../gthandler/GT_Recipe_Remover.java | 647 ------------------ .../dreammaster/recipes/RecipeRemover.java | 3 - 2 files changed, 650 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 d94deb6e1a..5d7d1f3775 100644 --- a/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java +++ b/src/main/java/com/dreammaster/gthandler/GT_Recipe_Remover.java @@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.DraconicEvolution; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.MineAndBladeBattleGear2; @@ -24,10 +23,7 @@ import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTModHandler; -import gregtech.api.util.GTOreDictUnificator; public class GT_Recipe_Remover implements Runnable { @@ -493,582 +489,6 @@ public void run() { // Galacticraft - // --- Rocket Launch Pad - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.landingPad", 1L, 0), - true, - false, - true); - - // --- Buggy Fueling Pad - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.landingPad", 1L, 1), - true, - false, - true); - - // --- Oxygen Collector - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenCollector", 1L, 0), - true, - false, - true); - - // --- Oxygen Compressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenCompressor", 1L, 0), - true, - false, - true); - - // --- Oxygen Decompressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenCompressor", 1L, 4), - true, - false, - true); - - // --- Oxygen Storage Module - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine2", 1L, 8), - true, - false, - true); - - // --- Oxygen Bubble Distributor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.distributor", 1L, 0), - true, - false, - true); - - // --- Oxygen Sealer - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.sealer", 1L, 0), true, false, true); - - // --- Oxygen Detector - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenDetector", 1L, 0), - true, - false, - true); - - // --- Oxygen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.oxygenPipe", 1L, 0), - true, - false, - true); - - // --- Refinery - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.refinery", 1L, 0), - true, - false, - true); - - // --- Fuel Loader - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.fuelLoader", 1L, 0), - true, - false, - true); - - // --- Sealeable Oxygen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 1), - true, - false, - true); - - // --- Sealeable Copper Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 2), - true, - false, - true); - - // --- Sealeable Gold Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 3), - true, - false, - true); - - // --- Sealeable HV Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 4), - true, - false, - true); - - // --- Sealeable Glass Fibre Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 5), - true, - false, - true); - - // --- Sealeable Tin Cable - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 6), - true, - false, - true); - - // --- Fuel Loader - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.fuelLoader", 1L, 0), - true, - false, - true); - - // --- Cargo Loader - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.cargo", 1L, 0), true, false, true); - - // --- Cargo Unloader - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.cargo", 1L, 4), true, false, true); - - // --- Tin Decoration Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 3), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 4), - true, - false, - true); - - // --- Copper Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 9), - true, - false, - true); - - // --- Tin Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 10), - true, - false, - true); - - // --- Aluminum Block - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 11), - true, - false, - true); - - // --- Meteoric Iron Ingot - GTModHandler.removeRecipeByOutputDelayed( - GTOreDictUnificator.get(OrePrefixes.ingot, Materials.MeteoricIron, 1L), - true, - false, - true); - - // --- Solid Meteoric Iron - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.gcBlockCore", 1L, 12), - true, - false, - true); - - // --- Air Lock Frame - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.airLockFrame", 1L, 0), - true, - false, - true); - - // --- Air Lock Controller - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.airLockFrame", 1L, 1), - true, - false, - true); - - // --- Sealable Oxygen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 1), - true, - false, - true); - - // --- Sealable Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 14), - true, - false, - true); - - // --- Sealable ME Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 13), - true, - false, - true); - - // --- Sealable heavy Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 15), - true, - false, - true); - - // --- Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.aluminumWire", 1L, 0), - true, - false, - true); - - // --- Heavy Aluminium Wire - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.aluminumWire", 1L, 1), - true, - false, - true); - - // --- Basic Solar Panel - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.solar", 1L, 0), true, false, true); - - // --- Advanced Solar Panel - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.solar", 1L, 4), true, false, true); - - // --- Wafer Solar - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 12), - true, - false, - true); - - // --- Single Solar Modul - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 0), - true, - false, - true); - - // --- Full Solar Panel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 1), - true, - false, - true); - - // --- Coal Generator - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.machine", 1L, 0), true, false, true); - - // --- Compressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine", 1L, 12), - true, - false, - true); - - // --- Electric Compressor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine2", 1L, 0), - true, - false, - true); - - // --- Circuit Fabricator - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machine2", 1L, 4), - true, - false, - true); - - // --- Energy Storage Module - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 0), - true, - false, - true); - - // --- Electric Furnace - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 4), - true, - false, - true); - - // --- Energy Storage Cluster - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 8), - true, - false, - true); - - // --- Electric Arc Furnace - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.machineTiered", 1L, 12), - true, - false, - true); - - // --- Glowstone Torch - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.glowstoneTorch", 1L, 0), - true, - false, - true); - - // --- Spin Truster - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.spinThruster", 1L, 0), - true, - false, - true); - - // --- Display Screen - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.viewScreen", 1L, 0), - true, - false, - true); - - // --- Telemetry Unit - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.telemetry", 1L, 0), - true, - false, - true); - - // --- Arc Lamp - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "tile.arclamp", 1L, 0), true, false, true); - - // --- Oxygen Mask - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oxygenMask", 1L, 0), - true, - false, - true); - - // --- Oxygen Gear - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oxygenGear", 1L, 0), - true, - false, - true); - - // --- Sensor Lens - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.sensorLens", 1L, 0), - true, - false, - true); - - // --- Sensor Glasses - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.sensorGlasses", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Pickaxe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_pickaxe", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Axe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_axe", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Hoe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_hoe", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Shovel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_shovel", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Sword - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_sword", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Helmet - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_helmet", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Chest Plate - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_chestplate", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Leggings - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_leggings", 1L, 0), - true, - false, - true); - - // --- Heavy Duty Boots - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steel_boots", 1L, 0), - true, - false, - true); - - // --- Tin Canister - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.canister", 1L, 0), - true, - false, - true); - - // --- Copper Canister - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.canister", 1L, 1), - true, - false, - true); - - // --- Oxygen Vent - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.airVent", 1L, 0), true, false, true); - - // --- Oxygen Fan - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.airFan", 1L, 0), true, false, true); - - // --- Oxygen Concentrator - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oxygenConcentrator", 1L, 0), - true, - false, - true); - - // --- Tier 1 Rocket Engine - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.engine", 1L, 0), true, false, true); - - // --- Tier 1 Booster - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.engine", 1L, 1), true, false, true); - - // --- Nose Cone - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.noseCone", 1L, 0), - true, - false, - true); - - // --- Steel Pole - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.steelPole", 1L, 0), - true, - false, - true); - - // --- Canister - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oilCanisterPartial", 1L, 1001), - true, - false, - true); - - // --- Oil Extractor - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.oilExtractor", 1L, 0), - true, - false, - true); - - // --- Buggy Wheel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.buggymat", 1L, 0), - true, - false, - true); - - // --- Buggy Seat - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.buggymat", 1L, 1), - true, - false, - true); - - // --- Buggy Storage Box - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.buggymat", 1L, 2), - true, - false, - true); - - // --- Standard Wrench - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.standardWrench", 1L, 0), - true, - false, - true); - - // --- Can of Food - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 15), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 16), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 17), - true, - false, - true); - // - - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 18), - true, - false, - true); - - // --- Frequency Module - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 19), - true, - false, - true); - - // --- Battery - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.battery", 1L, 0), true, false, true); - // --- Titanium Pickaxe GTModHandler.removeRecipeByOutputDelayed( getModItem(GalacticraftMars.ID, "item.titanium_pickaxe", 1L, 0), @@ -1197,13 +617,6 @@ public void run() { false, true); - // --- Rocket Fins - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.rocketFins", 1L, 0), - true, - false, - true); - // --- Heavy Rocket Fins GTModHandler.removeRecipeByOutputDelayed( getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 2), @@ -1381,48 +794,6 @@ public void run() { false, true); - // --- Sealable Cobblestone Transport Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 8), - true, - false, - true); - - // --- Sealable Stone Transport Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 7), - true, - false, - true); - - // --- Sealable Cobblestone Fluid Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 10), - true, - false, - true); - - // --- Sealable Stone Fluid Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 9), - true, - false, - true); - - // --- Sealable Stone Kinesis Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 11), - true, - false, - true); - - // --- Sealable Gold Kinesis Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "tile.enclosed", 1L, 12), - true, - false, - true); - // --- Astro Miner Base GTModHandler.removeRecipeByOutputDelayed( getModItem(GalacticraftMars.ID, "tile.minerBase", 1L, 0), @@ -1437,23 +808,5 @@ public void run() { false, true); - // --- Canvas - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftCore.ID, "item.canvas", 1L, 0), true, false, true); - - // --- Ambient Thermal Controller - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.basicItem", 1L, 20), - true, - false, - true); - - // --- Parachute - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftCore.ID, "item.parachute", 1L, 0), - true, - false, - true); - } } diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index 61edbd1820..1cfe74188c 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -31,7 +31,6 @@ import static gregtech.api.enums.Mods.FloodLights; import static gregtech.api.enums.Mods.ForbiddenMagic; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.Gendustry; import static gregtech.api.enums.Mods.Genetics; @@ -357,8 +356,6 @@ public static void run() { GTModHandler.removeFurnaceSmelting(getModItem(FloodLights.ID, "rawFilament", 1, 0, missing)); GTModHandler.removeFurnaceSmelting(getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1, 4, missing)); GTModHandler.removeFurnaceSmelting(getModItem(GalacticraftMars.ID, "tile.asteroidsBlock", 1, 4, missing)); - GTModHandler - .removeFurnaceSmelting(getModItem(GalacticraftCore.ID, "item.meteoricIronRaw", 1, wildcard, missing)); GTModHandler.removeFurnaceSmelting(getModItem(GalacticraftMars.ID, "item.null", 1, 0, missing)); GTModHandler.removeFurnaceSmelting(getModItem(Minecraft.ID, "chainmail_boots", 1, 0, missing)); GTModHandler.removeFurnaceSmelting(getModItem(IndustrialCraft2.ID, "blockRubWood", 1, 0, missing));