From b846f1dc3a502d157ecf871e2a4a1ff49915f871 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 18:39:10 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../goodgenerator/loader/AchievementLoader.java | 3 +- .../loader/ComponentAssemblyLineMiscRecipes.java | 379 +++--- .../loader/ComponentAssemblyLineRecipeLoader.java | 98 +- .../goodgenerator/loader/FuelRecipeLoader.java | 80 +- .../java/goodgenerator/loader/FuelRodLoader.java | 85 +- src/main/java/goodgenerator/loader/Loaders.java | 406 +++--- .../loader/NaquadahReworkRecipeLoader.java | 491 ++++--- .../loader/NeutronActivatorLoader.java | 24 +- .../java/goodgenerator/loader/RecipeLoader.java | 1003 ++++++--------- .../java/goodgenerator/loader/RecipeLoader_02.java | 1334 +++++++------------- 10 files changed, 1611 insertions(+), 2292 deletions(-) (limited to 'src/main/java/goodgenerator/loader') diff --git a/src/main/java/goodgenerator/loader/AchievementLoader.java b/src/main/java/goodgenerator/loader/AchievementLoader.java index 13d9048092..2df30c8752 100644 --- a/src/main/java/goodgenerator/loader/AchievementLoader.java +++ b/src/main/java/goodgenerator/loader/AchievementLoader.java @@ -1,3 +1,4 @@ package goodgenerator.loader; -public class AchievementLoader {} +public class AchievementLoader { +} diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index f754ac1064..37c22fd31f 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -3,9 +3,19 @@ package goodgenerator.loader; import static goodgenerator.util.ItemRefer.*; import static goodgenerator.util.Log.LOGGER; +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.logging.log4j.Level; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.google.common.collect.HashBiMap; + import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.util.StackUtils; import gregtech.api.enums.GT_Values; @@ -15,32 +25,12 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.recipe.common.CI; -import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import org.apache.logging.log4j.Level; public class ComponentAssemblyLineMiscRecipes { @SuppressWarnings("deprecation") - public static final String[] circuitTierMaterials = { - "Primitive", - "Basic", - "Good", - "Advanced", - "Data", - "Elite", - "Master", - "Ultimate", - "Superconductor", - "Infinite", - "Bio", - "Optical", - "Piko", - "Quantum" - }; + public static final String[] circuitTierMaterials = { "Primitive", "Basic", "Good", "Advanced", "Data", "Elite", + "Master", "Ultimate", "Superconductor", "Infinite", "Bio", "Optical", "Piko", "Quantum" }; static final HashBiMap NameToTier = HashBiMap.create(); @@ -54,8 +44,8 @@ public class ComponentAssemblyLineMiscRecipes { try { Class c = Class.forName("com.dreammaster.gthandler.CustomItemList"); Object maybeSolidifier = c.getMethod("valueOf", String.class).invoke(null, "FluidSolidifierZPM"); - solidifier = - (ItemStack) (c.getMethod("get", long.class, Object[].class).invoke(maybeSolidifier, 16L, null)); + solidifier = (ItemStack) (c.getMethod("get", long.class, Object[].class) + .invoke(maybeSolidifier, 16L, null)); if (GT_Utility.isStackValid(solidifier)) LOGGER.log(Level.INFO, "ZPM Fluid Solidifier found."); else throw new NullPointerException(); } catch (Exception e) { @@ -67,25 +57,15 @@ public class ComponentAssemblyLineMiscRecipes { 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), - 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) - }, + 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), + 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); @@ -96,16 +76,13 @@ public class ComponentAssemblyLineMiscRecipes { int t = 1; // lv 1 GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - 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), - }, + new ItemStack[] { 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, @@ -113,17 +90,14 @@ public class ComponentAssemblyLineMiscRecipes { // mv 2 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - 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) - }, + new ItemStack[] { 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, @@ -131,17 +105,14 @@ public class ComponentAssemblyLineMiscRecipes { // hv 3 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - 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) - }, + new ItemStack[] { 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, @@ -149,17 +120,14 @@ public class ComponentAssemblyLineMiscRecipes { // ev 4 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - 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) - }, + new ItemStack[] { 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, @@ -167,17 +135,14 @@ public class ComponentAssemblyLineMiscRecipes { // iv 5 t++; GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - 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) - }, + new ItemStack[] { 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, @@ -190,24 +155,17 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_IV.get(1), 2250 << t, - new Object[] { - 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) - }, - 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)) - }, + new Object[] { 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) }, + 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); @@ -216,24 +174,17 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_LuV.get(1), 2250 << t, - new Object[] { - 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)) - }, + new Object[] { 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); @@ -242,24 +193,17 @@ public class ComponentAssemblyLineMiscRecipes { GT_Values.RA.addAssemblylineRecipe( Compassline_Casing_ZPM.get(1), 2250 << t, - new Object[] { - 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)) - }, + new Object[] { 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); @@ -271,24 +215,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 500000, 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)) - }, + 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 * 20, 500000); @@ -301,24 +238,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 2000000, 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)) - }, + 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 * 20, 2000000); @@ -330,24 +260,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 8000000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.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, Materials.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.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)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.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, Materials.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.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 * 20, 8000000); @@ -359,24 +282,17 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 32000000, 1, - new Object[] { - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.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, Materials.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.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)) - }, + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.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, Materials.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.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, 32000000); @@ -389,26 +305,22 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateWrapRecipes() { for (int i = 0; i <= 11; i++) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)}, + 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.addAssemblerRecipe( - new ItemStack[] { - GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), - GT_Utility.getIntegratedCircuit(16) - }, + 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) - }, + new ItemStack[] { GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), + GT_Utility.getIntegratedCircuit(16) }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, 13), 30 * 20, @@ -417,6 +329,7 @@ public class ComponentAssemblyLineMiscRecipes { @SuppressWarnings("unused") private enum ComponentType { + Electric_Motor, Electric_Piston, Robot_Arm, @@ -437,7 +350,7 @@ public class ComponentAssemblyLineMiscRecipes { } private static Object[] getALCircuit(int tier, int amount) { - return new Object[] {OrePrefixes.circuit.get(getCircuitMaterial(tier)), amount}; + return new Object[] { OrePrefixes.circuit.get(getCircuitMaterial(tier)), amount }; } @Nullable diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index 8cef4a492d..ced594689e 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -2,6 +2,18 @@ package goodgenerator.loader; import static goodgenerator.util.StackUtils.*; +import java.util.*; +import java.util.stream.Collectors; + +import javax.annotation.Nullable; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import org.apache.commons.lang3.tuple.Pair; + import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -12,28 +24,13 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.common.items.GT_IntegratedCircuit_Item; -import java.util.*; -import java.util.stream.Collectors; -import javax.annotation.Nullable; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.commons.lang3.tuple.Pair; public class ComponentAssemblyLineRecipeLoader { - private static final String[] compPrefixes = { - "Electric_Motor_", - "Electric_Piston_", - "Electric_Pump_", - "Robot_Arm_", - "Conveyor_Module_", - "Emitter_", - "Sensor_", - "Field_Generator_", - }; - private static final String[] blacklistedDictPrefixes = {"circuit"}; - private static final String[] softBlacklistedDictPrefixes = {"Any", "crafting"}; + + private static final String[] compPrefixes = { "Electric_Motor_", "Electric_Piston_", "Electric_Pump_", + "Robot_Arm_", "Conveyor_Module_", "Emitter_", "Sensor_", "Field_Generator_", }; + private static final String[] blacklistedDictPrefixes = { "circuit" }; + private static final String[] softBlacklistedDictPrefixes = { "Any", "crafting" }; private static LinkedHashMap, Pair> allAssemblerRecipes; private static LinkedHashMap, Pair> allAsslineRecipes; @@ -94,6 +91,7 @@ public class ComponentAssemblyLineRecipeLoader { } }); } + /** Assembly Line Recipes (LuV+) **/ private static void generateAsslineRecipes() { allAsslineRecipes.forEach((recipeList, info) -> { @@ -103,8 +101,7 @@ public class ComponentAssemblyLineRecipeLoader { 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 @@ -129,10 +126,10 @@ public class ComponentAssemblyLineRecipeLoader { ItemData data = GT_OreDictUnificator.getAssociation(input); // 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)); + if (data != null && data.mPrefix == OrePrefixes.circuit) fixedInputs.addAll( + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), + INPUT_MULTIPLIER)); else fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } } @@ -199,18 +196,18 @@ public class ComponentAssemblyLineRecipeLoader { inputs.addAll(newInputs); } - /** Tries to convert {@code input} into its molten form. - * Because the internal names for material fluids in GT5u, GT++, and BartWorks follow the same naming scheme, - * this method should work for any {@code ItemStack} from any of the 3 material systems. - * */ + /** + * Tries to convert {@code input} into its molten form. Because the internal names for material fluids in GT5u, + * GT++, and BartWorks follow the same naming scheme, this method should work for any {@code ItemStack} from any of + * the 3 material systems. + */ @Nullable private static FluidStack tryConvertItemStackToFluidMaterial(ItemStack input) { ArrayList oreDicts = new ArrayList<>(); for (int id : OreDictionary.getOreIDs(input)) { oreDicts.add(OreDictionary.getOreName(id)); } - oreDictLoop: - for (String dict : oreDicts) { + oreDictLoop: for (String dict : oreDicts) { for (String blacklistedPrefix : blacklistedDictPrefixes) { if (dict.startsWith(blacklistedPrefix)) { return null; @@ -232,19 +229,22 @@ public class ComponentAssemblyLineRecipeLoader { // 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); + if (strippedOreDict.contains("PTMEG")) return FluidRegistry.getFluidStack( + "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); } return null; } + /** * Gives the longest Ore Prefix that the OreDictionary string starts with. This makes it the most accurate prefix. * For example: If your OreDictionary is something like {@code gearGtSmallSpaceTime}, a conventional search would - * return something like {@code gearGt} instead of {@code gearGtSmall}. This makes the longer String the most accurate. + * return something like {@code gearGt} instead of {@code gearGtSmall}. This makes the longer String the most + * accurate. + * * @param oreDict The Ore Dictionary entry * @return The longest ore prefix that the OreDict string starts with. This makes it the most accurate prefix. */ @@ -262,11 +262,12 @@ public class ComponentAssemblyLineRecipeLoader { } return matchingPrefix; } + /** - * Transforms each {@code ItemStack}, if possible, into a more compact form. - * For example, a stack of 16 1x cables, when passed into the {@code items} array, - * will be converted into a single 16x cable. Also handles GraviStar conversion. - * */ + * Transforms each {@code ItemStack}, if possible, into a more compact form. For example, a stack of 16 1x cables, + * when passed into the {@code items} array, will be converted into a single 16x cable. Also handles GraviStar + * conversion. + */ private static ArrayList compactItems(List items, int tier) { ArrayList stacks = new ArrayList<>(); HashMap totals = getTotalItems(items); @@ -275,8 +276,7 @@ public class ComponentAssemblyLineRecipeLoader { ItemData data = GT_OreDictUnificator.getAssociation(itemstack); boolean isCompacted = false; - for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)) - .mapToObj(OreDictionary::getOreName) + for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)).mapToObj(OreDictionary::getOreName) .collect(Collectors.toList())) { if (dict.startsWith("circuit")) { stacks.addAll(getWrappedCircuits(itemstack, totalItems, dict)); @@ -300,12 +300,15 @@ public class ComponentAssemblyLineRecipeLoader { stacks = mergeStacks(stacks); return stacks; } + /** A helper method for compacting items */ - private static void compactorHelper( - ItemData data, OrePrefixes compactInto, ArrayList output, int total) { + private static void compactorHelper(ItemData data, OrePrefixes compactInto, ArrayList output, + int total) { int materialRatio = (int) ((double) compactInto.mMaterialAmount / data.mPrefix.mMaterialAmount); - output.addAll(multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), total / materialRatio)); + output.addAll( + multiplyAndSplitIntoStacks( + GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), + total / materialRatio)); } /** @@ -329,8 +332,7 @@ public class ComponentAssemblyLineRecipeLoader { allAssemblerRecipes.put(foundRecipes, Pair.of(currentComponent, t)); } else { ArrayList foundRecipes = new ArrayList<>(); - for (GT_Recipe.GT_Recipe_AssemblyLine recipe : - GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { + for (GT_Recipe.GT_Recipe_AssemblyLine recipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { if (GT_Utility.areStacksEqual(currentComponent.get(1), recipe.mOutput)) { foundRecipes.add(recipe); } diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 8cf7e37902..bd102bc310 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -3,18 +3,21 @@ package goodgenerator.loader; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import goodgenerator.items.MyMaterial; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; public class FuelRecipeLoader { + public static void RegisterFuel() { // 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); @@ -60,30 +63,23 @@ public class FuelRecipeLoader { NaquadahFuelTime[7]); 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), - }, + 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); 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), - }, + 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, @@ -91,30 +87,22 @@ public class FuelRecipeLoader { // 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), - }, + 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); MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("heavyradox", 1000), - }, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32), - }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + FluidRegistry.getFluidStack("heavyradox", 1000), }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 16), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500), 100000000, 200, @@ -122,15 +110,11 @@ public class FuelRecipeLoader { // Alternate higher tier recipe MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( - new FluidStack[] { - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("heavyradox", 1000), - }, - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 16), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), - }, + new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + FluidRegistry.getFluidStack("heavyradox", 1000), }, + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 16), + MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750), 300000000, 200, diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java index 93555a834d..6c88509c6c 100644 --- a/src/main/java/goodgenerator/loader/FuelRodLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java @@ -2,12 +2,13 @@ package goodgenerator.loader; import static goodgenerator.util.DescTextLocalization.addText; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.DepletedFuelRod; import goodgenerator.items.FuelRod; import goodgenerator.main.GoodGenerator; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class FuelRodLoader { @@ -38,41 +39,81 @@ public class FuelRodLoader { public static void RegisterRod() { rodCompressedUraniumDepleted = new DepletedFuelRod( - "rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); + "rodCompressedUraniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 100); rodCompressedUraniumDepleted_2 = new DepletedFuelRod( - "rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); + "rodCompressedUraniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 200); rodCompressedUraniumDepleted_4 = new DepletedFuelRod( - "rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); + "rodCompressedUraniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 400); rodCompressedPlutoniumDepleted = new DepletedFuelRod( - "rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); + "rodCompressedPlutoniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 120); rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod( - "rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); + "rodCompressedPlutoniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 240); rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod( - "rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); + "rodCompressedPlutoniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 480); rodLiquidUraniumDepleted = new DepletedFuelRod( - "rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800); + "rodLiquidUraniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 800); rodLiquidUraniumDepleted_2 = new DepletedFuelRod( - "rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600); + "rodLiquidUraniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 1600); rodLiquidUraniumDepleted_4 = new DepletedFuelRod( - "rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200); + "rodLiquidUraniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 3200); rodLiquidPlutoniumDepleted = new DepletedFuelRod( - "rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000); + "rodLiquidPlutoniumDepleted", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 1000); rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod( - "rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000); + "rodLiquidPlutoniumDepleted2", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 2000); rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod( - "rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 4000); + "rodLiquidPlutoniumDepleted4", + addText("depletedfuelrod.tooltip", 1), + GoodGenerator.GG, + 4000); GameRegistry.registerItem(rodCompressedUraniumDepleted, "rodCompressedUraniumDepleted", GoodGenerator.MOD_ID); + GameRegistry + .registerItem(rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID); + GameRegistry + .registerItem(rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID); + GameRegistry + .registerItem(rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID); GameRegistry.registerItem( - rodCompressedUraniumDepleted_2, "rodCompressedUraniumDepleted2", GoodGenerator.MOD_ID); - GameRegistry.registerItem( - rodCompressedUraniumDepleted_4, "rodCompressedUraniumDepleted4", GoodGenerator.MOD_ID); - GameRegistry.registerItem( - rodCompressedPlutoniumDepleted, "rodCompressedPlutoniumDepleted", GoodGenerator.MOD_ID); - GameRegistry.registerItem( - rodCompressedPlutoniumDepleted_2, "rodCompressedPlutoniumDepleted2", GoodGenerator.MOD_ID); + rodCompressedPlutoniumDepleted_2, + "rodCompressedPlutoniumDepleted2", + GoodGenerator.MOD_ID); GameRegistry.registerItem( - rodCompressedPlutoniumDepleted_4, "rodCompressedPlutoniumDepleted4", GoodGenerator.MOD_ID); + rodCompressedPlutoniumDepleted_4, + "rodCompressedPlutoniumDepleted4", + GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidUraniumDepleted, "rodLiquidUraniumDepleted", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidUraniumDepleted_2, "rodLiquidUraniumDepleted2", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidUraniumDepleted_4, "rodLiquidUraniumDepleted4", GoodGenerator.MOD_ID); diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 0251c6753b..5867109135 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -2,6 +2,11 @@ package goodgenerator.loader; import static goodgenerator.util.DescTextLocalization.addText; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; @@ -30,10 +35,6 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class Loaders { @@ -44,20 +45,27 @@ public class Loaders { public static final Item radiationProtectionPlate = new MyItems("radiationProtectionPlate", GoodGenerator.GG); public static final Item wrappedUraniumIngot = new MyItems("wrappedUraniumIngot", GoodGenerator.GG); - public static final Item highDensityUraniumNugget = - new RadioactiveItem("highDensityUraniumNugget", GoodGenerator.GG, 200); + public static final Item highDensityUraniumNugget = new RadioactiveItem( + "highDensityUraniumNugget", + GoodGenerator.GG, + 200); public static final Item highDensityUranium = new RadioactiveItem("highDensityUranium", GoodGenerator.GG, 1800); public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot", GoodGenerator.GG); - public static final Item highDensityThoriumNugget = - new RadioactiveItem("highDensityThoriumNugget", GoodGenerator.GG, 50); + public static final Item highDensityThoriumNugget = new RadioactiveItem( + "highDensityThoriumNugget", + GoodGenerator.GG, + 50); public static final Item highDensityThorium = new RadioactiveItem("highDensityThorium", GoodGenerator.GG, 450); public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot", GoodGenerator.GG); - public static final Item highDensityPlutoniumNugget = - new RadioactiveItem("highDensityPlutoniumNugget", GoodGenerator.GG, 450); + public static final Item highDensityPlutoniumNugget = new RadioactiveItem( + "highDensityPlutoniumNugget", + GoodGenerator.GG, + 450); public static final Item highDensityPlutonium = new RadioactiveItem("highDensityPlutonium", GoodGenerator.GG, 4050); public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst", GoodGenerator.GG); - public static final Item advancedRadiationProtectionPlate = - new MyItems("advancedRadiationProtectionPlate", GoodGenerator.GG); + public static final Item advancedRadiationProtectionPlate = new MyItems( + "advancedRadiationProtectionPlate", + GoodGenerator.GG); public static final Item aluminumNitride = new MyItems("aluminumNitride", "AlN", GoodGenerator.GG); public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG); public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG); @@ -68,151 +76,154 @@ public class Loaders { public static final Item quartzCrystalResonator = new MyItems("quartzCrystalResonator", GoodGenerator.GG); public static final Item inverter = new MyItems("inverter", addText("inverter.tooltip", 1), GoodGenerator.GG); public static final Item neutronSource = new MyItems("neutronSource", GoodGenerator.GG); - public static final Item naquadahMass = - new MyItems("naquadahMass", addText("naquadahMass.tooltip", 1), GoodGenerator.GG); - public static final Item enrichedNaquadahMass = - new MyItems("enrichedNaquadahMass", addText("enrichedNaquadahMass.tooltip", 1), GoodGenerator.GG); - public static final Item naquadriaMass = - new MyItems("naquadriaMass", addText("naquadriaMass.tooltip", 1), GoodGenerator.GG); + public static final Item naquadahMass = new MyItems( + "naquadahMass", + addText("naquadahMass.tooltip", 1), + GoodGenerator.GG); + public static final Item enrichedNaquadahMass = new MyItems( + "enrichedNaquadahMass", + addText("enrichedNaquadahMass.tooltip", 1), + GoodGenerator.GG); + public static final Item naquadriaMass = new MyItems( + "naquadriaMass", + addText("naquadriaMass.tooltip", 1), + GoodGenerator.GG); public static final Item advancedFuelRod = new MyItems("advancedFuelRod", GoodGenerator.GG); - public static final Item fluidCore = new MyItems("fluidCore", GoodGenerator.GG, new String[] { - GoodGenerator.MOD_ID + ":fluidCore/1", - GoodGenerator.MOD_ID + ":fluidCore/2", - GoodGenerator.MOD_ID + ":fluidCore/3", - GoodGenerator.MOD_ID + ":fluidCore/4", - GoodGenerator.MOD_ID + ":fluidCore/5", - GoodGenerator.MOD_ID + ":fluidCore/6", - GoodGenerator.MOD_ID + ":fluidCore/7", - GoodGenerator.MOD_ID + ":fluidCore/8", - GoodGenerator.MOD_ID + ":fluidCore/9", - GoodGenerator.MOD_ID + ":fluidCore/10" - }); - public static final Item upgradeEssentia = new MyItems("upgradeEssentia", GoodGenerator.GG, new String[] {