From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../registration/gregtech/Gregtech4Content.java | 55 +- .../gregtech/GregtechAdvancedBoilers.java | 160 +-- .../gregtech/GregtechBedrockPlatforms.java | 19 +- .../gregtech/GregtechBufferDynamos.java | 220 ++-- .../gregtech/GregtechComponentAssembler.java | 310 +++--- .../registration/gregtech/GregtechConduits.java | 1069 ++++++++++---------- .../gregtech/GregtechCustomHatches.java | 152 ++- .../registration/gregtech/GregtechDehydrator.java | 218 ++-- .../gregtech/GregtechEnergyBuffer.java | 192 ++-- .../GregtechFactoryGradeReplacementMultis.java | 24 +- .../gregtech/GregtechFluidReactor.java | 18 +- .../gregtech/GregtechGeneratorsULV.java | 76 +- .../GregtechGeothermalThermalGenerator.java | 105 +- .../gregtech/GregtechHiAmpTransformer.java | 434 +++----- .../gregtech/GregtechIndustrialAlloySmelter.java | 8 +- .../gregtech/GregtechIndustrialArcFurnace.java | 8 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 16 +- .../gregtech/GregtechIndustrialCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialChisel.java | 8 +- .../gregtech/GregtechIndustrialCokeOven.java | 8 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 8 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 8 +- .../GregtechIndustrialElementDuplicator.java | 9 +- .../gregtech/GregtechIndustrialExtruder.java | 8 +- .../gregtech/GregtechIndustrialFishPond.java | 8 +- .../gregtech/GregtechIndustrialFluidHeater.java | 8 +- .../gregtech/GregtechIndustrialForgeHammer.java | 8 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 8 +- .../gregtech/GregtechIndustrialGeneratorArray.java | 8 +- .../gregtech/GregtechIndustrialMacerator.java | 8 +- .../gregtech/GregtechIndustrialMassFabricator.java | 66 +- .../gregtech/GregtechIndustrialMixer.java | 8 +- .../gregtech/GregtechIndustrialMultiMachine.java | 8 +- .../gregtech/GregtechIndustrialMultiTank.java | 36 +- .../gregtech/GregtechIndustrialPlatePress.java | 8 +- .../gregtech/GregtechIndustrialRockBreaker.java | 8 +- .../gregtech/GregtechIndustrialSifter.java | 8 +- .../GregtechIndustrialThermalCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialWashPlant.java | 8 +- .../gregtech/GregtechIndustrialWiremill.java | 8 +- .../gregtech/GregtechIronBlastFurnace.java | 8 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 12 +- .../gregtech/GregtechMiniRaFusion.java | 50 +- .../gregtech/GregtechMolecularTransformer.java | 8 +- .../registration/gregtech/GregtechNaqReactor.java | 26 +- .../gregtech/GregtechNitroDieselFix.java | 67 +- .../gregtech/GregtechPollutionDevices.java | 98 +- .../gregtech/GregtechPowerBreakers.java | 110 +- .../gregtech/GregtechPowerSubStation.java | 34 +- .../gregtech/GregtechQuantumForceTransformer.java | 8 +- .../registration/gregtech/GregtechRTG.java | 9 +- .../gregtech/GregtechRocketFuelGenerator.java | 238 ++--- .../registration/gregtech/GregtechSafeBlock.java | 181 +--- .../gregtech/GregtechSemiFluidgenerators.java | 53 +- .../gregtech/GregtechSimpleWasher.java | 20 +- .../gregtech/GregtechSolarGenerators.java | 55 +- .../registration/gregtech/GregtechSolarTower.java | 13 +- .../registration/gregtech/GregtechSteamMultis.java | 17 +- .../registration/gregtech/GregtechSuperChests.java | 101 +- .../gregtech/GregtechSuperConductionPoint.java | 2 +- .../gregtech/GregtechThaumcraftDevices.java | 11 +- .../gregtech/GregtechThreadedBuffers.java | 175 ++-- .../gregtech/GregtechTieredChunkloaders.java | 1 + .../gregtech/GregtechTieredFluidTanks.java | 1 + .../gregtech/GregtechTreeFarmerTE.java | 1 + .../gregtech/GregtechWirelessChargers.java | 57 +- .../gregtech/NewHorizonsAccelerator.java | 256 ++--- 67 files changed, 2178 insertions(+), 2789 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 898fe17a52..36035364c0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -36,30 +36,41 @@ public class Gregtech4Content { private static void computer() { Logger.INFO("Gregtech 4 Content | Registering Computer Cube."); - GregtechItemList.Gregtech_Computer_Cube_Machine.set( - new GT_TileEntity_ComputerCube(31130, "C-O-M-P-U-T-E-R").getStackForm(1L)); + GregtechItemList.Gregtech_Computer_Cube_Machine + .set(new GT_TileEntity_ComputerCube(31130, "C-O-M-P-U-T-E-R").getStackForm(1L)); } private static void workbenches() { // Gregtech 4 Workbenches Logger.INFO("Gregtech 4 Content | Registering Workbenches."); - GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable( - 31081, "workbench.basic", "Bronze Workbench", 0, "Stores 16000L of fluid") - .getStackForm(1L)); - GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable( - 31082, "workbench.advanced", "Advanced Workbench", 3, "Stores 64000L of fluid") - .getStackForm(1L)); + GregtechItemList.GT4_Workbench_Bronze.set( + new GT_MetaTileEntity_BronzeCraftingTable( + 31081, + "workbench.basic", + "Bronze Workbench", + 0, + "Stores 16000L of fluid").getStackForm(1L)); + GregtechItemList.GT4_Workbench_Advanced.set( + new GT_MetaTileEntity_AdvancedCraftingTable( + 31082, + "workbench.advanced", + "Advanced Workbench", + 3, + "Stores 64000L of fluid").getStackForm(1L)); } private static void redstone() { Logger.INFO("Gregtech 4 Content | Registering Redstone Blocks."); GregtechItemList.GT4_Redstone_Lamp.set(new GT_MetaTileEntity_RedstoneLamp(31120).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Button_Panel.set( - new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L)); + GregtechItemList.GT4_Redstone_Button_Panel + .set(new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L)); GregtechItemList.GT4_Redstone_Scale.set(new GT_MetaTileEntity_RedstoneStrengthScale(31122).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Display.set(new GT_MetaTileEntity_RedstoneStrengthDisplay( - 31123, "redstone.display.strength", "Redstone Display", "Displays Redstone Strength") - .getStackForm(1L)); + GregtechItemList.GT4_Redstone_Display.set( + new GT_MetaTileEntity_RedstoneStrengthDisplay( + 31123, + "redstone.display.strength", + "Redstone Display", + "Displays Redstone Strength").getStackForm(1L)); GregtechItemList.GT4_Redstone_Circuit.set(new GT_MetaTileEntity_RedstoneCircuitBlock(31124).getStackForm(1L)); } @@ -157,15 +168,21 @@ public class Gregtech4Content { GregtechItemList.GT4_Shelf_Iron.set( new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal Shelf", "A heavy duty shelf") .getStackForm(1L)); - GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet( - 872, "gtplusplus.shelf.filecabinet", "File Cabinet", "Could look nice in your office") - .getStackForm(1L)); + GregtechItemList.GT4_Shelf_FileCabinet.set( + new GT4Entity_Shelf_FileCabinet( + 872, + "gtplusplus.shelf.filecabinet", + "File Cabinet", + "Could look nice in your office").getStackForm(1L)); GregtechItemList.GT4_Shelf_Desk.set( new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "A place to study") .getStackForm(1L)); - GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment( - 874, "gtplusplus.shelf.compartment", "Compartment", "Stores Books & Things") - .getStackForm(1L)); + GregtechItemList.GT4_Shelf_Compartment.set( + new GT4Entity_Shelf_Compartment( + 874, + "gtplusplus.shelf.compartment", + "Compartment", + "Stores Books & Things").getStackForm(1L)); // Custom Storage GregtechItemList.GT4_Shelf_Large.set( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index de8dd983e9..23d9cb88fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -13,7 +15,6 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_HV; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_LV; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_MV; -import net.minecraft.item.ItemStack; public class GregtechAdvancedBoilers { @@ -26,88 +27,55 @@ public class GregtechAdvancedBoilers { private static void run1() { // Boilers - GregtechItemList.Boiler_Advanced_LV.set( - new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L)); - GregtechItemList.Boiler_Advanced_MV.set( - new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L)); - GregtechItemList.Boiler_Advanced_HV.set( - new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L)); + GregtechItemList.Boiler_Advanced_LV + .set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L)); + GregtechItemList.Boiler_Advanced_MV + .set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L)); + GregtechItemList.Boiler_Advanced_HV + .set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L)); - ItemStack chassisT1 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1); - ItemStack chassisT2 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1); - ItemStack chassisT3 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1); + ItemStack chassisT1 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1); + ItemStack chassisT2 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1); + ItemStack chassisT3 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1); // Make the Coil in each following recipe a hammer and a Screwdriver. // Chassis Recipes GT_ModHandler.addCraftingRecipe( chassisT1, - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "WCW", - "GMG", - "WPW", - Character.valueOf('M'), - ItemList.Hull_ULV, - Character.valueOf('P'), - OrePrefixes.pipeLarge.get(Materials.Bronze), - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Primitive), - Character.valueOf('W'), - OrePrefixes.plate.get(Materials.Lead), - Character.valueOf('G'), - OrePrefixes.pipeSmall.get(Materials.Copper) - }); + new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('P'), + OrePrefixes.pipeLarge.get(Materials.Bronze), Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Primitive), Character.valueOf('W'), + OrePrefixes.plate.get(Materials.Lead), Character.valueOf('G'), + OrePrefixes.pipeSmall.get(Materials.Copper) }); GT_ModHandler.addCraftingRecipe( chassisT2, - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "WCW", - "GMG", - "WPW", - Character.valueOf('M'), - ItemList.Hull_LV, - Character.valueOf('P'), - OrePrefixes.pipeLarge.get(Materials.Steel), - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Basic), - Character.valueOf('W'), - OrePrefixes.plate.get(Materials.Steel), - Character.valueOf('G'), - OrePrefixes.pipeSmall.get(Materials.Bronze) - }); + new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'), + OrePrefixes.pipeLarge.get(Materials.Steel), Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'), + OrePrefixes.plate.get(Materials.Steel), Character.valueOf('G'), + OrePrefixes.pipeSmall.get(Materials.Bronze) }); GT_ModHandler.addCraftingRecipe( chassisT3, - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "WCW", - "GMG", - "WPW", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('P'), - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Good), - Character.valueOf('W'), - OrePrefixes.plate.get(Materials.Aluminium), - Character.valueOf('G'), - OrePrefixes.pipeSmall.get(Materials.Steel) - }); + new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'), + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'), + OrePrefixes.plate.get(Materials.Aluminium), Character.valueOf('G'), + OrePrefixes.pipeSmall.get(Materials.Steel) }); ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1); ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1); @@ -116,68 +84,30 @@ public class GregtechAdvancedBoilers { // Boiler Recipes GT_ModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_LV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "dCw", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_LV, - Character.valueOf('P'), - pipeTier1, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Basic), - Character.valueOf('W'), - chassisT1, - Character.valueOf('G'), - OrePrefixes.gear.get(Materials.Steel) - }); + new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'), + pipeTier1, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), + Character.valueOf('W'), chassisT1, Character.valueOf('G'), + OrePrefixes.gear.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "dCw", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('P'), - pipeTier2, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Good), - Character.valueOf('W'), - chassisT2, - Character.valueOf('G'), - ALLOY.SILICON_CARBIDE.getGear(1) - }); + new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'), + pipeTier2, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), + Character.valueOf('W'), chassisT2, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { - "dCw", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_HV, - Character.valueOf('P'), - pipeTier3, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Advanced), - Character.valueOf('W'), - chassisT3, - Character.valueOf('G'), - ALLOY.SILICON_CARBIDE.getGear(1) - }); + new Object[] { "dCw", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'), + pipeTier3, Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), + Character.valueOf('W'), chassisT3, Character.valueOf('G'), ALLOY.SILICON_CARBIDE.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java index 62bbb93ffd..592db618f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBedrockPlatforms.java @@ -1,15 +1,6 @@ /* -package gtPlusPlus.xmod.gregtech.registration.gregtech; - - -public class GregtechBedrockPlatforms { - - //941-945 - - public static void run() { - Logger.INFO("Gregtech5u Content | Registering Bedrock Mining Platform."); - GregtechItemList.BedrockMiner_MKI.set(new GregtechMetaTileEntity_BedrockMiningPlatform1(941, "multimachine.tier.01.bedrockminer", "Experimental Deep Earth Drilling Platform - MK I").getStackForm(1)); - } - -} -*/ + * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechBedrockPlatforms { //941-945 public + * static void run() { Logger.INFO("Gregtech5u Content | Registering Bedrock Mining Platform."); + * GregtechItemList.BedrockMiner_MKI.set(new GregtechMetaTileEntity_BedrockMiningPlatform1(941, + * "multimachine.tier.01.bedrockminer", "Experimental Deep Earth Drilling Platform - MK I").getStackForm(1)); } } + */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 075784d85d..eb13397bf3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -19,135 +19,115 @@ public class GregtechBufferDynamos { } private static final void run2() { - GregtechItemList.Hatch_Buffer_Dynamo_ULV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.00", "ULV Dynamo Hatch [Buffered]", 0) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_LV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.01", "LV Dynamo Hatch [Buffered]", 1) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_MV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.02", "MV Dynamo Hatch [Buffered]", 2) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_HV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.03", "HV Dynamo Hatch [Buffered]", 3) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_EV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.04", "EV Dynamo Hatch [Buffered]", 4) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_IV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.05", "IV Dynamo Hatch [Buffered]", 5) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_LuV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.06", "LuV Dynamo Hatch [Buffered]", 6) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.07", "ZPM Dynamo Hatch [Buffered]", 7) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_UV.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.08", "UV Dynamo Hatch [Buffered]", 8) - .getStackForm(1L)); - GregtechItemList.Hatch_Buffer_Dynamo_MAX.set(new GT_MetaTileEntity_Hatch_DynamoBuffer( - mID++, "hatch.dynamo.buffer.tier.09", "UHV Dynamo Hatch [Buffered]", 9) - .getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_ULV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.00", + "ULV Dynamo Hatch [Buffered]", + 0).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_LV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.01", + "LV Dynamo Hatch [Buffered]", + 1).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_MV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.02", + "MV Dynamo Hatch [Buffered]", + 2).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_HV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.03", + "HV Dynamo Hatch [Buffered]", + 3).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_EV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.04", + "EV Dynamo Hatch [Buffered]", + 4).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_IV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.05", + "IV Dynamo Hatch [Buffered]", + 5).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_LuV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.06", + "LuV Dynamo Hatch [Buffered]", + 6).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_ZPM.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.07", + "ZPM Dynamo Hatch [Buffered]", + 7).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_UV.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.08", + "UV Dynamo Hatch [Buffered]", + 8).getStackForm(1L)); + GregtechItemList.Hatch_Buffer_Dynamo_MAX.set( + new GT_MetaTileEntity_Hatch_DynamoBuffer( + mID++, + "hatch.dynamo.buffer.tier.09", + "UHV Dynamo Hatch [Buffered]", + 9).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_ULV, - 'T', - CI.getTieredCircuit(0), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.Lead) - }); + GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ULV, 'T', CI.getTieredCircuit(0), 'C', + OrePrefixes.cableGt04.get((Object) Materials.Lead) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_LV, - 'T', - CI.getTieredCircuit(1), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.Tin) - }); + GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LV, 'T', CI.getTieredCircuit(1), 'C', + OrePrefixes.cableGt04.get((Object) Materials.Tin) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_MV, - 'T', - CI.getTieredCircuit(2), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) - }); + GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MV, 'T', CI.getTieredCircuit(2), 'C', + OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_HV, - 'T', - CI.getTieredCircuit(3), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.Gold) - }); + GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_HV, 'T', CI.getTieredCircuit(3), 'C', + OrePrefixes.cableGt04.get((Object) Materials.Gold) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_EV, - 'T', - CI.getTieredCircuit(4), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.Aluminium) - }); + GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_EV, 'T', CI.getTieredCircuit(4), 'C', + OrePrefixes.cableGt04.get((Object) Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_IV, - 'T', - CI.getTieredCircuit(5), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.Tungsten) - }); + GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_IV, 'T', CI.getTieredCircuit(5), 'C', + OrePrefixes.cableGt04.get((Object) Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_LuV, - 'T', - CI.getTieredCircuit(6), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) - }); + GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LuV, 'T', CI.getTieredCircuit(6), 'C', + OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_ZPM, - 'T', - CI.getTieredCircuit(7), - 'C', - OrePrefixes.cableGt04.get((Object) Materials.Naquadah) - }); + GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ZPM, 'T', CI.getTieredCircuit(7), 'C', + OrePrefixes.cableGt04.get((Object) Materials.Naquadah) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_UV, - 'T', - CI.getTieredCircuit(8), - 'C', - OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) - }); + GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UV, 'T', CI.getTieredCircuit(8), 'C', + OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L, new Object[0]), bitsd, new Object[] { - "TMC", - 'M', - ItemList.Hatch_Dynamo_MAX, - 'T', - CI.getTieredCircuit(9), - 'C', - OrePrefixes.wireGt04.get((Object) Materials.Superconductor) - }); + GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L, new Object[0]), + bitsd, + new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MAX, 'T', CI.getTieredCircuit(9), 'C', + OrePrefixes.wireGt04.get((Object) Materials.Superconductor) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java index 55a86a80d4..d2d42504db 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java @@ -2,6 +2,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_ComponentAssemblers; +import java.util.ArrayList; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import gregtech.api.enums.*; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; import gregtech.api.util.GTPP_Recipe; @@ -10,10 +16,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import java.util.ArrayList; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class GregtechComponentAssembler { @@ -29,7 +31,8 @@ public class GregtechComponentAssembler { return; } - GregtechItemList.Machine_LV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + GregtechItemList.Machine_LV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 985, "basicmachine.componentmaker.tier.01", "Basic Component Maker", @@ -47,23 +50,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_MV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_MV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 986, "basicmachine.componentmaker.tier.02", "Advanced Component Maker", @@ -81,23 +74,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_HV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_HV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 987, "basicmachine.componentmaker.tier.03", "Advanced Component Maker II", @@ -115,23 +98,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_EV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_EV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 988, "basicmachine.componentmaker.tier.04", "Advanced Component Maker III", @@ -149,23 +122,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_IV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_IV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 989, "basicmachine.componentmaker.tier.05", "Advanced Component Maker IV", @@ -183,23 +146,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_LuV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_LuV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 31012, "basicmachine.componentmaker.tier.06", "Advanced Component Maker V", @@ -217,23 +170,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_ZPM_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_ZPM_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 31013, "basicmachine.componentmaker.tier.07", "Advanced Component Maker VI", @@ -251,23 +194,13 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); - GregtechItemList.Machine_UV_Component_Maker.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); + GregtechItemList.Machine_UV_Component_Maker.set( + new GT_MetaTileEntity_BasicMachine_GT_Recipe( 31014, "basicmachine.componentmaker.tier.08", "Advanced Component Maker VII", @@ -285,22 +218,11 @@ public class GregtechComponentAssembler { false, 0, "ASSEMBLER", - new Object[] { - "ACA", - "VMV", - "WCW", - 'M', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, - 'V', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, - 'A', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, - 'C', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, - 'W', - GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 - }) - .getStackForm(1L)); + new Object[] { "ACA", "VMV", "WCW", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'A', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', + GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4 }).getStackForm(1L)); // Motors // addRecipeMotor(0, Materials.Lead, 1, Materials.RedAlloy, 1, @@ -310,7 +232,13 @@ public class GregtechComponentAssembler { addRecipeMotor(3, Materials.Copper, 4, Materials.Gold, 1, Materials.StainlessSteel, Materials.SteelMagnetic); addRecipeMotor(4, Materials.Copper, 8, Materials.Aluminium, 1, Materials.Titanium, Materials.NeodymiumMagnetic); addRecipeMotor( - 5, Materials.Copper, 16, Materials.Tungsten, 1, Materials.TungstenSteel, Materials.NeodymiumMagnetic); + 5, + Materials.Copper, + 16, + Materials.Tungsten, + 1, + Materials.TungstenSteel, + Materials.NeodymiumMagnetic); // Pistons // addRecipePiston(0, Materials.Lead, Materials.Lead); @@ -370,14 +298,8 @@ public class GregtechComponentAssembler { addRecipeSensor(5, Materials.TungstenSteel, Materials.Osmium, Materials.EnderEye); } - private static boolean addRecipeMotor( - int tier, - Materials wire, - int wirethickness, - Materials cable, - int cablethickness, - Materials stick, - Materials magstick) { + private static boolean addRecipeMotor(int tier, Materials wire, int wirethickness, Materials cable, + int cablethickness, Materials stick, Materials magstick) { try { String mWT = "" + wirethickness; String mCT = "" + cablethickness; @@ -397,7 +319,7 @@ public class GregtechComponentAssembler { ItemStack rodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, stick, 2); ItemStack magrodStack = ItemUtils.getGregtechOreStack(OrePrefixes.stick, magstick, 1); - ItemStack Input[] = {wireStack, cableStack, rodStack, magrodStack}; + ItemStack Input[] = { wireStack, cableStack, rodStack, magrodStack }; return CORE.RA.addComponentMakerRecipe( Input, @@ -420,7 +342,7 @@ public class GregtechComponentAssembler { ItemStack gearStack = ItemUtils.getGregtechOreStack(OrePrefixes.gearGtSmall, mat, 1); ItemStack motorStack = CI.getElectricMotor(tier, 1); - ItemStack Input[] = {plateStack, cableStack, rodStack, gearStack, motorStack}; + ItemStack Input[] = { plateStack, cableStack, rodStack, gearStack, motorStack }; return CORE.RA.addComponentMakerRecipe( Input, @@ -446,7 +368,7 @@ public class GregtechComponentAssembler { for (ItemStack mRubberType : oreDictList) { final ItemStack returnValue = mRubberType.copy(); returnValue.stackSize = 6; - ItemStack Input[] = {cableStack, motorStack, returnValue}; + ItemStack Input[] = { cableStack, motorStack, returnValue }; mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -466,11 +388,14 @@ public class GregtechComponentAssembler { return false; } } else { - ItemStack Input[] = { - cableStack, motorStack, ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateRubber", 6) - }; + ItemStack Input[] = { cableStack, motorStack, + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateRubber", 6) }; return CORE.RA.addComponentMakerRecipe( - Input, GT_Values.NF, CI.getConveyor(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15); + Input, + GT_Values.NF, + CI.getConveyor(tier, 1), + (tier * 40), + ((int) GT_Values.V[tier] / 16) * 15); } } catch (Throwable t) { @@ -493,7 +418,7 @@ public class GregtechComponentAssembler { for (ItemStack mRubberType : oreDictList) { final ItemStack returnValue = mRubberType.copy(); returnValue.stackSize = 2; - ItemStack Input[] = {cableStack, screwStack, rotorStack, pipeStack, motorStack, returnValue}; + ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack, returnValue }; mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -513,14 +438,8 @@ public class GregtechComponentAssembler { return false; } } else { - ItemStack Input[] = { - cableStack, - screwStack, - rotorStack, - pipeStack, - motorStack, - ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ringRubber", 2) - }; + ItemStack Input[] = { cableStack, screwStack, rotorStack, pipeStack, motorStack, + ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ringRubber", 2) }; return CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -549,7 +468,7 @@ public class GregtechComponentAssembler { for (ItemStack mCircuitType : oreDictList) { final ItemStack returnValue = mCircuitType.copy(); returnValue.stackSize = 1; - ItemStack Input[] = {returnValue, cableStack, rodStack, pistonStack, motorStack}; + ItemStack Input[] = { returnValue, cableStack, rodStack, pistonStack, motorStack }; mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -569,14 +488,14 @@ public class GregtechComponentAssembler { } } else { ItemStack Input[] = { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1), - cableStack, - rodStack, - pistonStack, - motorStack - }; + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1), cableStack, + rodStack, pistonStack, motorStack }; return CORE.RA.addComponentMakerRecipe( - Input, GT_Values.NF, CI.getRobotArm(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15); + Input, + GT_Values.NF, + CI.getRobotArm(tier, 1), + (tier * 40), + ((int) GT_Values.V[tier] / 16) * 15); } } catch (Throwable t) { @@ -595,10 +514,10 @@ public class GregtechComponentAssembler { else if (tier == 5) mWT = "16"; else mWT = "01"; - ItemStack eyeQuantum = - ItemUtils.getValueOfItemList("QuantumEye", 1, ItemUtils.getSimpleStack(Items.ender_eye, 4)); - ItemStack starQuantum = - ItemUtils.getValueOfItemList("QuantumStar", 1, ItemUtils.getSimpleStack(Items.nether_star, 4)); + ItemStack eyeQuantum = ItemUtils + .getValueOfItemList("QuantumEye", 1, ItemUtils.getSimpleStack(Items.ender_eye, 4)); + ItemStack starQuantum = ItemUtils + .getValueOfItemList("QuantumStar", 1, ItemUtils.getSimpleStack(Items.nether_star, 4)); if (tier == 1) gem = ItemUtils.getSimpleStack(Items.ender_pearl); else if (tier == 2) gem = ItemUtils.getSimpleStack(Items.ender_eye); @@ -618,7 +537,7 @@ public class GregtechComponentAssembler { for (ItemStack mCircuitType : oreDictList) { final ItemStack returnValue = mCircuitType.copy(); returnValue.stackSize = 4; - ItemStack Input[] = {returnValue, wireStack, gem}; + ItemStack Input[] = { returnValue, wireStack, gem }; mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -638,8 +557,8 @@ public class GregtechComponentAssembler { } } else { ItemStack Input[] = { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 4), wireStack, gem - }; + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 4), wireStack, + gem }; return CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -667,7 +586,7 @@ public class GregtechComponentAssembler { for (ItemStack mCircuitType : oreDictList) { final ItemStack returnValue = mCircuitType.copy(); returnValue.stackSize = 2; - ItemStack Input[] = {returnValue, cableStack, gemstack, magrodStack}; + ItemStack Input[] = { returnValue, cableStack, gemstack, magrodStack }; mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -687,13 +606,14 @@ public class GregtechComponentAssembler { } } else { ItemStack Input[] = { - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 2), - cableStack, - gemstack, - magrodStack - }; + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 2), cableStack, + gemstack, magrodStack }; return CORE.RA.addComponentMakerRecipe( - Input, GT_Values.NF, CI.getEmitter(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15); + Input, + GT_Values.NF, + CI.getEmitter(tier, 1), + (tier * 40), + ((int) GT_Values.V[tier] / 16) * 15); } } catch (Throwable t) { @@ -715,7 +635,7 @@ public class GregtechComponentAssembler { for (ItemStack mCircuitType : oreDictList) { final ItemStack returnValue = mCircuitType.copy(); returnValue.stackSize = 1; - ItemStack Input[] = {gemStack, cableStack, returnValue, magrodStack}; + ItemStack Input[] = { gemStack, cableStack, returnValue, magrodStack }; mAdd[mcount++] = CORE.RA.addComponentMakerRecipe( Input, GT_Values.NF, @@ -734,14 +654,14 @@ public class GregtechComponentAssembler { return false; } } else { - ItemStack Input[] = { - gemStack, - cableStack, - magrodStack, - ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1) - }; + ItemStack Input[] = { gemStack, cableStack, magrodStack, + ItemUtils.getItemStackOfAmountFromOreDict(CI.getTieredCircuitOreDictName(tier), 1) }; return CORE.RA.addComponentMakerRecipe( - Input, GT_Values.NF, CI.getSensor(tier, 1), (tier * 40), ((int) GT_Values.V[tier] / 16) * 15); + Input, + GT_Values.NF, + CI.getSensor(tier, 1), + (tier * 40), + ((int) GT_Values.V[tier] / 16) * 15); } } catch (Throwable t) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index c48885df21..aadf6f4a12 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -3,6 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gtPlusPlus.core.lib.CORE.GTNH; import static gtPlusPlus.core.lib.L