From 84481c22d7d4e0834de97a150d257ce6e85ad690 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 25 May 2024 14:05:54 +0100 Subject: Update spotless to the GT5u version --- .../loader/ComponentAssemblyLineMiscRecipes.java | 614 ++--- .../loader/ComponentAssemblyLineRecipeLoader.java | 109 +- .../goodgenerator/loader/FuelRecipeLoader.java | 216 +- .../java/goodgenerator/loader/FuelRodLoader.java | 318 ++- src/main/java/goodgenerator/loader/Loaders.java | 362 ++- .../loader/NaquadahReworkRecipeLoader.java | 983 ++++---- .../loader/NeutronActivatorLoader.java | 46 +- .../java/goodgenerator/loader/RecipeLoader.java | 2077 +++++++++------- .../java/goodgenerator/loader/RecipeLoader_02.java | 2554 +++++++++++--------- 9 files changed, 4051 insertions(+), 3228 deletions(-) (limited to 'src/main/java/goodgenerator/loader') diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index 21ee302a6c..f83712c7db 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -53,7 +53,7 @@ import gtPlusPlus.core.recipe.common.CI; public class ComponentAssemblyLineMiscRecipes { public static final String[] circuitTierMaterials = { "Primitive", "Basic", "Good", "Advanced", "Data", "Elite", - "Master", "Ultimate", "Superconductor", "Infinite", "Bio", "Optical", "Piko", "Quantum" }; + "Master", "Ultimate", "Superconductor", "Infinite", "Bio", "Optical", "Piko", "Quantum" }; static final HashMap NameToTier = new HashMap<>(); @@ -68,9 +68,10 @@ public class ComponentAssemblyLineMiscRecipes { ItemStack solidifier; try { Class c = Class.forName("com.dreammaster.gthandler.CustomItemList"); - Object maybeSolidifier = c.getMethod("valueOf", String.class).invoke(null, "FluidSolidifierZPM"); + Object maybeSolidifier = c.getMethod("valueOf", String.class) + .invoke(null, "FluidSolidifierZPM"); solidifier = (ItemStack) (c.getMethod("get", long.class, Object[].class) - .invoke(maybeSolidifier, 16L, null)); + .invoke(maybeSolidifier, 16L, null)); if (GT_Utility.isStackValid(solidifier)) LOGGER.log(Level.INFO, "ZPM Fluid Solidifier found."); else throw new NullPointerException(); } catch (Exception e) { @@ -79,27 +80,33 @@ public class ComponentAssemblyLineMiscRecipes { } // The controller itself - 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)) - .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); + 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)) + .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 */ @@ -107,301 +114,360 @@ public class ComponentAssemblyLineMiscRecipes { int t = 1; // lv 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)) - .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) - .itemOutputs(Compassline_Casing_LV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) - .addTo(assemblerRecipes); + .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)) + .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.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)) - .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) - .itemOutputs(Compassline_Casing_MV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) - .addTo(assemblerRecipes); + .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)) + .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.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)) - .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) - .itemOutputs(Compassline_Casing_HV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) - .addTo(assemblerRecipes); + .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)) + .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.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)) - .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) - .itemOutputs(Compassline_Casing_EV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) - .addTo(assemblerRecipes); + .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)) + .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.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)) - .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) - .itemOutputs(Compassline_Casing_IV.get(1)).duration(16 * SECONDS).eut(GT_Values.VP[t]) - .addTo(assemblerRecipes); + .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)) + .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.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), - ComponentType.Electric_Motor.getComponent(t).get(16), - 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)) - .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); + 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), + ComponentType.Electric_Motor.getComponent(t) + .get(16), + 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)) + .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.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)) - .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); + 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)) + .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.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)) - .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); + 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)) + .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), - (int) TierEU.RECIPE_UV, - 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 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.CosmicNeutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 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_UHV.get(1), - 50 * SECONDS, - (int) TierEU.RECIPE_UV); + Compassline_Casing_UV.get(1), + 375 << (t - 2), + 1 << (t - 3), + (int) TierEU.RECIPE_UV, + 1, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 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.CosmicNeutronium, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 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_UHV.get(1), + 50 * SECONDS, + (int) TierEU.RECIPE_UV); sold = FluidRegistry.getFluid("molten.mutatedlivingsolder"); // uev 10 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( - Compassline_Casing_UHV.get(1), - 375 << (t - 2), - 1 << (t - 3), - (int) TierEU.RECIPE_UHV, - 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 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.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 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_UEV.get(1), - 50 * SECONDS, - (int) TierEU.RECIPE_UHV); + Compassline_Casing_UHV.get(1), + 375 << (t - 2), + 1 << (t - 3), + (int) TierEU.RECIPE_UHV, + 1, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 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.Infinity, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 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_UEV.get(1), + 50 * SECONDS, + (int) TierEU.RECIPE_UHV); // uiv 11 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( - Compassline_Casing_UEV.get(1), - 375 << (t - 2), - 1 << (t - 3), - (int) TierEU.RECIPE_UEV, - 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 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, MaterialsUEVplus.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 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_UIV.get(1), - 50 * SECONDS, - (int) TierEU.RECIPE_UEV); + Compassline_Casing_UEV.get(1), + 375 << (t - 2), + 1 << (t - 3), + (int) TierEU.RECIPE_UEV, + 1, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 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, MaterialsUEVplus.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 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_UIV.get(1), + 50 * SECONDS, + (int) TierEU.RECIPE_UEV); // umv 12 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( - Compassline_Casing_UIV.get(1), - 375 << (t - 2), - 1 << (t - 3), - (int) TierEU.RECIPE_UIV, - 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 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, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), - getALCircuit(t - 1, 16) }, - new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), - StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, - Compassline_Casing_UMV.get(1), - 50 * 20, - (int) TierEU.RECIPE_UIV); + Compassline_Casing_UIV.get(1), + 375 << (t - 2), + 1 << (t - 3), + (int) TierEU.RECIPE_UIV, + 1, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 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, MaterialsUEVplus.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), + GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, + Compassline_Casing_UMV.get(1), + 50 * 20, + (int) TierEU.RECIPE_UIV); // uxv 13 t++; TT_recipeAdder.addResearchableAssemblylineRecipe( - Compassline_Casing_UMV.get(1), - 375 << (t - 2), - 1 << (t - 3), - (int) TierEU.RECIPE_UMV, - 1, - new Object[] { GT_OreDictUnificator - .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), - GT_OreDictUnificator.get( - OrePrefixes.plateDense, - MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, - 3), - MyMaterial.shirabon.get(OrePrefixes.plateDense, 3), - 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, - MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, - 2), - MyMaterial.shirabon.get(OrePrefixes.gearGt, 2), - GT_OreDictUnificator.get( - OrePrefixes.gearGtSmall, - MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, - 8), - MyMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), - getALCircuit(t, 8), getALCircuit(t - 1, 16) }, - new FluidStack[] { new FluidStack(sold, 144 * t * 4), - MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), - MaterialsUEVplus.Eternity.getMolten(144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, - Compassline_Casing_UXV.get(1), - 50 * SECONDS, - (int) TierEU.RECIPE_UMV); + Compassline_Casing_UMV.get(1), + 375 << (t - 2), + 1 << (t - 3), + (int) TierEU.RECIPE_UMV, + 1, + new Object[] { + GT_OreDictUnificator + .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), + GT_OreDictUnificator + .get(OrePrefixes.plateDense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3), + MyMaterial.shirabon.get(OrePrefixes.plateDense, 3), 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, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2), + MyMaterial.shirabon.get(OrePrefixes.gearGt, 2), + GT_OreDictUnificator + .get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8), + MyMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8), + getALCircuit(t - 1, 16) }, + new FluidStack[] { new FluidStack(sold, 144 * t * 4), + MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t), + Materials.Lubricant.getFluid(1000 * (t - 2)) }, + Compassline_Casing_UXV.get(1), + 50 * SECONDS, + (int) TierEU.RECIPE_UMV); } private static void generateWrapRecipes() { for (int i = 0; i <= 11; i++) { - 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.stdBuilder() - .itemInputs( - GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), - GT_Utility.getIntegratedCircuit(16)) + GT_Values.RA.stdBuilder() + .itemInputs(getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) - .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 12)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV) + .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, i)) + .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); + .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/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index a77dfad5f7..f1b16089d9 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -36,7 +36,7 @@ import gregtech.common.items.GT_IntegratedCircuit_Item; public class ComponentAssemblyLineRecipeLoader { private static final String[] compPrefixes = { "Electric_Motor_", "Electric_Piston_", "Electric_Pump_", - "Robot_Arm_", "Conveyor_Module_", "Emitter_", "Sensor_", "Field_Generator_", }; + "Robot_Arm_", "Conveyor_Module_", "Emitter_", "Sensor_", "Field_Generator_", }; private static final String[] blacklistedDictPrefixes = { "circuit" }; private static final String[] softBlacklistedDictPrefixes = { "Any", "crafting", "nanite" }; private static final String moltenMHDCSM = "molten.magnetohydrodynamicallyconstrainedstarmatter"; @@ -108,12 +108,13 @@ public class ComponentAssemblyLineRecipeLoader { int tier = info.getRight(); int energy = (int) Math.min(Integer.MAX_VALUE - 7, GT_Values.VP[tier - 1]); MyRecipeAdder.instance.addComponentAssemblyLineRecipe( - fixedInputs.toArray(new ItemStack[0]), - fixedFluids.toArray(new FluidStack[0]), - info.getLeft().get(OUTPUT_MULTIPLIER), - recipe.mDuration * INPUT_MULTIPLIER, - energy, - info.getRight()); + fixedInputs.toArray(new ItemStack[0]), + fixedFluids.toArray(new FluidStack[0]), + info.getLeft() + .get(OUTPUT_MULTIPLIER), + recipe.mDuration * INPUT_MULTIPLIER, + energy, + info.getRight()); } } }); @@ -125,10 +126,13 @@ public class ComponentAssemblyLineRecipeLoader { for (GT_Recipe.GT_Recipe_AssemblyLine recipe : recipeList) { if (recipe != null) { int componentCircuit = -1; - for (int i = 0; i < compPrefixes.length; i++) - if (info.getLeft().toString().startsWith(compPrefixes[i])) componentCircuit = i + 1; + for (int i = 0; i < compPrefixes.length; i++) if (info.getLeft() + .toString() + .startsWith(compPrefixes[i])) componentCircuit = i + 1; if (componentCircuit == -1) { - throw new NullPointerException("Wrong circuit. Comp: " + info.getLeft().toString()); + throw new NullPointerException( + "Wrong circuit. Comp: " + info.getLeft() + .toString()); } final boolean addProgrammedCircuit = componentCircuit <= 7; // Arrays of the item and fluid inputs, that are updated to be multiplied and/or condensed in the @@ -154,9 +158,9 @@ public class ComponentAssemblyLineRecipeLoader { // trying to fix some circuit oredicting issues if (data != null && data.mPrefix == OrePrefixes.circuit) fixedInputs.addAll( - multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), - INPUT_MULTIPLIER)); + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), + INPUT_MULTIPLIER)); else fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } } @@ -170,12 +174,13 @@ public class ComponentAssemblyLineRecipeLoader { addEternityForMHDCSM(fixedFluids); MyRecipeAdder.instance.addComponentAssemblyLineRecipe( - fixedInputs.toArray(new ItemStack[0]), - fixedFluids.toArray(new FluidStack[0]), - info.getLeft().get(OUTPUT_MULTIPLIER), // The component output - recipe.mDuration * INPUT_MULTIPLIER, // Takes as long as this many - recipe.mEUt, - info.getRight()); // Casing tier + fixedInputs.toArray(new ItemStack[0]), + fixedFluids.toArray(new FluidStack[0]), + info.getLeft() + .get(OUTPUT_MULTIPLIER), // The component output + recipe.mDuration * INPUT_MULTIPLIER, // Takes as long as this many + recipe.mEUt, + info.getRight()); // Casing tier // Add a second recipe using Styrene-Butadiene // Rubber instead of Silicone Rubber. @@ -184,12 +189,13 @@ public class ComponentAssemblyLineRecipeLoader { // it's also the least invasive change. if (swapSiliconeForStyreneButadiene(fixedFluids)) { MyRecipeAdder.instance.addComponentAssemblyLineRecipe( - fixedInputs.toArray(new ItemStack[0]), - fixedFluids.toArray(new FluidStack[0]), - info.getLeft().get(OUTPUT_MULTIPLIER), // The component output - recipe.mDuration * INPUT_MULTIPLIER, // Takes as long as this many - recipe.mEUt, - info.getRight()); // Casing tier + fixedInputs.toArray(new ItemStack[0]), + fixedFluids.toArray(new FluidStack[0]), + info.getLeft() + .get(OUTPUT_MULTIPLIER), // The component output + recipe.mDuration * INPUT_MULTIPLIER, // Takes as long as this many + recipe.mEUt, + info.getRight()); // Casing tier } } } @@ -225,7 +231,8 @@ public class ComponentAssemblyLineRecipeLoader { foundFluidStack.amount *= count; boolean alreadyHasFluid = false; for (FluidStack fluidstack : fluidOutputs) { - if (foundFluidStack.getFluid().equals(fluidstack.getFluid())) { + if (foundFluidStack.getFluid() + .equals(fluidstack.getFluid())) { fluidstack.amount += foundFluidStack.amount; alreadyHasFluid = true; break; @@ -274,16 +281,18 @@ public class ComponentAssemblyLineRecipeLoader { continue; } - String strippedOreDict = dict.substring(orePrefix.toString().length()); + String strippedOreDict = dict.substring( + orePrefix.toString() + .length()); // Prevents things like AnyCopper or AnyIron from messing the search up. if (strippedOreDict.contains("Any")) continue; if (strippedOreDict.contains("PTMEG")) return FluidRegistry.getFluidStack( - "molten.silicone", - (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + "molten.silicone", + (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); return FluidRegistry.getFluidStack( - "molten." + strippedOreDict.toLowerCase(), - (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + "molten." + strippedOreDict.toLowerCase(), + (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); } return null; } @@ -325,8 +334,9 @@ public class ComponentAssemblyLineRecipeLoader { ItemData data = GT_OreDictUnificator.getAssociation(itemstack); boolean isCompacted = false; - for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)).mapToObj(OreDictionary::getOreName) - .collect(Collectors.toList())) { + for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)) + .mapToObj(OreDictionary::getOreName) + .collect(Collectors.toList())) { if (dict.startsWith("circuit")) { stacks.addAll(getWrappedCircuits(itemstack, totalItems, dict)); isCompacted = true; @@ -351,11 +361,11 @@ public class ComponentAssemblyLineRecipeLoader { isCompacted = true; } if (GT_Utility - .areStacksEqual(itemstack, GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 1))) { + .areStacksEqual(itemstack, GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 1))) { stacks.addAll( - multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Gold, 1), - totalItems / 16)); + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Gold, 1), + totalItems / 16)); isCompacted = true; } if (!isCompacted) stacks.addAll(multiplyAndSplitIntoStacks(itemstack, totalItems)); @@ -366,12 +376,12 @@ public class ComponentAssemblyLineRecipeLoader { /** A helper method for compacting items */ private static void compactorHelper(ItemData data, OrePrefixes compactInto, ArrayList output, - int total) { + int total) { int materialRatio = (int) ((double) compactInto.mMaterialAmount / data.mPrefix.mMaterialAmount); output.addAll( - multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), - total / materialRatio)); + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), + total / materialRatio)); } /** @@ -427,10 +437,10 @@ public class ComponentAssemblyLineRecipeLoader { if (total >= FLUID_CONVERSION_STACKSIZE_THRESHOLD) { double multiplier = magnetoConversionMultipliers.get(data.mPrefix); stacks.addAll( - getWrappedCircuits( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 1), - (int) (total * multiplier), - "circuitInfinite")); + getWrappedCircuits( + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 1), + (int) (total * multiplier), + "circuitInfinite")); } stacks.addAll(multiplyAndSplitIntoStacks(item, total)); return stacks; @@ -442,11 +452,13 @@ public class ComponentAssemblyLineRecipeLoader { int mhdcsmAmount = 0; for (FluidStack fluidstack : fluidInputs) { - if (fluidstack.getFluid().equals(FluidRegistry.getFluid(moltenMHDCSM))) { + if (fluidstack.getFluid() + .equals(FluidRegistry.getFluid(moltenMHDCSM))) { mhdcsm = true; mhdcsmAmount = fluidstack.amount; } - if (fluidstack.getFluid().equals(FluidRegistry.getFluid("molten.eternity"))) { + if (fluidstack.getFluid() + .equals(FluidRegistry.getFluid("molten.eternity"))) { eternity = true; } } @@ -461,7 +473,8 @@ public class ComponentAssemblyLineRecipeLoader { private static boolean swapSiliconeForStyreneButadiene(ArrayList fluidInputs) { for (int i = 0; i < fluidInputs.size(); i++) { FluidStack fluidstack = fluidInputs.get(i); - if (fluidstack.getFluid().equals(FluidRegistry.getFluid("molten.silicone"))) { + if (fluidstack.getFluid() + .equals(FluidRegistry.getFluid("molten.silicone"))) { fluidInputs.set(i, FluidRegistry.getFluidStack("molten.styrenebutadienerubber", fluidstack.amount)); return true; } diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 91a07fe09a..2a1981b201 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -25,144 +25,144 @@ public class FuelRecipeLoader { // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100); // MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[0], - NaquadahFuelTime[0]); + MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), + MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[0], + NaquadahFuelTime[0]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[1], - NaquadahFuelTime[1]); + MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), + MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[1], + NaquadahFuelTime[1]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[2], - NaquadahFuelTime[2]); + MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), + MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[2], + NaquadahFuelTime[2]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[3], - NaquadahFuelTime[3]); + MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[3], + NaquadahFuelTime[3]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[4], - NaquadahFuelTime[4]); + MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[4], + NaquadahFuelTime[4]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[5], - NaquadahFuelTime[5]); + MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[5], + NaquadahFuelTime[5]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[6], - NaquadahFuelTime[6]); + MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[6], + NaquadahFuelTime[6]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[7], - NaquadahFuelTime[7]); + MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[7], + NaquadahFuelTime[7]); MyRecipeAdder.instance.addLiquidMentalFuel( - MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1), - NaquadahFuelVoltage[8], - NaquadahFuelTime[8]); + MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1), + MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1), + NaquadahFuelVoltage[8], + NaquadahFuelTime[8]); // MK III Naquadah Fuel MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), }, - new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), - WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), ItemRefer.High_Density_Uranium.get(2), - ItemRefer.High_Density_Plutonium.get(1), }, - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100), - 1100000, - 100, - 1); + new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), + MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), + WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), ItemRefer.High_Density_Uranium.get(2), + ItemRefer.High_Density_Plutonium.get(1), }, + MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100), + 1100000, + 100, + 1); // Alternative higher tier recipe MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), }, - new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), - GT_ModHandler.getModItem("miscutils", "itemDustChromaticGlass", 9), - ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1), }, - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200), - 2100000, - 100, - 1); + new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), + MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), + GT_ModHandler.getModItem("miscutils", "itemDustChromaticGlass", 9), + ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1), }, + MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200), + 2100000, + 100, + 1); // MK IV Naquadah Fuel MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), - Materials.Praseodymium.getMolten(9216L) }, - new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 32), }, - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250), - 46000000, - 160, - 2); + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), + Materials.Praseodymium.getMolten(9216L) }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + MyMaterial.orundum.get(OrePrefixes.dust, 32), }, + MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250), + 46000000, + 160, + 2); // Alternate higher tier recipe MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), - new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 1440) }, - new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 64), }, - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500), - 75000000, - 160, - 2); + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), + new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 1440) }, + new ItemStack[] { MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), +