diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader')
5 files changed, 2186 insertions, 2610 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index 5e5298531c..21ee302a6c 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -1,7 +1,27 @@ package goodgenerator.loader; -import static goodgenerator.util.ItemRefer.*; +import static goodgenerator.util.ItemRefer.Compassline_Casing_EV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_HV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_IV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_LV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_LuV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_MV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_UEV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_UHV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_UIV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_UMV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_UV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_UXV; +import static goodgenerator.util.ItemRefer.Compassline_Casing_ZPM; +import static goodgenerator.util.ItemRefer.Component_Assembly_Line; import static goodgenerator.util.Log.LOGGER; +import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.HOURS; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; +import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; import java.util.HashMap; @@ -59,108 +79,119 @@ public class ComponentAssemblyLineMiscRecipes { } // The controller itself - GT_Values.RA.addAssemblylineRecipe( - Compassline_Casing_EV.get(1), - 3600 * 20, - new Object[] { ItemList.Machine_Multi_Assemblyline.get(16L), ItemList.Casing_Assembler.get(16L), - ItemList.Casing_Gearbox_TungstenSteel.get(32L), ComponentType.Robot_Arm.getComponent(8).get(16), + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, Compassline_Casing_EV.get(1)) + .metadata(RESEARCH_TIME, 1 * HOURS) + .itemInputs( + ItemList.Machine_Multi_Assemblyline.get(16L), + ItemList.Casing_Assembler.get(16L), + ItemList.Casing_Gearbox_TungstenSteel.get(32L), + ComponentType.Robot_Arm.getComponent(8).get(16), ComponentType.Conveyor_Module.getComponent(8).get(32), ComponentType.Electric_Motor.getComponent(7).get(32), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), solidifier, - getALCircuit(8, 16), getALCircuit(7, 20), getALCircuit(6, 24) }, - new FluidStack[] { new FluidStack(FluidRegistry.getFluid("molten.indalloy140"), 144 * 12), - Materials.Naquadria.getMolten(144 * 16), Materials.Lubricant.getFluid(5000) }, - Component_Assembly_Line.get(1), - 30 * 20, - getV(8) * 2); + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), + solidifier, + getALCircuit(8, 16), + getALCircuit(7, 20), + getALCircuit(6, 24)) + .fluidInputs( + new FluidStack(FluidRegistry.getFluid("molten.indalloy140"), 144 * 12), + Materials.Naquadria.getMolten(144 * 16), + Materials.Lubricant.getFluid(5000)) + .itemOutputs(Component_Assembly_Line.get(1)).eut(TierEU.RECIPE_UHV / 2).duration(30 * SECONDS) + .addTo(AssemblyLine); } /** Recipes for the Component Assembly Line Casings */ private static void generateCasingRecipes() { int t = 1; // lv 1 - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), ComponentType.Robot_Arm.getComponent(t).get(4), ComponentType.Electric_Piston.getComponent(t).get(8), ComponentType.Electric_Motor.getComponent(t).get(10), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), getCircuit(t, 16), }, - Materials.SolderingAlloy.getMolten(144 * (t + 3)), - Compassline_Casing_LV.get(1), - 16 * 20, - getV(t)); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), + getCircuit(t, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) + .itemOutputs(Compassline_Casing_LV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) + .addTo(assemblerRecipes); // mv 2 t++; - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), ComponentType.Robot_Arm.getComponent(t).get(4), ComponentType.Electric_Piston.getComponent(t).get(8), ComponentType.Electric_Motor.getComponent(t).get(10), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), getCircuit(t, 8), - getCircuit(t - 1, 16) }, - Materials.SolderingAlloy.getMolten(144 * (t + 1)), - Compassline_Casing_MV.get(1), - 16 * 20, - getV(t)); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), + getCircuit(t, 8), + getCircuit(t - 1, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) + .itemOutputs(Compassline_Casing_MV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) + .addTo(assemblerRecipes); // hv 3 t++; - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), ComponentType.Robot_Arm.getComponent(t).get(4), ComponentType.Electric_Piston.getComponent(t).get(8), ComponentType.Electric_Motor.getComponent(t).get(10), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), getCircuit(t, 8), - getCircuit(t - 1, 16) }, - Materials.SolderingAlloy.getMolten(144 * (t + 1)), - Compassline_Casing_HV.get(1), - 16 * 20, - getV(t)); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), + getCircuit(t, 8), + getCircuit(t - 1, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) + .itemOutputs(Compassline_Casing_HV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) + .addTo(assemblerRecipes); // ev 4 t++; - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), ComponentType.Robot_Arm.getComponent(t).get(4), ComponentType.Electric_Piston.getComponent(t).get(8), ComponentType.Electric_Motor.getComponent(t).get(10), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), getCircuit(t, 8), - getCircuit(t - 1, 16) }, - Materials.SolderingAlloy.getMolten(144 * (t + 1)), - Compassline_Casing_EV.get(1), - 16 * 20, - getV(t)); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), + getCircuit(t, 8), + getCircuit(t - 1, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) + .itemOutputs(Compassline_Casing_EV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) + .addTo(assemblerRecipes); // iv 5 t++; - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), ComponentType.Robot_Arm.getComponent(t).get(4), ComponentType.Electric_Piston.getComponent(t).get(8), ComponentType.Electric_Motor.getComponent(t).get(10), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), getCircuit(t, 8), - getCircuit(t - 1, 16) }, - Materials.SolderingAlloy.getMolten(144 * (t + 1)), - Compassline_Casing_IV.get(1), - 16 * 20, - getV(t)); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), + getCircuit(t, 8), + getCircuit(t - 1, 16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) + .itemOutputs(Compassline_Casing_IV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) + .addTo(assemblerRecipes); Fluid sold = FluidRegistry.getFluid("molten.indalloy140"); // Assline Recipes! // luv 6 t++; - GT_Values.RA.addAssemblylineRecipe( - Compassline_Casing_IV.get(1), - 2250 << t, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, Compassline_Casing_IV.get(1)) + .metadata(RESEARCH_TIME, (2250 << t) * TICKS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plateDense, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), @@ -168,57 +199,67 @@ public class ComponentAssemblyLineMiscRecipes { WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 4), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGtSmall, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), - getALCircuit(t, 8), getALCircuit(t - 1, 16) }, - new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, - Compassline_Casing_LuV.get(1), - 30 * 20, - 6000); + getALCircuit(t, 8), + getALCircuit(t - 1, 16)) + .fluidInputs( + new FluidStack(sold, 144 * t * 4), + CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), + Materials.Lubricant.getFluid(1000 * (t - 2))) + .itemOutputs(Compassline_Casing_LuV.get(1)).eut(TierEU.RECIPE_IV).duration(30 * SECONDS) + .addTo(AssemblyLine); // zpm 7 t++; - GT_Values.RA.addAssemblylineRecipe( - Compassline_Casing_LuV.get(1), - 2250 << t, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, Compassline_Casing_LuV.get(1)) + .metadata(RESEARCH_TIME, (2250 << t) * TICKS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), ComponentType.Electric_Motor.getComponent(t).get(16), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), getALCircuit(t, 8), - getALCircuit(t - 1, 16) }, - new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, - Compassline_Casing_ZPM.get(1), - 30 * 20, - 24000); + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), + getALCircuit(t, 8), + getALCircuit(t - 1, 16)) + .fluidInputs( + new FluidStack(sold, 144 * t * 4), + CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), + Materials.Lubricant.getFluid(1000 * (t - 2))) + .itemOutputs(Compassline_Casing_ZPM.get(1)).eut(TierEU.RECIPE_LuV).duration(30 * SECONDS) + .addTo(AssemblyLine); // uv 8 t++; - GT_Values.RA.addAssemblylineRecipe( - Compassline_Casing_ZPM.get(1), - 2250 << t, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), + + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, Compassline_Casing_ZPM.get(1)) + .metadata(RESEARCH_TIME, (2250 << t) * TICKS) + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), ComponentType.Electric_Motor.getComponent(t).get(16), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), getALCircuit(t, 8), - getALCircuit(t - 1, 16) }, - new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, - Compassline_Casing_UV.get(1), - 30 * 20, - 100000); + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), + getALCircuit(t, 8), + getALCircuit(t - 1, 16)) + .fluidInputs( + new FluidStack(sold, 144 * t * 4), + CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), + Materials.Lubricant.getFluid(1000 * (t - 2))) + .itemOutputs(Compassline_Casing_UV.get(1)).eut(TierEU.RECIPE_ZPM).duration(30 * SECONDS) + .addTo(AssemblyLine); // uhv 9 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UV.get(1), 375 << (t - 2), 1 << (t - 3), - 500000, + (int) TierEU.RECIPE_UV, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), @@ -232,8 +273,8 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UHV.get(1), - 50 * 20, - 500000); + 50 * SECONDS, + (int) TierEU.RECIPE_UV); sold = FluidRegistry.getFluid("molten.mutatedlivingsolder"); // uev 10 t++; @@ -241,7 +282,7 @@ public class ComponentAssemblyLineMiscRecipes { Compassline_Casing_UHV.get(1), 375 << (t - 2), 1 << (t - 3), - 2000000, + (int) TierEU.RECIPE_UHV, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), @@ -255,15 +296,15 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UEV.get(1), - 50 * 20, - 2000000); + 50 * SECONDS, + (int) TierEU.RECIPE_UHV); // uiv 11 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UEV.get(1), 375 << (t - 2), 1 << (t - 3), - 8000000, + (int) TierEU.RECIPE_UEV, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), @@ -277,15 +318,15 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UIV.get(1), - 50 * 20, - 8000000); + 50 * SECONDS, + (int) TierEU.RECIPE_UEV); // umv 12 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UIV.get(1), 375 << (t - 2), 1 << (t - 3), - 32000000, + (int) TierEU.RECIPE_UIV, 1, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), @@ -300,14 +341,14 @@ public class ComponentAssemblyLineMiscRecipes { StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UMV.get(1), 50 * 20, - 32000000); + (int) TierEU.RECIPE_UIV); // uxv 13 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UMV.get(1), 375 << (t - 2), 1 << (t - 3), - 128_000_000, + (int) TierEU.RECIPE_UMV, 1, new Object[] { GT_OreDictUnificator .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), @@ -336,37 +377,31 @@ public class ComponentAssemblyLineMiscRecipes { MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UXV.get(1), - 50 * 20, + 50 * SECONDS, (int) TierEU.RECIPE_UMV); } - private static int getV(int tier) { - return (int) (GT_Values.V[tier] - (GT_Values.V[tier] >> 4)); - } - private static void generateWrapRecipes() { for (int i = 0; i <= 11; i++) { - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16) }, - Materials.SolderingAlloy.getMolten(72L), - new ItemStack(Loaders.circuitWrap, 1, i), - 30 * 20, - 30); + GT_Values.RA.stdBuilder().itemInputs(getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) + .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, i)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); } - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), - GT_Utility.getIntegratedCircuit(16) }, - Materials.SolderingAlloy.getMolten(72L), - new ItemStack(Loaders.circuitWrap, 1, 12), - 30 * 20, - 30); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), - GT_Utility.getIntegratedCircuit(16) }, - Materials.SolderingAlloy.getMolten(72L), - new ItemStack(Loaders.circuitWrap, 1, 13), - 30 * 20, - 30); + GT_Values.RA.stdBuilder() + .itemInputs( + GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), + GT_Utility.getIntegratedCircuit(16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) + .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 12)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), + GT_Utility.getIntegratedCircuit(16)) + .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) + .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 13)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); } @SuppressWarnings("unused") diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 1d2afe9d50..6a4e3f4db6 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -1,6 +1,7 @@ package goodgenerator.loader; import static goodgenerator.util.DescTextLocalization.addText; +import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -41,7 +42,6 @@ import goodgenerator.blocks.tileEntity.SupercriticalFluidTurbine; import goodgenerator.blocks.tileEntity.UniversalChemicalFuelEngine; import goodgenerator.blocks.tileEntity.YottaFluidTank; import goodgenerator.client.render.BlockRenderHandler; -import goodgenerator.crossmod.LoadedList; import goodgenerator.crossmod.ic2.CropsLoader; import goodgenerator.crossmod.nei.NEI_Config; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; @@ -308,7 +308,7 @@ public class Loaders { IDOffset + 20, "LargeFusionComputer3", "Compact Fusion Computer MK-III").getStackForm(1L); - if (LoadedList.GTPP) { + if (GTPlusPlus.isModLoaded()) { Loaders.LFC[3] = new LargeFusionComputer4( IDOffset + 21, "LargeFusionComputer4", @@ -458,7 +458,6 @@ public class Loaders { compactMod(); FluidsBuilder.Register(); FuelRodLoader.RegisterRod(); - LoadedList.init(); } public static void initLoad() { diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 27f5fbd339..e95453ea33 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -34,6 +34,21 @@ import static goodgenerator.items.MyMaterial.towEthyl1Hexanol; import static goodgenerator.items.MyMaterial.triniumSulphate; import static goodgenerator.items.MyMaterial.wasteLiquid; import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; +import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; +import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; import java.lang.reflect.Constructor; @@ -59,14 +74,15 @@ import org.apache.commons.lang3.reflect.FieldUtils; import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import goodgenerator.crossmod.LoadedList; import goodgenerator.main.GoodGenerator; +import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_OreDictUnificator; @@ -84,7 +100,7 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; - if (LoadedList.GTPP) { + if (GTPlusPlus.isModLoaded()) { try { // Naquadah (UEV) CORE.RA.addQuantumTransformerRecipe( @@ -160,91 +176,65 @@ public class NaquadahReworkRecipeLoader { } // Fix shit - GT_Values.RA.addPulveriserRecipe( - lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1), - new ItemStack[] { Materials.Tin.getDust(2) }, - new int[] { 10000 }, - 334, - 4); + GT_Values.RA.stdBuilder().itemInputs(lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1)) + .itemOutputs(Materials.Tin.getDust(2)).duration(16 * SECONDS + 14 * TICKS).eut(4) + .addTo(maceratorRecipes); // Naquadah Rework Line - GT_Values.RA.addBlastRecipe( - naquadahEarth.get(OrePrefixes.dust, 2), - GT_Utility.getIntegratedCircuit(1), - fluoroantimonicAcid.getFluidOrGas(3000), - lowQualityNaquadahEmulsion.getFluidOrGas(2000), - titaniumTrifluoride.get(OrePrefixes.dust, 4), - null, - 100, - 480, - 3000); + GT_Values.RA.stdBuilder().itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(fluoroantimonicAcid.getFluidOrGas(3000)) + .fluidOutputs(lowQualityNaquadahEmulsion.getFluidOrGas(2000)) + .itemOutputs(titaniumTrifluoride.get(OrePrefixes.dust, 4)).duration(5 * SECONDS).eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 3000).addTo(blastFurnaceRecipes); // TiF3 + 3H = Ti + 3HF - GT_Values.RA.addBlastRecipe( - titaniumTrifluoride.get(OrePrefixes.dust, 4), - GT_Utility.getIntegratedCircuit(1), - Materials.Hydrogen.getGas(3000), - Materials.HydrofluoricAcid.getFluid(3000), - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titanium, 1), - null, - 120, - 1920, - 2000); - - GT_Values.RA.addChemicalRecipe( - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), - Materials.Hydrogen.getCells(8), - FluidRegistry.getFluidStack("seedoil", 3000), - towEthyl1Hexanol.getFluidOrGas(1000), - ItemList.Cell_Empty.get(8), - 400, - 480); + GT_Values.RA.stdBuilder() + .itemInputs(titaniumTrifluoride.get(OrePrefixes.dust, 4), GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Hydrogen.getGas(3000)).fluidOutputs(Materials.HydrofluoricAcid.getFluid(3000)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titanium, 1)) + .duration(6 * SECONDS).eut(TierEU.RECIPE_EV).metadata(COIL_HEAT, 2000).addTo(blastFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), + Materials.Hydrogen.getCells(8)) + .fluidInputs(FluidRegistry.getFluidStack("seedoil", 3000)).itemOutputs(ItemList.Cell_Empty.get(8)) + .fluidOutputs(towEthyl1Hexanol.getFluidOrGas(1000)).duration(20 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); // 2C8H18O + H3PO4 =Na,C2H6O= C16H35O3P + 2H2O - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2) }, - new FluidStack[] { towEthyl1Hexanol.getFluidOrGas(2000), Materials.PhosphoricAcid.getFluid(1000), - Materials.Ethanol.getFluid(2000) }, - new FluidStack[] { P507.getFluidOrGas(1000) }, - null, - 1200, - 1920); - - GT_Values.RA.addChemicalRecipeForBasicMachineOnly( - lowQualityNaquadahSolution.get(OrePrefixes.cell, 36), - P507.get(OrePrefixes.cell, 4), - null, - fluorineRichWasteLiquid.getFluidOrGas(10000), - naquadahAdamantiumSolution.get(OrePrefixes.cell, 30), - ItemList.Cell_Empty.get(10), - 4000, - 1920); - - GT_Values.RA.addMultiblockChemicalRecipe( - null, - new FluidStack[] { P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000), }, - new FluidStack[] { fluorineRichWasteLiquid.getFluidOrGas(10000), - naquadahAdamantiumSolution.getFluidOrGas(30000) }, - null, - 4000, - 1920); - - GT_Values.RA.addChemicalRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40), - null, - fluorineRichWasteLiquid.getFluidOrGas(1500), - wasteLiquid.getFluidOrGas(1000), - WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60), - 1000, - 120); - - GT_Values.RA.addUniversalDistillationRecipe( + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2)) + .fluidInputs( + towEthyl1Hexanol.getFluidOrGas(2000), + Materials.PhosphoricAcid.getFluid(1000), + Materials.Ethanol.getFluid(2000)) + .fluidOutputs(P507.getFluidOrGas(1000)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(lowQualityNaquadahSolution.get(OrePrefixes.cell, 36), P507.get(OrePrefixes.cell, 4)) + .itemOutputs(naquadahAdamantiumSolution.get(OrePrefixes.cell, 30), ItemList.Cell_Empty.get(10)) + .fluidOutputs(fluorineRichWasteLiquid.getFluidOrGas(10000)).duration(3 * MINUTES + 20 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(chemicalReactorRecipes); + + GT_Values.RA.stdBuilder().fluidInputs(P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000)) + .fluidOutputs( + fluorineRichWasteLiquid.getFluidOrGas(10000), + naquadahAdamantiumSolution.getFluidOrGas(30000)) + .duration(3 * MINUTES + 20 * SECONDS).eut(TierEU.RECIPE_EV).addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40)) + .fluidInputs(fluorineRichWasteLiquid.getFluidOrGas(1500)).fluidOutputs(wasteLiquid.getFluidOrGas(1000)) + .itemOutputs(WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60)).duration(50 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + + CrackRecipeAdder.addUniversalDistillationRecipe( wasteLiquid.getFluidOrGas(10000), new FluidStack[] { Materials.SaltWater.getFluid(3000), FluidRegistry.getFluidStack("phenol", 2000), Materials.HydrochloricAcid.getFluid(5000) }, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3), - 300, - 480); + 15 * SECONDS, + TierEU.RECIPE_HV); MyRecipeAdder.instance.addNeutronActivatorRecipe( new FluidStack[] { naquadahAdamantiumSolution.getFluidOrGas(3000) }, @@ -256,72 +246,49 @@ public class NaquadahReworkRecipeLoader { 230, 200); - GT_Values.RA.addAutoclaveRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), - null, - naquadahRichSolution.getFluidOrGas(5000), - P507.getFluidOrGas(1000), - naquadahine.get(OrePrefixes.dust, 30), - 10000, - 1000, - 120, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27)) + .fluidInputs(naquadahRichSolution.getFluidOrGas(5000)) + .itemOutputs(naquadahine.get(OrePrefixes.dust, 30)).fluidOutputs(P507.getFluidOrGas(1000)) + .duration(50 * SECONDS).eut(TierEU.RECIPE_MV).addTo(autoclaveRecipes); // NqO2 + C = CO2 + Nq - GT_Values.RA.addBlastRecipe( - naquadahine.get(OrePrefixes.dust, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1), - null, - Materials.CarbonDioxide.getGas(1000), - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1), - null, - 40, - 7680, - 5000); - - GT_Values.RA.addCentrifugeRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), - GT_Utility.getIntegratedCircuit(1), - lowQualityNaquadahEmulsion.getFluidOrGas(10000), - lowQualityNaquadahSolution.getFluidOrGas(9000), - galliumHydroxide.get(OrePrefixes.dust, 64), - galliumHydroxide.get(OrePrefixes.dust, 48), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 15), - null, - null, - null, - new int[] { 6250, 6250, 10000 }, - 1000, - 1920); - - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { enrichedNaquadahEarth.get(OrePrefixes.dust, 4), }, - new FluidStack[] { P507.getFluidOrGas(1000), Materials.SulfuricAcid.getFluid(18000) }, - new FluidStack[] { enrichedNaquadahRichSolution.getFluidOrGas(4000), wasteLiquid.getFluidOrGas(1000) }, - new ItemStack[] { naquadahEarth.get(OrePrefixes.dust, 1), triniumSulphate.get(OrePrefixes.dust, 1) }, - 400, - 1920); + GT_Values.RA.stdBuilder() + .itemInputs( + naquadahine.get(OrePrefixes.dust, 3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) + .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) + .duration(2 * SECONDS).eut(TierEU.RECIPE_IV).metadata(COIL_HEAT, 5000).addTo(blastFurnaceRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), + |