aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java28
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java55
2 files changed, 39 insertions, 44 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index 811e00615e..b02c06b113 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -744,25 +744,25 @@ public class GT_CraftingRecipeLoader implements Runnable {
(GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("crophavester", 1L)))) {
GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("crophavester", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"ACA", "PMS", "WOW", 'M', ItemList.Hull_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'A', ItemList.Robot_Arm_HV, 'P', ItemList.Electric_Piston_HV, 'S', ItemList.Sensor_HV, 'W', OrePrefixes.toolHeadSense.get(Materials.StainlessSteel), 'O', ItemList.Conveyor_Module_HV});
}
- if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "nuclearReactor", true)) &&
- (GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("nuclearReactor", 1L)))) {
- GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("nuclearReactor", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PCP", "PMP", "PAP", 'P', OrePrefixes.plateDense.get(Materials.Lead), 'C', OrePrefixes.circuit.get(Materials.Elite), 'M', GT_ModHandler.getIC2Item("reactorChamber", 1), 'A', ItemList.Robot_Arm_EV});
+ //if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "nuclearReactor", true)) &&
+ //(GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("nuclearReactor", 1L)))) {
+ //GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("nuclearReactor", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PCP", "PMP", "PAP", 'P', OrePrefixes.plateDense.get(Materials.Lead), 'C', OrePrefixes.circuit.get(Materials.Elite), 'M', GT_ModHandler.getIC2Item("reactorChamber", 1), 'A', ItemList.Robot_Arm_EV});
- GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorChamber", 1L));
- GT_Values.RA.addAssemblerRecipe(ItemList.Hull_EV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lead, 4), GT_ModHandler.getIC2Item("reactorChamber", 1), 200, 256);
+ //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorChamber", 1L));
+ //GT_Values.RA.addAssemblerRecipe(ItemList.Hull_EV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lead, 4), GT_ModHandler.getIC2Item("reactorChamber", 1), 200, 256);
- GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorvessel", 1L));
- GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Lead, 1), Materials.Concrete.getMolten(144), GT_ModHandler.getIC2Item("reactorvessel", 1), GT_Values.NI, GT_Values.NI, null, 400, 80);
+ //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorvessel", 1L));
+ //GT_Values.RA.addChemicalBathRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Lead, 1), Materials.Concrete.getMolten(144), GT_ModHandler.getIC2Item("reactorvessel", 1), GT_Values.NI, GT_Values.NI, null, 400, 80);
- GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorAccessHatch", 1L));
- GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("reactorvessel", 1L), ItemList.Conveyor_Module_EV.get(1), GT_ModHandler.getIC2Item("reactorAccessHatch", 1L), 200, 80);
+ //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorAccessHatch", 1L));
+ //GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("reactorvessel", 1L), ItemList.Conveyor_Module_EV.get(1), GT_ModHandler.getIC2Item("reactorAccessHatch", 1L), 200, 80);
- GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorFluidPort", 1L));
- GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("reactorvessel", 1L), ItemList.Electric_Pump_EV.get(1), GT_ModHandler.getIC2Item("reactorFluidPort", 1L), 200, 80);
+ //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorFluidPort", 1L));
+ //GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("reactorvessel", 1L), ItemList.Electric_Pump_EV.get(1), GT_ModHandler.getIC2Item("reactorFluidPort", 1L), 200, 80);
- GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorRedstonePort", 1L));
- GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("reactorvessel", 1L), OrePrefixes.circuit.get(Materials.Elite), 1,GT_Values.NF, GT_ModHandler.getIC2Item("reactorRedstonePort", 1L), 200, 80);
- }
+ //GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("reactorRedstonePort", 1L));
+ //GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getIC2Item("reactorvessel", 1L), OrePrefixes.circuit.get(Materials.Elite), 1,GT_Values.NF, GT_ModHandler.getIC2Item("reactorRedstonePort", 1L), 200, 80);
+ //}
if ((GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "rtg", true)) &&
(GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("RTGenerator", 1L)))) {
GT_ModHandler.addCraftingRecipe(GT_ModHandler.getIC2Item("RTGenerator", 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"III", "IMI", "ICI", 'I', ItemList.IC2_Item_Casing_Steel, 'C', OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV});
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 169ddee16d..9a0e7a9005 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -433,10 +433,9 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addAutoclaveRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1), Materials.UUMatter.getFluid(576), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), 3333, 72000, 480);
GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderPearl, 1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), Materials.RedSteel.getMolten(576), ItemList.Field_Generator_LV.get(1), 1800, 30);
- GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4), Materials.TungstenSteel.getMolten(576), ItemList.Field_Generator_MV.get(1), 1800, 120);
- GT_Values.RA.addAssemblerRecipe(ItemList.QuantumEye.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), Materials.NiobiumTitanium.getMolten(1152), ItemList.Field_Generator_HV.get(1), 1800, 480);
- GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), ItemList.Tool_DataOrb.get(4L), Materials.HSSG.getMolten(1152), ItemList.Field_Generator_EV.get(1), 1800, 1920);
- //GT_Values.RA.addAssemblerRecipe(ItemList.QuantumStar.get(1), CustomItemList.HighEnergyFlowCircuit.get(4L), Materials.HSSS.getMolten(1728), ItemList.Field_Generator_IV.get(1), 1800, 7680);//TODO MOVE TO COREMOD
+ GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), Materials.TungstenSteel.getMolten(576), ItemList.Field_Generator_MV.get(1), 1800, 120);
+ GT_Values.RA.addAssemblerRecipe(ItemList.QuantumEye.get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 4), Materials.NiobiumTitanium.getMolten(1152), ItemList.Field_Generator_HV.get(1), 1800, 480);
+ GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), Materials.HSSG.getMolten(1152), ItemList.Field_Generator_EV.get(1), 1800, 1920);
GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Zinc, 16), null, ItemList.Component_Filter.get(1), 1600, 16);
GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 8), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicon, 1), Materials.Glue.getFluid(250L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Graphene, 1), 480, 240);
GT_Values.RA.addAssemblerRecipe(ItemList.Electric_Pump_LV.get(1L, new Object[0]), OrePrefixes.circuit.get(Materials.Basic), 2, GT_Values.NF, ItemList.FluidRegulator_LV.get(1L, new Object[0]), 800, 4);//TODO Check
@@ -2266,9 +2265,9 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_IV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSG, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSG, 6L),
- ItemList.QuantumStar.get(1, new Object(){}),
+ ItemList.QuantumStar.get(2, new Object(){}),
ItemList.Emitter_LuV.get(4, new Object(){}),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 8L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
@@ -2278,24 +2277,20 @@ public class GT_MachineRecipeLoader implements Runnable {
ItemList.Field_Generator_LuV.get(1, new Object[]{}), 600, 6000);
-
-
-
-
GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_LuV.get(1, new Object(){}),144000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSE, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 6L),
- ItemList.QuantumStar.get(4, new Object(){}),
+ ItemList.Gravistar.get(1, new Object(){}),
ItemList.Emitter_ZPM.get(4, new Object(){}),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 16L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 8L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(1152)},
ItemList.Field_Generator_ZPM.get(1, new Object[]{}), 600, 24000);
@@ -2305,17 +2300,17 @@ public class GT_MachineRecipeLoader implements Runnable {
GT_Values.RA.addAssemblylineRecipe(ItemList.Field_Generator_ZPM.get(1, new Object(){}),288000,new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L),
- ItemList.Gravistar.get(1, new Object(){}),
+ ItemList.Gravistar.get(2, new Object(){}),
ItemList.Emitter_UV.get(4, new Object(){}),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmium, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 16L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
+ GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 64L),
GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NiobiumTitanium, 8L)}, new FluidStack[]{
Materials.SolderingAlloy.getMolten(2304)},
ItemList.Field_Generator_UV.get(1, new Object[]{}), 600, 100000);
generated by cgit (git 2.46.0) at 2025-03-06 22:33:34 +0000