diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java | 8 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 77 |
2 files changed, 1 insertions, 84 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index dbc2685d45..079ac4bf80 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -660,14 +660,6 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("pullingUpgrade", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', new ItemStack(Blocks.sticky_piston), 'R', new ItemStack(Blocks.hopper), 'E', OrePrefixes.circuit.get(Materials.Basic)}); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("cutter", 1L)); - if (Loader.isModLoaded("GraviSuite")) {//TODO --- CHECK GRAVI RECIPES - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("GraviSuite", "advJetpack", 1), new Object[]{"PJP", "BLB", "WCW", 'P', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', GT_ModHandler.getIC2Item("electricJetpack", 1), 'B', GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 1, 6), 'L', GT_ModHandler.getModItem("GraviSuite", "advLappack", 1), 'W', OrePrefixes.wireGt04.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.Advanced)}); - - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 3, 1)); - GT_ModHandler.addCraftingRecipe(GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 3, 1), new Object[]{"CCC", "WWW", "CCC", 'C', GT_ModHandler.getModItem("GraviSuite", "itemSimpleItem", 1), 'W', OrePrefixes.wireGt01.get(Materials.Superconductor)}); - } - } else { GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("glassFiberCableItem", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"GGG", "EDE", "GGG", 'G', new ItemStack(Blocks.glass, 1, 32767), 'D', OrePrefixes.dust.get(Materials.Silver), 'E', ItemList.IC2_Energium_Dust.get(1L)}); } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index d4558dbdb5..53d8fd60b9 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2315,82 +2315,7 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.SolderingAlloy.getMolten(2304)}, ItemList.Field_Generator_UV.get(1, new Object[]{}), 600, 100000); - -//TODO CHECK FOR COLLISIONS? Quantumsuite - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumHelmet", 1L)); - GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W), 144000, new ItemStack[]{ - GT_ModHandler.getIC2Item("nanoHelmet", 1L, GT_Values.W), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4), - ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), - ItemList.Sensor_IV.get(1, new Object[]{}), - ItemList.Field_Generator_EV.get(1, new Object[]{}), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, 4) - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2304), - Materials.Titanium.getMolten(1440) - }, GT_ModHandler.getIC2Item("quantumHelmet", 1L), 1500, 4096); - - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L)); - GT_Values.RA.addAssemblylineRecipe(Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W), 144000, new ItemStack[]{ - Loader.isModLoaded("GraviSuite") ? GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, GT_Values.W) : GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, GT_Values.W), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6), - ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), - ItemList.Field_Generator_HV.get(2, new Object[]{}), - ItemList.Electric_Motor_IV.get(2, new Object[]{}), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, 4) - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2304), - Materials.Titanium.getMolten(1440) - }, GT_ModHandler.getIC2Item("quantumBodyarmor", 1L), 1500, 4096); - - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumLeggings", 1L)); - GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W), 144000, new ItemStack[]{ - GT_ModHandler.getIC2Item("nanoLeggings", 1L, GT_Values.W), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 6), - ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), - ItemList.Field_Generator_HV.get(2, new Object[]{}), - ItemList.Electric_Motor_IV.get(4, new Object[]{}), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, 4) - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2304), - Materials.Titanium.getMolten(1440) - }, GT_ModHandler.getIC2Item("quantumLeggings", 1L), 1500, 4096); - - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("quantumBoots", 1L)); - GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W), 144000, new ItemStack[]{ - GT_ModHandler.getIC2Item("nanoBoots", 1L, GT_Values.W), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), - GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Iridium, 4), - ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), - ItemList.Field_Generator_HV.get(1, new Object[]{}), - ItemList.Electric_Piston_IV.get(2, new Object[]{}), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Tungsten, 4) - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2304), - Materials.Titanium.getMolten(1440) - }, GT_ModHandler.getIC2Item("quantumBoots", 1L), 1500, 4096); - - if(Loader.isModLoaded("GraviSuite")){ - GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("GraviSuite", "graviChestPlate", 1, GT_Values.W)); - GT_Values.RA.addAssemblylineRecipe(GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, GT_Values.W), 144000, new ItemStack[]{ - GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, GT_Values.W), - GT_ModHandler.getModItem("GraviSuite", "ultimateLappack", 1, GT_Values.W), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Duranium, 6), - ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}), - ItemList.Field_Generator_IV.get(2, new Object[]{}), - ItemList.Electric_Motor_ZPM.get(2, new Object[]{}), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 32), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Duranium, 4) - }, new FluidStack[]{ - Materials.SolderingAlloy.getMolten(2304), - Materials.Tritanium.getMolten(1440) - }, GT_ModHandler.getModItem("GraviSuite", "graviChestPlate", 1, 27), 1500, 16388); - } - + Object o = new Object[0]; GT_Values.RA.addAssemblylineRecipe(ItemList.Circuit_Crystalmainframe.get(1,o), 72000, new ItemStack[]{ ItemList.Circuit_Board_Wetware_Extreme.get(1,o), |