diff --git a/src/main/java/com/dreammaster/recipes/RecipeRemover.java b/src/main/java/com/dreammaster/recipes/RecipeRemover.java index c059443e3..3654f4d1e 100644 --- a/src/main/java/com/dreammaster/recipes/RecipeRemover.java +++ b/src/main/java/com/dreammaster/recipes/RecipeRemover.java @@ -107,7 +107,6 @@ import gregtech.api.util.GTUtility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RecipeRemover { @@ -1167,23 +1166,7 @@ public static void run() { removeRecipeByOutputDelayed(getModItem(Forestry.ID, "lepidopterology", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Forestry.ID, "fences", 1, wildcard, missing)); removeRecipeByOutputDelayed(getModItem(Forestry.ID, "cart.beehouse", 1, wildcard, missing)); - removeRecipeByOutputDelayed(GregtechItemList.GT4_Thermal_Boiler.get(1)); removeRecipeByOutputDelayed(new ItemStack(ModItems.itemPersonalCloakingDevice)); - removeRecipeByOutputDelayed(ItemList.Electric_Motor_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Electric_Pump_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Conveyor_Module_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Electric_Piston_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Robot_Arm_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Emitter_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Sensor_UHV.get(1L)); - removeRecipeByOutputDelayed(ItemList.Field_Generator_UHV.get(1L)); - removeRecipeByOutputDelayed(GregtechItemList.Industrial_WireFactory.get(1)); - removeRecipeByOutputDelayed(GregtechItemList.Boiler_Advanced_LV.get(1)); - removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 0)); - removeRecipeByOutputDelayed(GregtechItemList.Boiler_Advanced_MV.get(1)); - removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 1)); - removeRecipeByOutputDelayed(GregtechItemList.Boiler_Advanced_HV.get(1)); - removeRecipeByOutputDelayed(new ItemStack(ModItems.itemBoilerChassis, 1, 2)); removeRecipeByOutputDelayed(new ItemStack(ModBlocks.blockCompressedObsidian, 1, 5)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "IndustrialApiary", 1, 0, missing)); removeRecipeByOutputDelayed(getModItem(Gendustry.ID, "MutagenProducer", 1, 0, missing)); diff --git a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java index 173b83d03..68ff65dd7 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java +++ b/src/main/java/com/dreammaster/scripts/ScriptGregtechPlusPlus.java @@ -30,12 +30,10 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GTOreDictUnificator; -import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.forestry.bees.items.FRItemRegistry; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class ScriptGregtechPlusPlus implements IScriptLoader { @@ -58,17 +56,6 @@ public List getDependencies() { @Override public void loadRecipes() { - addShapedRecipe( - GregtechItemList.GT4_Thermal_Boiler.get(1), - getModItem(RemoteIO.ID, "tile.machine", 1, 1, missing), - ItemList.Machine_HV_Centrifuge.get(1L), - getModItem(RemoteIO.ID, "tile.machine", 1, 1, missing), - "gearGtTungstenSteel", - "circuitElite", - "gearGtTungstenSteel", - getModItem(RemoteIO.ID, "tile.machine", 1, 1, missing), - ItemList.Machine_HV_Centrifuge.get(1L), - getModItem(RemoteIO.ID, "tile.machine", 1, 1, missing)); addShapedRecipe( MaterialsAlloy.TUMBAGA.getRod(1), @@ -103,83 +90,6 @@ public void loadRecipes() { MaterialsAlloy.TUMBAGA.getRod(1), MaterialsAlloy.TUMBAGA.getPlate(1), MaterialsAlloy.TUMBAGA.getRod(1)); - addShapedRecipe( - GregtechItemList.Industrial_WireFactory.get(1), - "plateBlueSteel", - ItemList.Casing_IV.get(1L), - "plateBlueSteel", - "circuitElite", - ItemList.Machine_IV_Wiremill.get(1L), - "circuitElite", - "plateBlueSteel", - ItemList.Casing_IV.get(1L), - "plateBlueSteel"); - addShapedRecipe( - GregtechItemList.Boiler_Advanced_LV.get(1), - ItemList.Electric_Pump_LV.get(1L), - "circuitBasic", - ItemList.Electric_Pump_LV.get(1L), - new ItemStack(ModItems.itemBoilerChassis, 1, 0), - ItemList.Casing_LV.get(1L), - new ItemStack(ModItems.itemBoilerChassis, 1, 0), - GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 1L), - ItemList.Machine_Steel_Boiler.get(1L), - GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Steel, 1L)); - addShapedRecipe( - new ItemStack(ModItems.itemBoilerChassis, 1, 0), - "plateDoubleLead", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L), - "plateDoubleLead", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.AnyBronze, 1L), - getModItem(IronTanks.ID, "silverTank", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.AnyBronze, 1L), - "plateDoubleLead", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L), - "plateDoubleLead"); - addShapedRecipe( - GregtechItemList.Boiler_Advanced_MV.get(1), - ItemList.Electric_Pump_MV.get(1L), - "circuitGood", - ItemList.Electric_Pump_MV.get(1L), - new ItemStack(ModItems.itemBoilerChassis, 1, 1), - ItemList.Casing_MV.get(1L), - new ItemStack(ModItems.itemBoilerChassis, 1, 1), - GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.StainlessSteel, 1L), - ItemList.Machine_Steel_Boiler.get(1L), - GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.StainlessSteel, 1L)); - addShapedRecipe( - new ItemStack(ModItems.itemBoilerChassis, 1, 1), - "plateDoubleStainlessSteel", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1L), - "plateDoubleStainlessSteel", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L), - getModItem(IronTanks.ID, "stainlesssteelTank", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1L), - "plateDoubleStainlessSteel", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1L), - "plateDoubleStainlessSteel"); - addShapedRecipe( - GregtechItemList.Boiler_Advanced_HV.get(1), - ItemList.Electric_Pump_HV.get(1L), - "circuitAdvanced", - ItemList.Electric_Pump_HV.get(1L), - new ItemStack(ModItems.itemBoilerChassis, 1, 2), - ItemList.Casing_HV.get(1L), - new ItemStack(ModItems.itemBoilerChassis, 1, 2), - GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Titanium, 1L), - ItemList.Machine_Steel_Boiler.get(1L), - GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Titanium, 1L)); - addShapedRecipe( - new ItemStack(ModItems.itemBoilerChassis, 1, 2), - "plateDoubleTitanium", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1L), - "plateDoubleTitanium", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1L), - getModItem(IronTanks.ID, "titaniumTank", 1, 0, missing), - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1L), - "plateDoubleTitanium", - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1L), - "plateDoubleTitanium"); // Shirabon and Eternity GTValues.RA.stdBuilder()