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 5d7d1f377..3d6cad78c 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.GalacticraftMars; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.MineAndBladeBattleGear2; import static gregtech.api.enums.Mods.NaturesCompass; @@ -486,327 +485,5 @@ public void run() { GTModHandler.removeRecipeByOutputDelayed(getModItem(ZTones.ID, "lampf", 1L, 0), true, false, true); GTModHandler.removeRecipeByOutputDelayed(getModItem(ZTones.ID, "lampt", 1L, 0), true, false, true); GTModHandler.removeRecipeByOutputDelayed(getModItem(ZTones.ID, "lampb", 1L, 0), true, false, true); - - // Galacticraft - - // --- Titanium Pickaxe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_pickaxe", 1L, 0), - true, - false, - true); - - // --- Titanium Axe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_axe", 1L, 0), - true, - false, - true); - - // --- Titanium Hoe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_hoe", 1L, 0), - true, - false, - true); - - // --- Titanium Shovel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_shovel", 1L, 0), - true, - false, - true); - - // --- Titanium Sword - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_sword", 1L, 0), - true, - false, - true); - - // --- Titanium Helmet - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_helmet", 1L, 0), - true, - false, - true); - - // --- Titanium Chest Plate - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_chestplate", 1L, 0), - true, - false, - true); - - // --- Titanium Leggings - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_leggings", 1L, 0), - true, - false, - true); - - // --- Titanium Boots - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.titanium_boots", 1L, 0), - true, - false, - true); - - // --- Desh Block - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "tile.mars", 1L, 8), true, false, true); - - // --- Desh Ingot - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "item.null", 1L, 2), true, false, true); - - // --- Desh Stick - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "item.null", 1L, 1), true, false, true); - - // --- Gas Liquifier - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.marsMachineT2", 1L, 0), - true, - false, - true); - - // --- Methan Synthesizer - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.marsMachineT2", 1L, 4), - true, - false, - true); - - // --- Water Electrolyzer - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.marsMachineT2", 1L, 8), - true, - false, - true); - - // --- Walkway - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "tile.walkway", 1L, 0), true, false, true); - - // --- Walkway Aluminium - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.walkwayWire", 1L, 0), - true, - false, - true); - - // --- Walkway Pipes - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.walkwayOxygenPipe", 1L, 0), - true, - false, - true); - - // --- Thermal Cloth - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 7), - true, - false, - true); - - // --- Atmospheric Valve - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.atmosphericValve", 1L, 0), - true, - false, - true); - - // --- Heavy Rocket Fins - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 2), - true, - false, - true); - - // --- Heavy Rocket Engine - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 1), - true, - false, - true); - - // --- Heavy Nose Cone - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.heavyNoseCone", 1L, 0), - true, - false, - true); - - // --- Red Core - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.itemBasicAsteroids", 1L, 8), - true, - false, - true); - - // --- Fluid Manipulator - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "item.null", 1L, 6), true, false, true); - - // --- Energy Beam Reflector - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.beamReflector", 1L, 0), - true, - false, - true); - - // --- Energy Beam Receiver - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.beamReceiver", 1L, 0), - true, - false, - true); - - // --- Short range Teleporter - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.telepadShort", 1L, 0), - true, - false, - true); - - // --- Cryogenic Chamber - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.marsMachine", 1L, 4), - true, - false, - true); - - // --- Terraformer - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.marsMachine", 1L, 0), - true, - false, - true); - - // --- Launch Controller - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.marsMachine", 1L, 8), - true, - false, - true); - - // --- Grappler - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "item.grapple", 1L, 0), true, false, true); - - // --- Hydrogen Pipe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.hydrogenPipe", 1L, 0), - true, - false, - true); - - // --- Carbon Fragments - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.carbonFragments", 1L, 0), - true, - false, - true); - - // --- Thermal Padding Helm - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.thermalPadding", 1L, 0), - true, - false, - true); - - // --- Thermal Padding Chestpiece - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.thermalPadding", 1L, 1), - true, - false, - true); - - // --- Thermal Padding Leggings - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.thermalPadding", 1L, 2), - true, - false, - true); - - // --- Thermal Padding Boots - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.thermalPadding", 1L, 3), - true, - false, - true); - - // --- Desh Helmet - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshHelmet", 1L, 0), - true, - false, - true); - - // --- Desh Chest Plate - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshChestplate", 1L, 0), - true, - false, - true); - - // --- Desh Leggings - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshLeggings", 1L, 0), - true, - false, - true); - - // --- Desh Boots - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshBoots", 1L, 0), - true, - false, - true); - - // --- Desh Pickaxe - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshPick", 1L, 0), - true, - false, - true); - - // --- Desh Axe - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "item.deshAxe", 1L, 0), true, false, true); - - // --- Desh Hoe - GTModHandler - .removeRecipeByOutputDelayed(getModItem(GalacticraftMars.ID, "item.deshHoe", 1L, 0), true, false, true); - - // --- Desh Shovel - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshSpade", 1L, 0), - true, - false, - true); - - // --- Desh Sword - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.deshSword", 1L, 0), - true, - false, - true); - - // --- Astro Miner Base - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "tile.minerBase", 1L, 0), - true, - false, - true); - - // --- Orion Drive - GTModHandler.removeRecipeByOutputDelayed( - getModItem(GalacticraftMars.ID, "item.orionDrive", 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 3654f4d1e..d05baedc3 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.GalacticraftMars; import static gregtech.api.enums.Mods.Gendustry; import static gregtech.api.enums.Mods.Genetics; import static gregtech.api.enums.Mods.GraviSuite; @@ -353,9 +352,6 @@ public static void run() { GTModHandler.removeFurnaceSmelting(getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 7, missing)); GTModHandler.removeFurnaceSmelting(getModItem(ExtraUtilities.ID, "decorativeBlock1", 1, 9, missing)); 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(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)); GTModHandler.removeFurnaceSmelting(getModItem(Minecraft.ID, "slime_ball", 1, 0, missing));