diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration')
67 files changed, 2178 insertions, 2789 deletions
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.LoadedMods.Gregtech; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -25,17 +32,15 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; public class GregtechConduits { + /** * - * The Voltage Tiers. Use this Array instead of the old named Voltage Variables - * public static final long[] V = new long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE}; + * The Voltage Tiers. Use this Array instead of the old named Voltage Variables public static final long[] V = new + * long[] {0=8, 1=32, 2=128, 3=512, 4=2048, 5=8192, 6=32768, 7=131072, 8=524288, 9=Integer.MAX_VALUE, + * Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, + * Integer.MAX_VALUE}; * */ public static OrePrefixes cableGt16; @@ -43,8 +48,7 @@ public class GregtechConduits { static { if (GTNH) { try { - cableGt16 = (OrePrefixes) - GT_Utility.getField(OrePrefixes.class, "cableGt16").get(null); + cableGt16 = (OrePrefixes) GT_Utility.getField(OrePrefixes.class, "cableGt16").get(null); } catch (IllegalAccessException | NullPointerException e) { e.printStackTrace(); } @@ -174,24 +178,17 @@ public class GregtechConduits { } // Generate Heat Pipes - // GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021, "gtpp.pipe.heat.basic.01", "Lead Heat + // GregtechItemList.HeatPipe_Tier_1.set(new GT_MetaPipeEntity_Heat(31021, "gtpp.pipe.heat.basic.01", "Lead Heat // Pipe (500C)", Materials.Lead, 500).getStackForm(1L)); - // GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022, "gtpp.pipe.heat.basic.02", "Iron Heat + // GregtechItemList.HeatPipe_Tier_2.set(new GT_MetaPipeEntity_Heat(31022, "gtpp.pipe.heat.basic.02", "Iron Heat // Pipe (500C)", Materials.Iron, 500).getStackForm(1L)); - // GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023, "gtpp.pipe.heat.basic.03", "Silver + // GregtechItemList.HeatPipe_Tier_3.set(new GT_MetaPipeEntity_Heat(31023, "gtpp.pipe.heat.basic.03", "Silver // Heat Pipe (1500C)", Materials.Silver, 1500).getStackForm(1L)); } - private static void generateFluidMultiPipes( - Constructor<GT_MetaPipeEntity_Fluid> aClazz, - Materials aMaterial, - String name, - String displayName, - int startID, - int transferRatePerSec, - int heatCapacity, - boolean gasProof) { + private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial, + String name, String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) { GT_MetaPipeEntity_Fluid aPipe; final int transferRatePerTick = transferRatePerSec / 20; try { @@ -211,9 +208,7 @@ public class GregtechConduits { Logger.INFO("Generated " + aMaterial + " Hexadecuple pipes."); GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L)); } - } catch (InstantiationException - | IllegalAccessException - | IllegalArgumentException + } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { Logger.INFO("Failed to Generate " + aMaterial + " Hexadecuple pipes. [Ecx]"); e.printStackTrace(); @@ -223,13 +218,13 @@ public class GregtechConduits { private static void run1() { if (LoadedMods.Big_Reactors) { - wireFactory("Blutonium", 8196, BaseWireID, 8, 32, 2, new short[] {28, 28, 218, 0}); - wireFactory("Cyanite", 512, BaseWireID + 15, 2, 16, 4, new short[] {27, 130, 178, 0}); - wireFactory("Yellorium", 2048, BaseWireID + 30, 4, 16, 2, new short[] {150, 195, 54, 0}); + wireFactory("Blutonium", 8196, BaseWireID, 8, 32, 2, new short[] { 28, 28, 218, 0 }); + wireFactory("Cyanite", 512, BaseWireID + 15, 2, 16, 4, new short[] { 27, 130, 178, 0 }); + wireFactory("Yellorium", 2048, BaseWireID + 30, 4, 16, 2, new short[] { 150, 195, 54, 0 }); } if (LoadedMods.EnderIO) { - wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] {178, 34, 34, 0}); + wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 }); } if (!GTNH) { @@ -271,17 +266,16 @@ public class GregtechConduits { generateGTFluidPipes(Materials.Lead, BasePipeID + 70, 350, 1200, true); generateNonGTFluidPipes( - GT_Materials.TriniumNaquadahCarbonite, ALLOY.TRINIUM_NAQUADAH_CARBON, 30500, 20, 250000, true); + GT_Materials.TriniumNaquadahCarbonite, + ALLOY.TRINIUM_NAQUADAH_CARBON, + 30500, + 20, + 250000, + true); } - private static void wireFactory( - final String Material, - final int Voltage, - final int ID, - final long insulatedLoss, - final long uninsulatedLoss, - final long Amps, - final short[] rgb) { + private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, + final long uninsulatedLoss, final long Amps, final short[] rgb) { @SuppressWarnings("deprecation") final Materials T = Materials.valueOf(Material); int V = GT_Utility.getTier(Voltage); @@ -294,222 +288,198 @@ public class GregtechConduits { } @SuppressWarnings("deprecation") - private static void makeWires( - final Materials aMaterial, - final int aStartID, - final long aLossInsulated, - final long aLoss, - final long aAmperage, - final long aVoltage, - final boolean aInsulatable, - final boolean aAutoInsulated, - final short[] aRGB) { + private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, + final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, + final boolean aAutoInsulated, final short[] aRGB) { Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.name() + " as a new material for Wire & Cable."); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 0, - "wire." + aMaterial.name().toLowerCase() + ".01", - "1x " + aMaterial.mDefaultLocalName + " Wire", - 0.125F, - aMaterial, - aLoss, - 1L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aRGB) - .getStackForm(1L)); + aStartID + 0, + "wire." + aMaterial.name().toLowerCase() + ".01", + "1x " + aMaterial.mDefaultLocalName + " Wire", + 0.125F, + aMaterial, + aLoss, + 1L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 1, - "wire." + aMaterial.name().toLowerCase() + ".02", - "2x " + aMaterial.mDefaultLocalName + " Wire", - 0.25F, - aMaterial, - aLoss, - 2L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aRGB) - .getStackForm(1L)); + aStartID + 1, + "wire." + aMaterial.name().toLowerCase() + ".02", + "2x " + aMaterial.mDefaultLocalName + " Wire", + 0.25F, + aMaterial, + aLoss, + 2L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 2, - "wire." + aMaterial.name().toLowerCase() + ".04", - "4x " + aMaterial.mDefaultLocalName + " Wire", - 0.375F, - aMaterial, - aLoss, - 4L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aRGB) - .getStackForm(1L)); + aStartID + 2, + "wire." + aMaterial.name().toLowerCase() + ".04", + "4x " + aMaterial.mDefaultLocalName + " Wire", + 0.375F, + aMaterial, + aLoss, + 4L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt08, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 3, - "wire." + aMaterial.name().toLowerCase() + ".08", - "8x " + aMaterial.mDefaultLocalName + " Wire", - 0.50F, - aMaterial, - aLoss, - 8L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aRGB) - .getStackForm(1L)); + aStartID + 3, + "wire." + aMaterial.name().toLowerCase() + ".08", + "8x " + aMaterial.mDefaultLocalName + " Wire", + 0.50F, + aMaterial, + aLoss, + 8L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt12, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 4, - "wire." + aMaterial.name().toLowerCase() + ".12", - "12x " + aMaterial.mDefaultLocalName + " Wire", - GTNH ? 0.625F : 0.75F, - aMaterial, - aLoss, - 12L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aRGB) - .getStackForm(1L)); + aStartID + 4, + "wire." + aMaterial.name().toLowerCase() + ".12", + "12x " + aMaterial.mDefaultLocalName + " Wire", + GTNH ? 0.625F : 0.75F, + aMaterial, + aLoss, + 12L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.wireGt16, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 5, - "wire." + aMaterial.name().toLowerCase() + ".16", - "16x " + aMaterial.mDefaultLocalName + " Wire", - GTNH ? 0.75F : 1.0F, - aMaterial, - aLoss, - 16L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aRGB) - .getStackForm(1L)); + aStartID + 5, + "wire." + aMaterial.name().toLowerCase() + ".16", + "16x " + aMaterial.mDefaultLocalName + " Wire", + GTNH ? 0.75F : 1.0F, + aMaterial, + aLoss, + 16L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aRGB).getStackForm(1L)); if (aInsulatable) { GT_OreDictUnificator.registerOre( OrePrefixes.cableGt01, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 6, - "cable." + aMaterial.name().toLowerCase() + ".01", - "1x " + aMaterial.mDefaultLocalName + " Cable", - 0.25F, - aMaterial, - aLossInsulated, - 1L * aAmperage, - aVoltage, - true, - false, - aRGB) - .getStackForm(1L)); + aStartID + 6, + "cable." + aMaterial.name().toLowerCase() + ".01", + "1x " + aMaterial.mDefaultLocalName + " Cable", + 0.25F, + aMaterial, + aLossInsulated, + 1L * aAmperage, + aVoltage, + true, + false, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt02, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 7, - "cable." + aMaterial.name().toLowerCase() + ".02", - "2x " + aMaterial.mDefaultLocalName + " Cable", - 0.375F, - aMaterial, - aLossInsulated, - 2L * aAmperage, - aVoltage, - true, - false, - aRGB) - .getStackForm(1L)); + aStartID + 7, + "cable." + aMaterial.name().toLowerCase() + ".02", + "2x " + aMaterial.mDefaultLocalName + " Cable", + 0.375F, + aMaterial, + aLossInsulated, + 2L * aAmperage, + aVoltage, + true, + false, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt04, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 8, - "cable." + aMaterial.name().toLowerCase() + ".04", - "4x " + aMaterial.mDefaultLocalName + " Cable", - 0.5F, - aMaterial, - aLossInsulated, - 4L * aAmperage, - aVoltage, - true, - false, - aRGB) - .getStackForm(1L)); + aStartID + 8, + "cable." + aMaterial.name().toLowerCase() + ".04", + "4x " + aMaterial.mDefaultLocalName + " Cable", + 0.5F, + aMaterial, + aLossInsulated, + 4L * aAmperage, + aVoltage, + true, + false, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt08, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 9, - "cable." + aMaterial.name().toLowerCase() + ".08", - "8x " + aMaterial.mDefaultLocalName + " Cable", - 0.625F, - aMaterial, - aLossInsulated, - 8L * aAmperage, - aVoltage, - true, - false, - aRGB) - .getStackForm(1L)); + aStartID + 9, + "cable." + aMaterial.name().toLowerCase() + ".08", + "8x " + aMaterial.mDefaultLocalName + " Cable", + 0.625F, + aMaterial, + aLossInsulated, + 8L * aAmperage, + aVoltage, + true, + false, + aRGB).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.cableGt12, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 10, - "cable." + aMaterial.name().toLowerCase() + ".12", - "12x " + aMaterial.mDefaultLocalName + " Cable", - GTNH ? 0.75F : 0.875F, - aMaterial, - aLossInsulated, - 12L * aAmperage, - aVoltage, - true, - false, - aRGB) - .getStackForm(1L)); + aStartID + 10, + "cable." + aMaterial.name().toLowerCase() + ".12", + "12x " + aMaterial.mDefaultLocalName + " Cable", + GTNH ? 0.75F : 0.875F, + aMaterial, + aLossInsulated, + 12L * aAmperage, + aVoltage, + true, + false, + aRGB).getStackForm(1L)); if (GTNH) { GT_OreDictUnificator.registerOre( cableGt16, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 11, - "cable." + aMaterial.name().toLowerCase() + ".16", - "16x " + aMaterial.mDefaultLocalName + " Cable", - 0.875f, - aMaterial, - aLossInsulated, - 16L * aAmperage, - aVoltage, - true, - false, - aRGB) - .getStackForm(1L)); + aStartID + 11, + "cable." + aMaterial.name().toLowerCase() + ".16", + "16x " + aMaterial.mDefaultLocalName + " Cable", + 0.875f, + aMaterial, + aLossInsulated, + 16L * aAmperage, + aVoltage, + true, + false, + aRGB).getStackForm(1L)); } } } - private static void customWireFactory( - final Material Material, - final int Voltage, - final int ID, - final long insulatedLoss, - final long uninsulatedLoss, - final long Amps) { + private static void customWireFactory(final Material Material, final int Voltage, final int ID, + final long insulatedLoss, final long uninsulatedLoss, final long Amps) { int V = GT_Utility.getTier(Voltage); if (V == -1) { Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); @@ -519,210 +489,188 @@ public class GregtechConduits { makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); } - private static void makeCustomWires( - final Material aMaterial, - final int aStartID, - final long aLossInsulated, - final long aLoss, - final long aAmperage, - final long aVoltage, - final boolean aInsulatable, + private static void makeCustomWires(final Material aMaterial, final int aStartID, final long aLossInsulated, + final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated) { - Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.getLocalizedName() - + " as a new material for Wire & Cable."); + Logger.WARNING( + "Gregtech5u Content | Registered " + aMaterial.getLocalizedName() + + " as a new material for Wire & Cable."); registerOre( OrePrefixes.wireGt01, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 0, - "wire." + aMaterial.getLocalizedName().toLowerCase() + ".01", - "1x " + aMaterial.getLocalizedName() + " Wire", - 0.125F, - aLoss, - 1L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 0, + "wire." + aMaterial.getLocalizedName().toLowerCase() + ".01", + "1x " + aMaterial.getLocalizedName() + " Wire", + 0.125F, + aLoss, + 1L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.wireGt02, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 1, - "wire." + aMaterial.getLocalizedName().toLowerCase() + ".02", - "2x " + aMaterial.getLocalizedName() + " Wire", - 0.25F, - aLoss, - 2L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 1, + "wire." + aMaterial.getLocalizedName().toLowerCase() + ".02", + "2x " + aMaterial.getLocalizedName() + " Wire", + 0.25F, + aLoss, + 2L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.wireGt04, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 2, - "wire." + aMaterial.getLocalizedName().toLowerCase() + ".04", - "4x " + aMaterial.getLocalizedName() + " Wire", - 0.375F, - aLoss, - 4L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 2, + "wire." + aMaterial.getLocalizedName().toLowerCase() + ".04", + "4x " + aMaterial.getLocalizedName() + " Wire", + 0.375F, + aLoss, + 4L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.wireGt08, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 3, - "wire." + aMaterial.getLocalizedName().toLowerCase() + ".08", - "8x " + aMaterial.getLocalizedName() + " Wire", - 0.50F, - aLoss, - 8L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 3, + "wire." + aMaterial.getLocalizedName().toLowerCase() + ".08", + "8x " + aMaterial.getLocalizedName() + " Wire", + 0.50F, + aLoss, + 8L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.wireGt12, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 4, - "wire." + aMaterial.getLocalizedName().toLowerCase() + ".12", - "12x " + aMaterial.getLocalizedName() + " Wire", - GTNH ? 0.625F : 0.75F, - aLoss, - 12L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 4, + "wire." + aMaterial.getLocalizedName().toLowerCase() + ".12", + "12x " + aMaterial.getLocalizedName() + " Wire", + GTNH ? 0.625F : 0.75F, + aLoss, + 12L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.wireGt16, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 5, - "wire." + aMaterial.getLocalizedName().toLowerCase() + ".16", - "16x " + aMaterial.getLocalizedName() + " Wire", - GTNH ? 0.75F : 1.0F, - aLoss, - 16L * aAmperage, - aVoltage, - false, - !aAutoInsulated, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 5, + "wire." + aMaterial.getLocalizedName().toLowerCase() + ".16", + "16x " + aMaterial.getLocalizedName() + " Wire", + GTNH ? 0.75F : 1.0F, + aLoss, + 16L * aAmperage, + aVoltage, + false, + !aAutoInsulated, + aMaterial.getRGBA()).getStackForm(1L)); if (aInsulatable) { registerOre( OrePrefixes.cableGt01, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 6, - "cable." + aMaterial.getLocalizedName().toLowerCase() + ".01", - "1x " + aMaterial.getLocalizedName() + " Cable", - 0.25F, - aLossInsulated, - 1L * aAmperage, - aVoltage, - true, - false, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 6, + "cable." + aMaterial.getLocalizedName().toLowerCase() + ".01", + "1x " + aMaterial.getLocalizedName() + " Cable", + 0.25F, + aLossInsulated, + 1L * aAmperage, + aVoltage, + true, + false, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.cableGt02, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 7, - "cable." + aMaterial.getLocalizedName().toLowerCase() + ".02", - "2x " + aMaterial.getLocalizedName() + " Cable", - 0.375F, - aLossInsulated, - 2L * aAmperage, - aVoltage, - true, - false, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 7, + "cable." + aMaterial.getLocalizedName().toLowerCase() + ".02", + "2x " + aMaterial.getLocalizedName() + " Cable", + 0.375F, + aLossInsulated, + 2L * aAmperage, + aVoltage, + true, + false, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.cableGt04, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 8, - "cable." + aMaterial.getLocalizedName().toLowerCase() + ".04", - "4x " + aMaterial.getLocalizedName() + " Cable", - 0.5F, - aLossInsulated, - 4L * aAmperage, - aVoltage, - true, - false, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 8, + "cable." + aMaterial.getLocalizedName().toLowerCase() + ".04", + "4x " + aMaterial.getLocalizedName() + " Cable", + 0.5F, + aLossInsulated, + 4L * aAmperage, + aVoltage, + true, + false, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.cableGt08, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 9, - "cable." + aMaterial.getLocalizedName().toLowerCase() + ".08", - "8x " + aMaterial.getLocalizedName() + " Cable", - 0.625F, - aLossInsulated, - 8L * aAmperage, - aVoltage, - true, - false, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 9, + "cable." + aMaterial.getLocalizedName().toLowerCase() + ".08", + "8x " + aMaterial.getLocalizedName() + " Cable", + 0.625F, + aLossInsulated, + 8L * aAmperage, + aVoltage, + true, + false, + aMaterial.getRGBA()).getStackForm(1L)); registerOre( OrePrefixes.cableGt12, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 10, - "cable." + aMaterial.getLocalizedName().toLowerCase() + ".12", - "12x " + aMaterial.getLocalizedName() + " Cable", - GTNH ? 0.75F : 0.875F, - aLossInsulated, - 12L * aAmperage, - aVoltage, - true, - false, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 10, + "cable." + aMaterial.getLocalizedName().toLowerCase() + ".12", + "12x " + aMaterial.getLocalizedName() + " Cable", + GTNH ? 0.75F : 0.875F, + aLossInsulated, + 12L * aAmperage, + aVoltage, + true, + false, + aMaterial.getRGBA()).getStackForm(1L)); if (GTNH) { registerOre( cableGt16, aMaterial, new GregtechMetaPipeEntity_Cable( - aStartID + 11, - "cable." + aMaterial.getLocalizedName().toLowerCase() + ".16", - "16x " + aMaterial.getLocalizedName() + " Cable", - 0.875f, - aLossInsulated, - 16L * aAmperage, - aVoltage, - true, - false, - aMaterial.getRGBA()) - .getStackForm(1L)); + aStartID + 11, + "cable." + aMaterial.getLocalizedName().toLowerCase() + ".16", + "16x " + aMaterial.getLocalizedName() + " Cable", + 0.875f, + aLossInsulated, + 16L * aAmperage, + aVoltage, + true, + false, + aMaterial.getRGBA()).getStackForm(1L)); } } } - private static void superConductorFactory( - final GT_Materials Material, - final int Voltage, - final int ID, - final long insulatedLoss, - final long uninsulatedLoss, - final long Amps) { + private static void superConductorFactory(final GT_Materials Material, final int Voltage, final int ID, + final long insulatedLoss, final long uninsulatedLoss, final long Amps) { final GT_Materials T = Material; int V = 0; if (Voltage == 8) { @@ -755,85 +703,71 @@ public class GregtechConduits { // makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false); } - private static void generateGTFluidPipes( - final Materials material, - final int startID, - final int transferRatePerSec, - final int heatResistance, - final boolean isGasProof) { + private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, + final int heatResistance, final boolean isGasProof) { final int transferRatePerTick = transferRatePerSec / 20; final long mass = material.getMass(); final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16; GT_OreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), new GT_MetaPipeEntity_Fluid( - startID, - "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", - "Tiny " + material.mDefaultLocalName + " Fluid Pipe", - 0.25F, - material, - transferRatePerTick * 2, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID, + "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", + "Tiny " + material.mDefaultLocalName + " Fluid Pipe", + 0.25F, + material, + transferRatePerTick * 2, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material), new GT_MetaPipeEntity_Fluid( - startID + 1, - "GT_Pipe_" + material.mDefaultLocalName + "_Small", - "Small " + material.mDefaultLocalName + " Fluid Pipe", - 0.375F, - material, - transferRatePerTick * 4, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 1, + "GT_Pipe_" + material.mDefaultLocalName + "_Small", + "Small " + material.mDefaultLocalName + " Fluid Pipe", + 0.375F, + material, + transferRatePerTick * 4, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material), new GT_MetaPipeEntity_Fluid( - startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", - 0.5F, - material, - transferRatePerTick * 12, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 2, + "GT_Pipe_" + material.mDefaultLocalName + "", + "" + material.mDefaultLocalName + " Fluid Pipe", + 0.5F, + material, + transferRatePerTick * 12, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material), new GT_MetaPipeEntity_Fluid( - startID + 3, - "GT_Pipe_" + material.mDefaultLocalName + "_Large", - "Large " + material.mDefaultLocalName + " Fluid Pipe", - 0.75F, - material, - transferRatePerTick * 24, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 3, + "GT_Pipe_" + material.mDefaultLocalName + "_Large", + "Large " + material.mDefaultLocalName + " Fluid Pipe", + 0.75F, + material, + transferRatePerTick * 24, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material), new GT_MetaPipeEntity_Fluid( - startID + 4, - "GT_Pipe_" + material.mDefaultLocalName + "_Huge", - "Huge " + material.mDefaultLocalName + " Fluid Pipe", - GTNH ? 0.875F : 1.0F, - material, - transferRatePerTick * 48, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 4, + "GT_Pipe_" + material.mDefaultLocalName + "_Huge", + "Huge " + material.mDefaultLocalName + " Fluid Pipe", + GTNH ? 0.875F : 1.0F, + material, + transferRatePerTick * 48, + heatResistance, + isGasProof).getStackForm(1L)); // generatePipeRecipes(material.mDefaultLocalName, mass, voltage); } - private static void generateNonGTFluidPipes( - final GT_Materials material, - final Material myMaterial, - final int startID, - final int transferRatePerSec, - final int heatResistance, - final boolean isGasProof) { + private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, + final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) { final int transferRatePerTick = transferRatePerSec / 20; long mass; if (myMaterial != null) { @@ -847,63 +781,58 @@ public class GregtechConduits { GT_OreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), new GregtechMetaPipeEntityFluid( - startID, - "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", - "Tiny " + material.mDefaultLocalName + " Fluid Pipe", - 0.25F, - material, - transferRatePerTick * 2, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID, + "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", + "Tiny " + material.mDefaultLocalName + " Fluid Pipe", + 0.25F, + material, + transferRatePerTick * 2, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material), new GregtechMetaPipeEntityFluid( - startID + 1, - "GT_Pipe_" + material.mDefaultLocalName + "_Small", - "Small " + material.mDefaultLocalName + " Fluid Pipe", - 0.375F, - material, - transferRatePerTick * 4, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 1, + "GT_Pipe_" + material.mDefaultLocalName + "_Small", + "Small " + material.mDefaultLocalName + " Fluid Pipe", + 0.375F, + material, + transferRatePerTick * 4, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material), new GregtechMetaPipeEntityFluid( - startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", - 0.5F, - material, - transferRatePerTick * 12, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 2, + "GT_Pipe_" + material.mDefaultLocalName + "", + "" + material.mDefaultLocalName + " Fluid Pipe", + 0.5F, + material, + transferRatePerTick * 12, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material), new GregtechMetaPipeEntityFluid( - startID + 3, - "GT_Pipe_" + material.mDefaultLocalName + "_Large", - "Large " + material.mDefaultLocalName + " Fluid Pipe", - 0.75F, - material, - transferRatePerTick * 24, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 3, + "GT_Pipe_" + material.mDefaultLocalName + "_Large", + "Large " + material.mDefaultLocalName + " Fluid Pipe", + 0.75F, + material, + transferRatePerTick * 24, + heatResistance, + isGasProof).getStackForm(1L)); GT_OreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material), new GregtechMetaPipeEntityFluid( - startID + 4, - "GT_Pipe_" + material.mDefaultLocalName + "_Huge", - "Huge " + material.mDefaultLocalName + " Fluid Pipe", - GTNH ? 0.875F : 1.0F, - material, - transferRatePerTick * 48, - heatResistance, - isGasProof) - .getStackForm(1L)); + startID + 4, + "GT_Pipe_" + material.mDefaultLocalName + "_Huge", + "Huge " + material.mDefaultLocalName + " Fluid Pipe", + GTNH ? 0.875F : 1.0F, + material, + transferRatePerTick * 48, + heatResistance, + isGasProof).getStackForm(1L)); // generatePipeRecipes(material.mDefaultLocalName, mass, tVoltageMultiplier); } @@ -929,16 +858,31 @@ public class GregtechConduits { } // Check all pipes are not null - Logger.WARNING("Generated pipeTiny from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null) ? true : false)); - Logger.WARNING("Generated pipeSmall from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null) ? true : false)); - Logger.WARNING("Generated pipeNormal from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null) ? true : false)); - Logger.WARNING("Generated pipeLarge from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null) ? true : false)); - Logger.WARNING("Generated pipeHuge from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true : false)); + Logger.WARNING( + "Generated pipeTiny from " + materialName + + "? " + + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null) ? true + : false)); + Logger.WARNING( + "Generated pipeSmall from " + materialName + + "? " + + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null) ? true + : false)); + Logger.WARNING( + "Generated pipeNormal from " + materialName + + "? " + + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null) ? true + : false)); + Logger.WARNING( + "Generated pipeLarge from " + materialName + + "? " + + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null) ? true + : false)); + Logger.WARNING( + "Generated pipeHuge from " + materialName + + "? " + + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true + : false)); int eut = 120; eut = (int) (8 * vMulti); @@ -1036,8 +980,9 @@ public class GregtechConduits { pipePlateDouble, ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1)); } else { - Logger.INFO("Failed to add a recipe for " + materialName - + " Huge pipes. Double plates probably do not exist."); + Logger.INFO( + "Failed to add a recipe for " + materialName + + " Huge pipes. Double plates probably do not exist."); } } catch (Throwable t) { t.printStackTrace(); @@ -1056,7 +1001,7 @@ public class GregtechConduits { ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName); for (int i = 0; i < tList.size(); ++i) if (GT_Utility.areStacksEqual((ItemStack) tList.get(i), aStack, true)) return false; - OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] {aStack})); + OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack })); return true; } @@ -1080,139 +1025,209 @@ public class GregtechConduits { ItemStack aFineWire = aMaterial.getFineWire(1); // Adds manual crafting recipe - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aPlate, aWire01})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aPlate, aWire01 })) { RecipeUtils.addShapedRecipe( - aPlate, CI.craftingToolWireCutter, null, null, null, null, null, null, null, aWire01); + aPlate, + CI.craftingToolWireCutter, + null, + null, + null, + null, + null, + null, + null, + aWire01); } // Wire mill if (ItemUtils.checkForInvalidItems( - new ItemStack[] {aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16})) { + new ItemStack[] { aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) { GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getWire01(2), 100, 4); + aMaterial.getIngot(1), + GT_Utility.getIntegratedCircuit(1), + aMaterial.getWire01(2), + 100, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(2), aMaterial.getWire02(1), 150, 4); + aMaterial.getIngot(1), + GT_Utility.getIntegratedCircuit(2), + aMaterial.getWire02(1), + 150, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(2), GT_Utility.getIntegratedCircuit(4), aMaterial.getWire04(1), 200, 4); + aMaterial.getIngot(2), + GT_Utility.getIntegratedCircuit(4), + aMaterial.getWire04(1), + 200, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(4), GT_Utility.getIntegratedCircuit(8), aMaterial.getWire08(1), 250, 4); + aMaterial.getIngot(4), + GT_Utility.getIntegratedCircuit(8), + aMaterial.getWire08(1), + 250, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(6), GT_Utility.getIntegratedCircuit(12), aMaterial.getWire12(1), 300, 4); + aMaterial.getIngot(6), + GT_Utility.getIntegratedCircuit(12), + aMaterial.getWire12(1), + 300, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(8), GT_Utility.getIntegratedCircuit(16), aMaterial.getWire16(1), 350, 4); + aMaterial.getIngot(8), + GT_Utility.getIntegratedCircuit(16), + aMaterial.getWire16(1), + 350, + 4); } - if (ItemUtils.checkForInvalidItems( - new ItemStack[] {aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16})) { + if (ItemUtils + .checkForInvalidItems(new ItemStack[] { aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) { GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getWire01(1), 50, 4); + aMaterial.getRod(1), + GT_Utility.getIntegratedCircuit(1), + aMaterial.getWire01(1), + 50, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(2), GT_Utility.getIntegratedCircuit(2), aMaterial.getWire02(1), 100, 4); + aMaterial.getRod(2), + GT_Utility.getIntegratedCircuit(2), + aMaterial.getWire02(1), + 100, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(4), GT_Utility.getIntegratedCircuit(4), aMaterial.getWire04(1), 150, 4); + aMaterial.getRod(4), + GT_Utility.getIntegratedCircuit(4), + aMaterial.getWire04(1), + 150, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(8), GT_Utility.getIntegratedCircuit(8), aMaterial.getWire08(1), 200, 4); + aMaterial.getRod(8), + GT_Utility.getIntegratedCircuit(8), + aMaterial.getWire08(1), + 200, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(12), GT_Utility.getIntegratedCircuit(12), aMaterial.getWire12(1), 250, 4); + aMaterial.getRod(12), + GT_Utility.getIntegratedCircuit(12), + aMaterial.getWire12(1), + 250, + 4); GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(16), GT_Utility.getIntegratedCircuit(16), aMaterial.getWire16(1), 300, 4); + aMaterial.getRod(16), + GT_Utility.getIntegratedCircuit(16), + aMaterial.getWire16(1), + 300, + 4); } - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aIngot, aFineWire})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aFineWire })) { GT_Values.RA.addWiremillRecipe( - aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(3), aMaterial.getFineWire(8), 100, 4); + aMaterial.getIngot(1), + GT_Utility.getIntegratedCircuit(3), + aMaterial.getFineWire(8), + 100, + 4); } - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aRod, aFineWire})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aRod, aFineWire })) { GT_Values.RA.addWiremillRecipe( - aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(3), aMaterial.getFineWire(4), 50, 4); + aMaterial.getRod(1), + GT_Utility.getIntegratedCircuit(3), + aMaterial.getFineWire(4), + 50, + 4); } - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aFineWire})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aFineWire })) { GT_Values.RA.addWiremillRecipe( - aMaterial.getWire01(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getFineWire(4), 200, 8); + aMaterial.getWire01(1), + GT_Utility.getIntegratedCircuit(1), + aMaterial.getFineWire(4), + 200, + 8); } // Extruder - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aIngot, aWire01})) { - GT_Values.RA.addExtruderRecipe( - aIngot, ItemList.Shape_Extruder_Wire.get(0), aMaterial.getWire01(2), 196, 96); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aWire01 })) { + GT_Values.RA + .addExtruderRecipe(aIngot, ItemList.Shape_Extruder_Wire.get(0), aMaterial.getWire01(2), 196, 96); } - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aCable01, aWire01})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCable01, aWire01 })) { GT_Values.RA.addUnboxingRecipe(aCable01, aWire01, null, 100, 8); } // Shapeless Down-Crafting // 2x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire02}, aMaterial.getWire01(2)); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire02 }, aMaterial.getWire01(2)); } // 4x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire04})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04}, aMaterial.getWire01(4)); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire04 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04 }, aMaterial.getWire01(4)); } // 8x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire08})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire08}, aMaterial.getWire01(8)); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire08 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire08 }, aMaterial.getWire01(8)); } // 12x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire12})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire12}, aMaterial.getWire01(12)); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire12 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire12 }, aMaterial.getWire01(12)); } // 16x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire16})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire16}, aMaterial.getWire01(16)); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire16 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire16 }, aMaterial.getWire01(16)); } // 1x -> 2x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire01, aWire01}, aWire02); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire01, aWire01 }, aWire02); } // 2x -> 4x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire02, aWire04})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire02, aWire02}, aWire04); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire02, aWire04 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire02, aWire02 }, aWire04); } // 4x -> 8x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aWire08})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04, aWire04}, aWire08); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aWire08 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04, aWire04 }, aWire08); } // 8x -> 12x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aWire08, aWire12})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04, aWire08}, aWire12); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aWire08, aWire12 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04, aWire08 }, aWire12); } // 12x -> 16x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aWire12, aWire16})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire04, aWire12}, aWire16); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aWire12, aWire16 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire04, aWire12 }, aWire16); } // 8x -> 16x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire08, aWire16})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire08, aWire08}, aWire16); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire08, aWire16 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire08, aWire08 }, aWire16); } // 1x -> 4x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire04})) { - RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {aWire01, aWire01, aWire01, aWire01}, aWire04); + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire04 })) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] { aWire01, aWire01, aWire01, aWire01 }, aWire04); } // 1x -> 8x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire08})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire08 })) { RecipeUtils.addShapelessGregtechRecipe( - new ItemStack[] {aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01}, aWire08); + new ItemStack[] { aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01, aWire01 }, + aWire08); } // Wire to Cable // 1x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aCable01})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aCable01 })) { GT_Values.RA.addAssemblerRecipe( aWire01, CI.getNumberedCircuit(24), @@ -1223,7 +1238,7 @@ public class GregtechConduits { } // 2x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire02, aCable02})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire02, aCable02 })) { GT_Values.RA.addAssemblerRecipe( aWire02, CI.getNumberedCircuit(24), @@ -1234,7 +1249,7 @@ public class GregtechConduits { } // 4x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire04, aCable04})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aCable04 })) { GT_Values.RA.addAssemblerRecipe( aWire04, CI.getNumberedCircuit(24), @@ -1245,7 +1260,7 @@ public class GregtechConduits { } // 8x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire08, aCable08})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire08, aCable08 })) { GT_Values.RA.addAssemblerRecipe( aWire08, CI.getNumberedCircuit(24), @@ -1256,7 +1271,7 @@ public class GregtechConduits { } // 12x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire12, aCable12})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire12, aCable12 })) { GT_Values.RA.addAssemblerRecipe( aWire12, CI.getNumberedCircuit(24), @@ -1267,7 +1282,7 @@ public class GregtechConduits { } // 16x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire16, aCable16})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire16, aCable16 })) { GT_Values.RA.addAssemblerRecipe( aWire16, CI.getNumberedCircuit(24), @@ -1280,27 +1295,27 @@ public class GregtechConduits { // Assemble small wires into bigger wires // 2x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(2), CI.getNumberedCircuit(2), null, aWire02, 100, 8); } // 4x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(4), CI.getNumberedCircuit(4), null, aWire04, 100, 8); } // 8x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(8), CI.getNumberedCircuit(8), null, aWire08, 100, 8); } // 12x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(12), CI.getNumberedCircuit(12), null, aWire12, 100, 8); } // 16x - if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aWire02})) { + if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { GT_Values.RA.addAssemblerRecipe(aMaterial.getWire01(16), CI.getNumberedCircuit(16), null, aWire16, 100, 8); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index e261b2f01a..2cd484bc9f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -24,7 +24,8 @@ public class GregtechCustomHatches { private static void run1() { - GregtechItemList.Hatch_Input_Cryotheum.set(new GT_MetaTileEntity_Hatch_CustomFluidBase( + GregtechItemList.Hatch_Input_Cryotheum.set( + new GT_MetaTileEntity_Hatch_CustomFluidBase( FluidUtils.getFluidStack("cryotheum", 1).getFluid(), // Fluid // to // resitrct @@ -34,10 +35,10 @@ public class GregtechCustomHatches { 967, // ID "hatch.cryotheum.input.tier.00", // unlocal name "Cryotheum Cooling Hatch" // Local name - ) - .getStackForm(1L)); + ).getStackForm(1L)); - GregtechItemList.Hatch_Input_Pyrotheum.set(new GT_MetaTileEntity_Hatch_CustomFluidBase( + GregtechItemList.Hatch_Input_Pyrotheum.set( + new GT_MetaTileEntity_Hatch_CustomFluidBase( FluidUtils.getFluidStack("pyrotheum", 1).getFluid(), // Fluid // to // resitrct @@ -47,22 +48,21 @@ public class GregtechCustomHatches { 968, // ID "hatch.pyrotheum.input.tier.00", // unlocal name "Pyrotheum Heating Vent" // Local name - ) - .getStackForm(1L)); + ).getStackForm(1L)); - GregtechItemList.Hatch_Input_Naquadah.set(new GT_MetaTileEntity_Hatch_Naquadah( + GregtechItemList.Hatch_Input_Naquadah.set( + new GT_MetaTileEntity_Hatch_Naquadah( 969, // ID "hatch.naquadah.input.tier.00", // unlocal name "Naquadah Reactor Input hatch" // Local name - ) - .getStackForm(1L)); + ).getStackForm(1L)); - GregtechItemList.Hatch_Input_TurbineHousing.set(new GT_MetaTileEntity_Hatch_TurbineProvider( + GregtechItemList.Hatch_Input_TurbineHousing.set( + new GT_MetaTileEntity_Hatch_TurbineProvider( 31025, // ID "hatch.turbine.input.tier.00", // unlocal name "Turbine Housing", // Local name - 8) - .getStackForm(1L)); + 8).getStackForm(1L)); // Multiblock Control Core Bus GregtechItemList.Hatch_Control_Core.set( @@ -73,9 +73,12 @@ public class GregtechCustomHatches { GregtechItemList.Hatch_Air_Intake.set( new GT_MetaTileEntity_Hatch_AirIntake(861, "hatch.air.intake.tier.00", "Air Intake Hatch", 5) .getStackForm(1L)); - GregtechItemList.Hatch_Air_Intake_Extreme.set(new GT_MetaTileEntity_Hatch_AirIntake_Extreme( - 31070, "hatch.air.intake.tier.01", "Extreme Air Intake Hatch", 6) - .getStackForm(1L)); + GregtechItemList.Hatch_Air_Intake_Extreme.set( + new GT_MetaTileEntity_Hatch_AirIntake_Extreme( + 31070, + "hatch.air.intake.tier.01", + "Extreme Air Intake Hatch", + 6).getStackForm(1L)); // Multiblock Reservoir Hatch GregtechItemList.Hatch_Reservoir.set( @@ -83,7 +86,8 @@ public class GregtechCustomHatches { .getStackForm(1L)); // Steam Hatch - GregtechItemList.Hatch_Input_Steam.set(new GT_MetaTileEntity_Hatch_CustomFluidBase( + GregtechItemList.Hatch_Input_Steam.set( + new GT_MetaTileEntity_Hatch_CustomFluidBase( FluidUtils.getSteam(1).getFluid(), // Fluid // to // resitrct @@ -93,38 +97,64 @@ public class GregtechCustomHatches { 31040, // ID "hatch.steam.input.tier.00", // unlocal name "Steam Hatch" // Local name - ) - .getStackForm(1L)); + ).getStackForm(1L)); } private static void run2() { - GregtechItemList.Hatch_Muffler_Adv_LV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_MV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30002, "hatch.muffler.adv.tier.02", "Advanced Muffler Hatch (MV)", 2)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_HV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30003, "hatch.muffler.adv.tier.03", "Advanced Muffler Hatch (HV)", 3)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_EV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30004, "hatch.muffler.adv.tier.04", "Advanced Muffler Hatch (EV)", 4)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_IV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30005, "hatch.muffler.adv.tier.05", "Advanced Muffler Hatch (IV)", 5)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_LuV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30006, "hatch.muffler.adv.tier.06", "Advanced Muffler Hatch (LuV)", 6)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_ZPM.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30007, "hatch.muffler.adv.tier.07", "Advanced Muffler Hatch (ZPM)", 7)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_UV.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30008, "hatch.muffler.adv.tier.08", "Advanced Muffler Hatch (UV)", 8)) - .getStackForm(1L)); - GregtechItemList.Hatch_Muffler_Adv_MAX.set((new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30009, "hatch.muffler.adv.tier.09", "Advanced Muffler Hatch (MAX)", 9)) - .getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_LV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30001, + "hatch.muffler.adv.tier.01", + "Advanced Muffler Hatch (LV)", + 1)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_MV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30002, + "hatch.muffler.adv.tier.02", + "Advanced Muffler Hatch (MV)", + 2)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_HV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30003, + "hatch.muffler.adv.tier.03", + "Advanced Muffler Hatch (HV)", + 3)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_EV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30004, + "hatch.muffler.adv.tier.04", + "Advanced Muffler Hatch (EV)", + 4)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_IV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30005, + "hatch.muffler.adv.tier.05", + "Advanced Muffler Hatch (IV)", + 5)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_LuV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30006, + "hatch.muffler.adv.tier.06", + "Advanced Muffler Hatch (LuV)", + 6)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_ZPM.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30007, + "hatch.muffler.adv.tier.07", + "Advanced Muffler Hatch (ZPM)", + 7)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_UV.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30008, + "hatch.muffler.adv.tier.08", + "Advanced Muffler Hatch (UV)", + 8)).getStackForm(1L)); + GregtechItemList.Hatch_Muffler_Adv_MAX.set( + (new GT_MetaTileEntity_Hatch_Muffler_Adv( + 30009, + "hatch.muffler.adv.tier.09", + "Advanced Muffler Hatch (MAX)", + 9)).getStackForm(1L)); } private static void run3() { @@ -201,25 +231,37 @@ public class GregtechCustomHatches { .getStackForm(1L)); } - private static GT_MetaTileEntity_SuperBus_Input makeInputBus( - int id, String unlocalizedName, String localizedName, int tier) { + private static GT_MetaTileEntity_SuperBus_Input makeInputBus(int id, String unlocalizedName, String localizedName, + int tier) { return new GT_MetaTileEntity_SuperBus_Input(id, unlocalizedName, localizedName, tier); } - private static GT_MetaTileEntity_SuperBus_Output makeOutputBus( - int id, String unlocalizedName, String localizedName, int tier) { + private static GT_MetaTileEntity_SuperBus_Output makeOutputBus(int id, String unlocalizedName, String localizedName, + int tier) { return new GT_MetaTileEntity_SuperBus_Output(id, unlocalizedName, localizedName, tier); } private static void run4() { int aID = 31060; // 41, "hatch.energy.tier.01", "LV Energy Hatch", 1 - GT_MetaTileEntity_Hatch_Energy_RTG aHatch1 = - new GT_MetaTileEntity_Hatch_Energy_RTG(aID++, "hatch.energy.rtg.tier.01", "RTG Power Unit [LV]", 1, 9); - GT_MetaTileEntity_Hatch_Energy_RTG aHatch2 = - new GT_MetaTileEntity_Hatch_Energy_RTG(aID++, "hatch.energy.rtg.tier.02", "RTG Power Unit [MV]", 2, 9); - GT_MetaTileEntity_Hatch_Energy_RTG aHatch3 = - new GT_MetaTileEntity_Hatch_Energy_RTG(aID++, "hatch.energy.rtg.tier.03", "RTG Power Unit [HV]", 3, 9); + GT_MetaTileEntity_Hatch_Energy_RTG aHatch1 = new GT_MetaTileEntity_Hatch_Energy_RTG( + aID++, + "hatch.energy.rtg.tier.01", + "RTG Power Unit [LV]", + 1, + 9); + GT_MetaTileEntity_Hatch_Energy_RTG aHatch2 = new GT_MetaTileEntity_Hatch_Energy_RTG( + aID++, + "hatch.energy.rtg.tier.02", + "RTG Power Unit [MV]", + 2, + 9); + GT_MetaTileEntity_Hatch_Energy_RTG aHatch3 = new GT_MetaTileEntity_Hatch_Energy_RTG( + aID++, + "hatch.energy.rtg.tier.03", + "RTG Power Unit [HV]", + 3, + 9); GregtechItemList.Hatch_RTG_LV.set(aHatch1.getStackForm(1L)); GregtechItemList.Hatch_RTG_MV.set(aHatch2.getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 6dba10bb98..7a42bf1c9c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -14,9 +16,9 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Dehydrator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator; -import net.minecraft.item.ItemStack; public class GregtechDehydrator { + public static void run() { if (LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators."); @@ -29,87 +31,82 @@ public class GregtechDehydrator { private static void run1() { /* - * - * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String - * aName, String aNameRegional, int aTier, String aDescription, - * GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int - * aTankCapacity, int aGUIParameterA, int aGUIParameterB, String - * aGUIName, String aSound, boolean aSharedTank, boolean - * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, - * Object[] aRecipe) { - * + * public GT_MetaTileEntity_BasicMachine_GT_Recipe( int aID, String aName, String aNameRegional, int aTier, + * String aDescription, GT_Recipe_Map aRecipes, int aInputSlots, int aOutputSlots, int aTankCapacity, int + * aGUIParameterA, int aGUIParameterB, String aGUIName, String aSound, boolean aSharedTank, boolean + * aRequiresFluidForFiltering, int aSpecialEffect, String aOverlays, Object[] aRecipe) { */ // Basic - GregtechItemList.GT_Dehydrator_MV.set(new GT_MetaTileEntity_Dehydrator( + GregtechItemList.GT_Dehydrator_MV.set( + new GT_MetaTileEntity_Dehydrator( 911, "machine.dehydrator.tier.00", "Basic Dehydrator I", 2, "This dehydrates your Grapes into Raisins.", - 16000) - .getStackForm(1L)); + 16000).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_HV.set(new GT_MetaTileEntity_Dehydrator( + GregtechItemList.GT_Dehydrator_HV.set( + new GT_MetaTileEntity_Dehydrator( 912, "machine.dehydrator.tier.01", "Basic Dehydrator II", 3, "This dehydrates your Grapes into Raisins.", - 32000) - .getStackForm(1L)); + 32000).getStackForm(1L)); // Chemical - GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_Dehydrator( + GregtechItemList.GT_Dehydrator_EV.set( + new GT_MetaTileEntity_Dehydrator( 813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4, "A hangover is the way your body reacts to dehydration.", - 48000) - .getStackForm(1L)); + 48000).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_Dehydrator( + GregtechItemList.GT_Dehydrator_IV.set( + new GT_MetaTileEntity_Dehydrator( 814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, "A hangover is the way your body reacts to dehydration.", - 48000) - .getStackForm(1L)); + 48000).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_Dehydrator( + GregtechItemList.GT_Dehydrator_LuV.set( + new GT_MetaTileEntity_Dehydrator( 815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, "You could probably make space icecream with this..", - 64000) - .getStackForm(1L)); + 64000).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_Dehydrator( + GregtechItemList.GT_Dehydrator_ZPM.set( + new GT_MetaTileEntity_Dehydrator( 816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, "You can definitely make space icecream with this..", - 64000) - .getStackForm(1L)); + 64000).getStackForm(1L)); // Advanced GregtechItemList.Controller_Vacuum_Furnace.set( new GregtechMetaTileEntity_IndustrialDehydrator(995, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri") .getStackForm(1L)); - ItemStack coilWire1 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4); - ItemStack coilWire2 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4); - ItemStack coilWire3 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4); - ItemStack coilWire4 = - ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4); + ItemStack coilWire1 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire", "coilWire1", 0, 4); + ItemStack coilWire2 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:1", "coilWire2", 1, 4); + ItemStack coilWire3 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:2", "coilWire3", 2, 4); + ItemStack coilWire4 = ItemUtils + .getItemStackWithMeta(true, "miscutils:itemDehydratorCoilWire:3", "coilWire4", 3, 4); ItemStack coilT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil", "coil1", 0, 1); ItemStack coilT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:1", "coil2", 1, 1); ItemStack coilT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemDehydratorCoil:2", "coil3", 2, 1); @@ -130,146 +127,67 @@ public class GregtechDehydrator { // Basic GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Dehydrator_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[] { - "ECE", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('P'), - ItemList.Robot_Arm_MV, - Character.valueOf('E'), - OrePrefixes.wireFine.get(Materials.RedAlloy), - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Good), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Copper), - Character.valueOf('G'), - OrePrefixes.gearGt.get(Materials.Steel) - }); + new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'), + ItemList.Robot_Arm_MV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.RedAlloy), + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Copper), Character.valueOf('G'), + OrePrefixes.gearGt.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Dehydrator_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[] { - "ECE", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_HV, - Character.valueOf('P'), - ItemList.Robot_Arm_HV, - Character.valueOf('E'), - OrePrefixes.wireFine.get(Materials.Electrum), - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Advanced), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Silver), - Character.valueOf('G'), - ALLOY.POTIN.getGear(1) - }); + new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'), + ItemList.Robot_Arm_HV, Character.valueOf('E'), OrePrefixes.wireFine.get(Materials.Electrum), + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Silver), Character.valueOf('G'), ALLOY.POTIN.getGear(1) }); // Chemical GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Dehydrator_EV.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[] { - "ECE", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('P'), - ItemList.Robot_Arm_EV, - Character.valueOf('E'), - coilT1, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Data), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Aluminium), - Character.valueOf('G'), - ALLOY.TUMBAGA.getGear(1) - }); + new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'), + ItemList.Robot_Arm_EV, Character.valueOf('E'), coilT1, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Data), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'), + ALLOY.TUMBAGA.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Dehydrator_IV.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[] { - "ECE", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('P'), - ItemList.Robot_Arm_IV, - Character.valueOf('E'), - coilT2, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Elite), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Tungsten), - Character.valueOf('G'), - ALLOY.INCONEL_690.getGear(1) - }); + new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), + ItemList.Robot_Arm_IV, Character.valueOf('E'), coilT2, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'), + ALLOY.INCONEL_690.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Dehydrator_LuV.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[] { - "ECE", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('P'), - CI.robotArm_LuV, - Character.valueOf('E'), - coilT3, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Master), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Naquadah), - Character.valueOf('G'), - ALLOY.HASTELLOY_N.getGear(1) - }); + new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), + CI.robotArm_LuV, Character.valueOf('E'), coilT3, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Naquadah), Character.valueOf('G'), + ALLOY.HASTELLOY_N.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Dehydrator_ZPM.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[] { - "ECE", - "WMW", - "GPG", - Character.valueOf('M'), - ItemList.Hull_ZPM, - Character.valueOf('P'), - CI.robotArm_ZPM, - Character.valueOf('E'), - coilT4, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Ultimate), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Osmium), - Character.valueOf('G'), - ALLOY.ZERON_100.getGear(1) - }); + new Object[] { "ECE", "WMW", "GPG", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('P'), + CI.robotArm_ZPM, Character.valueOf('E'), coilT4, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Osmium), Character.valueOf('G'), + ALLOY.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 1eed50db26..4d074619dc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -28,7 +28,8 @@ public class GregtechEnergyBuffer { private static void run1() { // itemBufferCore = new - // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + ":itemBufferCore"); + // Item().setUnlocalizedName("itemBufferCore").setCreativeTab(AddToCreativeTab.tabMisc).setTextureName(CORE.MODID + // + ":itemBufferCore"); // Registry // GameRegistry.registerItem(itemBufferCore, "itemBufferCore"); @@ -67,9 +68,14 @@ public class GregtechEnergyBuffer { new GregtechMetaEnergyBuffer(779, "energybuffer.tier.09", "MAX Voltage Energy Buffer", 9, "", 1) .getStackForm(1L)); // Creative Buffer Has Special ID - GregtechItemList.Energy_Buffer_CREATIVE.set(new GregtechMetaCreativeEnergyBuffer( - 750, "energybuffer.tier.xx", "512V Creative Energy Buffer", 3, "", 0) - .getStackForm(1L)); + GregtechItemList.Energy_Buffer_CREATIVE.set( + new GregtechMetaCreativeEnergyBuffer( + 750, + "energybuffer.tier.xx", + "512V Creative Energy Buffer", + 3, + "", + 0).getStackForm(1L)); if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) { // RF Convertor Buffer Has Special ID @@ -80,174 +86,92 @@ public class GregtechEnergyBuffer { GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ULV.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_ULV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Lead), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_LV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Tin), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.AnyCopper), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_HV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Gold), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_EV.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Aluminium), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_IV.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Tungsten), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_LuV.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Osmium), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ZPM.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_ZPM, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Osmium), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_UV.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_UV, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Osmium), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.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[] { - "WTW", - "WMW", - Character.valueOf('M'), - ItemList.Hull_MAX, - Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Superconductor), - Character.valueOf('T'), - GregtechOreDictNames.buffer_core - }); - /*GT_ModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { - "WTW", "WMW", Character.valueOf('M'), - ItemList.Hull_MAX, Character.valueOf('W'), - OrePrefixes.wireGt08.get(Materials.Superconductor), - Character.valueOf('T'), GregtechOreDictNames.buffer_core });*/ + new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), + OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), + GregtechOreDictNames.buffer_core }); + /* + * GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), + * GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | + * GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", + * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), + * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core + * }); + */ } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java index f07091e481..f3d5a5b479 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java @@ -23,21 +23,27 @@ public class GregtechFactoryGradeReplacementMultis { GregtechItemList.Machine_Adv_ImplosionCompressor.set( new GregtechMetaTileEntity_Adv_Implosion(964, "multimachine.adv.implosioncompressor", "Density^2") .getStackForm(1L)); - GregtechItemList.Industrial_Cryogenic_Freezer.set(new GregtechMetaTileEntity_IndustrialVacuumFreezer( - 910, "multimachine.adv.industrialfreezer", "Cryogenic Freezer") - .getStackForm(1L)); + GregtechItemList.Industrial_Cryogenic_Freezer.set( + new GregtechMetaTileEntity_IndustrialVacuumFreezer( + 910, + "multimachine.adv.industrialfreezer", + "Cryogenic Freezer").getStackForm(1L)); GregtechItemList.FusionComputer_UV2.set( new GregtechMetaTileEntity_Adv_Fusion_MK4(965, "fusioncomputer.tier.09", "FusionTech MK IV") .getStackForm(1L)); // 31021 - GregtechItemList.Machine_Adv_DistillationTower.set(new GregtechMetaTileEntity_Adv_DistillationTower( - 31021, "multimachine.adv.distillationtower", "Dangote Distillus") - .getStackForm(1L)); + GregtechItemList.Machine_Adv_DistillationTower.set( + new GregtechMetaTileEntity_Adv_DistillationTower( + 31021, + "multimachine.adv.distillationtower", + "Dangote Distillus").getStackForm(1L)); if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - GregtechItemList.Machine_Adv_AssemblyLine.set(new GregtechMetaTileEntity_Adv_AssemblyLine( - 31024, "multimachine.adv.assemblyline", "Compound Fabricator") - .getStackForm(1L)); + GregtechItemList.Machine_Adv_AssemblyLine.set( + new GregtechMetaTileEntity_Adv_AssemblyLine( + 31024, + "multimachine.adv.assemblyline", + "Compound Fabricator").getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java index 81420275da..ebc6be40c9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFluidReactor.java @@ -5,17 +5,13 @@ public class GregtechFluidReactor { public static void run() { /* - * GregtechItemList.FluidReactor_LV .set(new - * GregtechMetaTileEntity_ChemicalReactor(31021, "chemicalplant.01.tier.01", - * "Chemical Plant I", 1) .getStackForm(1L)); GregtechItemList.FluidReactor_HV - * .set(new GregtechMetaTileEntity_ChemicalReactor(31022, - * "chemicalplant.01.tier.02", "Chemical Plant II", 3) .getStackForm(1L)); - * GregtechItemList.FluidReactor_IV .set(new - * GregtechMetaTileEntity_ChemicalReactor(31023, "chemicalplant.01.tier.03", - * "Chemical Plant III", 5) .getStackForm(1L)); - * GregtechItemList.FluidReactor_ZPM .set(new - * GregtechMetaTileEntity_ChemicalReactor(31024, "chemicalplant.01.tier.04", - * "Chemical Plant IV", 7) .getStackForm(1L)); + * GregtechItemList.FluidReactor_LV .set(new GregtechMetaTileEntity_ChemicalReactor(31021, + * "chemicalplant.01.tier.01", "Chemical Plant I", 1) .getStackForm(1L)); GregtechItemList.FluidReactor_HV + * .set(new GregtechMetaTileEntity_ChemicalReactor(31022, "chemicalplant.01.tier.02", "Chemical Plant II", 3) + * .getStackForm(1L)); GregtechItemList.FluidReactor_IV .set(new GregtechMetaTileEntity_ChemicalReactor(31023, + * "chemicalplant.01.tier.03", "Chemical Plant III", 5) .getStackForm(1L)); GregtechItemList.FluidReactor_ZPM + * .set(new GregtechMetaTileEntity_ChemicalReactor(31024, "chemicalplant.01.tier.04", "Chemical Plant IV", 7) + * .getStackForm(1L)); */ } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java index f93f6e165a..5593f7a239 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java @@ -12,11 +12,15 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEn import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_SteamTurbine; public class GregtechGeneratorsULV { + public static void run() { - GregtechItemList.Generator_Diesel_ULV.set(new GT_MetaTileEntity_ULV_CombustionGenerator( - 960, "basicgenerator.diesel.tier.00", "Simple Combustion Generator", 0) - .getStackForm(1L)); + GregtechItemList.Generator_Diesel_ULV.set( + new GT_MetaTileEntity_ULV_CombustionGenerator( + 960, + "basicgenerator.diesel.tier.00", + "Simple Combustion Generator", + 0).getStackForm(1L)); GregtechItemList.Generator_Gas_Turbine_ULV.set( new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0) .getStackForm(1L)); @@ -25,56 +29,24 @@ public class GregtechGeneratorsULV { .getStackForm(1L)); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - ItemList.Hull_ULV, - 'P', - GregtechItemList.Electric_Piston_ULV, - 'E', - GregtechItemList.Electric_Motor_ULV, - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OrePrefixes.cableGt01.get(Materials.RedAlloy), - 'G', - OrePrefixes.gearGt.get(Materials.Bronze) - }); + GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), + bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV, + 'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive), + 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G', + OrePrefixes.gearGt.get(Materials.Bronze) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[] { - "CRC", - "RMR", - "EWE", - 'M', - ItemList.Hull_ULV, - 'E', - GregtechItemList.Electric_Motor_ULV, - 'R', - OrePrefixes.rotor.get(Materials.Tin), - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OrePrefixes.cableGt01.get(Materials.RedAlloy) - }); + GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), + bitsd, + new Object[] { "CRC", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, + 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), + 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), bitsd, new Object[] { - "PCP", - "RMR", - "EWE", - 'M', - ItemList.Hull_ULV, - 'E', - GregtechItemList.Electric_Motor_ULV, - 'R', - OrePrefixes.rotor.get(Materials.Tin), - 'C', - OrePrefixes.circuit.get(Materials.Primitive), - 'W', - OrePrefixes.cableGt01.get(Materials.RedAlloy), - 'P', - OrePrefixes.pipeMedium.get(Materials.Copper) - }); + GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), + bitsd, + new Object[] { "PCP", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, + 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), + 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', + OrePrefixes.pipeMedium.get(Materials.Copper) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index cb8dfaf0c1..5a1638509c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.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; @@ -11,7 +13,6 @@ import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; -import net.minecraft.item.ItemStack; public class GregtechGeothermalThermalGenerator { @@ -25,88 +26,58 @@ public class GregtechGeothermalThermalGenerator { } private static void run1() { - GregtechItemList.Geothermal_Engine_EV.set(new GregtechMetaTileEntityGeothermalGenerator( - 830, "advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4) - .getStackForm(1L)); - GregtechItemList.Geothermal_Engine_IV.set(new GregtechMetaTileEntityGeothermalGenerator( - 831, "advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5) - .getStackForm(1L)); - GregtechItemList.Geothermal_Engine_LuV.set(new GregtechMetaTileEntityGeothermalGenerator( - 832, "advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6) - .getStackForm(1L)); + GregtechItemList.Geothermal_Engine_EV.set( + new GregtechMetaTileEntityGeothermalGenerator( + 830, + "advancedgenerator.geothermalFuel.tier.01", + "Basic Geothermal Engine", + 4).getStackForm(1L)); + GregtechItemList.Geothermal_Engine_IV.set( + new GregtechMetaTileEntityGeothermalGenerator( + 831, + "advancedgenerator.geothermalFuel.tier.02", + "Turbo Geothermal Engine", + 5).getStackForm(1L)); + GregtechItemList.Geothermal_Engine_LuV.set( + new GregtechMetaTileEntityGeothermalGenerator( + 832, + "advancedgenerator.geothermalFuel.tier.03", + "Vulcan Geothermal Engine", + 6).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_EV.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[] { - "CEC", - "GMG", - "PWP", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('P'), - ItemList.Electric_Piston_EV, - Character.valueOf('E'), - ItemList.Electric_Motor_EV, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Ultimate), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Aluminium), - Character.valueOf('G'), - ALLOY.TANTALLOY_61.getGear(1) - }); + new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'), + ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV, + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Aluminium), Character.valueOf('G'), + ALLOY.TANTALLOY_61.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_IV.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[] { - "CEC", - "GMG", - "PWP", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('P'), - ItemList.Electric_Piston_IV, - Character.valueOf('E'), - ItemList.Electric_Motor_IV, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Superconductor), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Platinum), - Character.valueOf('G'), - ALLOY.STELLITE.getGear(1) - }); + new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), + ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV, + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Superconductor), + Character.valueOf('W'), OrePrefixes.cableGt04.get(Materials.Platinum), Character.valueOf('G'), + ALLOY.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; GT_ModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_LuV.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[] { - "CEC", - "GMG", - "PWP", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('P'), - INGREDIENT_1, - Character.valueOf('E'), - INGREDIENT_2, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Infinite), - Character.valueOf('W'), - OrePrefixes.cableGt04.get(Materials.Tungsten), - Character.valueOf('G'), - ALLOY.ZERON_100.getGear(1) - }); + new Object[] { "CEC", "GMG", "PWP", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), + INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'), + OrePrefixes.cableGt04.get(Materials.Tungsten), Character.valueOf('G'), + ALLOY.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java index 0e4e6a280b..02a28e5b1f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gtPlusPlus.core.lib.CORE.GTNH; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -11,14 +13,12 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp; import gtPlusPlus.xmod.gregtech.common.StaticFields59; -import net.minecraft.item.ItemStack; public class GregtechHiAmpTransformer { public static void run() { - long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; int mID = 877; @@ -29,90 +29,90 @@ public class GregtechHiAmpTransformer { mHammerName = "Mallet"; } - GregtechItemList.Transformer_HA_LV_ULV.set(new GregtechMetaTransformerHiAmp( + GregtechItemList.Transformer_HA_LV_ULV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.00", "ULV Hi-Amp Transformer", 0, - "LV -> ULV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_MV_LV.set(new GregtechMetaTransformerHiAmp( + "LV -> ULV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_MV_LV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.01", "LV Hi-Amp Transformer", 1, - "MV -> LV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_HV_MV.set(new GregtechMetaTransformerHiAmp( + "MV -> LV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_HV_MV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.02", "MV Hi-Amp Transformer", 2, - "HV -> MV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_EV_HV.set(new GregtechMetaTransformerHiAmp( + "HV -> MV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_EV_HV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.03", "HV Hi-Amp Transformer", 3, - "EV -> HV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_IV_EV.set(new GregtechMetaTransformerHiAmp( + "EV -> HV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_IV_EV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.04", "EV Hi-Amp Transformer", 4, - "IV -> EV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_LuV_IV.set(new GregtechMetaTransformerHiAmp( + "IV -> EV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_LuV_IV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.05", "IV Hi-Amp Transformer", 5, - "LuV -> IV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_ZPM_LuV.set(new GregtechMetaTransformerHiAmp( + "LuV -> IV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_ZPM_LuV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.06", "LuV Hi-Amp Transformer", 6, - "ZPM -> LuV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); - GregtechItemList.Transformer_HA_UV_ZPM.set(new GregtechMetaTransformerHiAmp( + "ZPM -> LuV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); + GregtechItemList.Transformer_HA_UV_ZPM.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.07", "ZPM Hi-Amp Transformer", 7, - "UV -> ZPM (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); + "UV -> ZPM (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); if (!GTNH) { - GregtechItemList.Transformer_HA_MAX_UV.set(new GregtechMetaTransformerHiAmp( + GregtechItemList.Transformer_HA_MAX_UV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.08", "UV Hi-Amp Transformer", 8, - "Any Voltage -> UV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); + "Any Voltage -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); } else { - GregtechItemList.Transformer_HA_MAX_UV.set(new GregtechMetaTransformerHiAmp( + GregtechItemList.Transformer_HA_MAX_UV.set( + new GregtechMetaTransformerHiAmp( mID++, "transformer.ha.tier.08", "UV Hi-Amp Transformer", 8, - "UHV -> UV (Use Soft " + mHammerName + " to invert)") - .getStackForm(1L)); + "UHV -> UV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); } ItemStack mItem_1; ItemStack mItem_2; ItemStack mItem_3; if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) { - mItem_1 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 3, 1); - mItem_2 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 4, 1); - mItem_3 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 9, 1); + mItem_1 = ItemUtils + .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 3, 1); + mItem_2 = ItemUtils + .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 4, 1); + mItem_3 = ItemUtils + .simpleMetaStack(ItemUtils.getSimpleStack(StaticFields59.getBlockCasings5()).getItem(), 9, 1); } else { mItem_1 = ItemList.Circuit_Elite.get(1); mItem_2 = ItemList.Circuit_Master.get(1); @@ -121,246 +121,126 @@ public class GregtechHiAmpTransformer { if (!GTNH) { GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]), bitsd, new Object[] { - " BB", - "CM ", - " BB", - Character.valueOf('M'), - ItemList.Hull_ULV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Tin), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Lead) - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]), bitsd, new Object[] { - " BB", - "CM ", - " BB", - Character.valueOf('M'), - ItemList.Hull_LV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Copper), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]), bitsd, new Object[] { - " BB", - "CM ", - " BB", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Gold), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.AnnealedCopper) - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Hull_HV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Aluminium), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Gold), - Character.valueOf('K'), - ItemList.Casing_Coil_Cupronickel - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Tungsten), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Aluminium), - Character.valueOf('K'), - ItemList.Casing_Coil_Kanthal - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Tungsten), - Character.valueOf('K'), - ItemList.Casing_Coil_Nichrome - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Naquadah), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - Character.valueOf('K'), - mItem_1 - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Hull_ZPM, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Naquadah), - Character.valueOf('K'), - mItem_2 - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Hull_UV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Bedrockium), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - Character.valueOf('K'), - mItem_3 - }); + GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]), + bitsd, + new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_ULV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'), + OrePrefixes.wireGt04.get(Materials.Lead) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]), + bitsd, + new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_LV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Copper), Character.valueOf('B'), + OrePrefixes.wireGt04.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]), + bitsd, + new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Hull_MV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'), + OrePrefixes.wireGt04.get(Materials.AnnealedCopper) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_HV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'), + ItemList.Casing_Coil_Cupronickel }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_EV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Aluminium), + Character.valueOf('K'), ItemList.Casing_Coil_Kanthal }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_IV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten), + Character.valueOf('K'), ItemList.Casing_Coil_Nichrome }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_LuV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium), + Character.valueOf('K'), mItem_1 }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_ZPM, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah), + Character.valueOf('K'), mItem_2 }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Hull_UV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), + Character.valueOf('K'), mItem_3 }); } else { GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]), bitsd, new Object[] { - " BB", - "CM ", - " BB", - Character.valueOf('M'), - ItemList.Transformer_LV_ULV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Tin), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Lead) - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]), bitsd, new Object[] { - " BB", - "CM ", - " BB", - Character.valueOf('M'), - ItemList.Transformer_MV_LV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.AnyCopper), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Tin) - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]), bitsd, new Object[] { - " BB", - "CM ", - " BB", - Character.valueOf('M'), - ItemList.Transformer_HV_MV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Gold), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.AnyCopper) - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Transformer_EV_HV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Aluminium), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Gold), - Character.valueOf('K'), - ItemList.Casing_Coil_Cupronickel - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Transformer_IV_EV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Tungsten), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Aluminium), - Character.valueOf('K'), - ItemList.Casing_Coil_Kanthal - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Transformer_LuV_IV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Tungsten), - Character.valueOf('K'), - ItemList.Casing_Coil_Nichrome - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Transformer_ZPM_LuV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Naquadah), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - Character.valueOf('K'), - mItem_1 - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Transformer_UV_ZPM, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.Naquadah), - Character.valueOf('K'), - mItem_2 - }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]), bitsd, new Object[] { - "KBB", - "CM ", - "KBB", - Character.valueOf('M'), - ItemList.Transformer_MAX_UV, - Character.valueOf('C'), - OrePrefixes.wireGt04.get(Materials.Bedrockium), - Character.valueOf('B'), - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - Character.valueOf('K'), - mItem_3 - }); + GregtechItemList.Transformer_HA_LV_ULV.get(1L, new Object[0]), + bitsd, + new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_LV_ULV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tin), Character.valueOf('B'), + OrePrefixes.wireGt04.get(Materials.Lead) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_MV_LV.get(1L, new Object[0]), + bitsd, + new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_MV_LV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.AnyCopper), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tin) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_HV_MV.get(1L, new Object[0]), + bitsd, + new Object[] { " BB", "CM ", " BB", Character.valueOf('M'), ItemList.Transformer_HV_MV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('B'), + OrePrefixes.wireGt04.get(Materials.AnyCopper) }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_EV_HV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_EV_HV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Aluminium), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Gold), Character.valueOf('K'), + ItemList.Casing_Coil_Cupronickel }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_IV_EV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_IV_EV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Tungsten), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Aluminium), + Character.valueOf('K'), ItemList.Casing_Coil_Kanthal }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_LuV_IV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_LuV_IV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Tungsten), + Character.valueOf('K'), ItemList.Casing_Coil_Nichrome }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_ZPM_LuV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_ZPM_LuV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Naquadah), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.VanadiumGallium), + Character.valueOf('K'), mItem_1 }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_UV_ZPM.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_UV_ZPM, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.Naquadah), + Character.valueOf('K'), mItem_2 }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Transformer_HA_MAX_UV.get(1L, new Object[0]), + bitsd, + new Object[] { "KBB", "CM ", "KBB", Character.valueOf('M'), ItemList.Transformer_MAX_UV, + Character.valueOf('C'), OrePrefixes.wireGt04.get(Materials.Bedrockium), + Character.valueOf('B'), OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), + Character.valueOf('K'), mItem_3 }); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java index a115160b51..0ee6ce78d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java @@ -14,8 +14,10 @@ public class GregtechIndustrialAlloySmelter { } private static void run1() { - GregtechItemList.Industrial_AlloySmelter.set(new GregtechMetaTileEntity_IndustrialAlloySmelter( - 31023, "industrialalloysmelter.controller.tier.single", "Zyngen") - .getStackForm(1L)); + GregtechItemList.Industrial_AlloySmelter.set( + new GregtechMetaTileEntity_IndustrialAlloySmelter( + 31023, + "industrialalloysmelter.controller.tier.single", + "Zyngen").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java index e6afc8f352..95d80847af 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java @@ -15,8 +15,10 @@ public class GregtechIndustrialArcFurnace { private static void run1() { // Industrial Arc Furnace Multiblock - GregtechItemList.Industrial_Arc_Furnace.set(new GregtechMetaTileEntity_IndustrialArcFurnace( - 862, "industrialarcfurnace.controller.tier.single", "High Current Industrial Arc Furnace") - .getStackForm(1L)); + GregtechItemList.Industrial_Arc_Furnace.set( + new GregtechMetaTileEntity_IndustrialArcFurnace( + 862, + "industrialarcfurnace.controller.tier.single", + "High Current Industrial Arc Furnace").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 2214aba514..f0a0bbd6aa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -19,11 +19,15 @@ public class GregtechIndustrialBlastSmelter { private static void run1() { // Industrial Alloy Blast Smelter Multiblock - GregtechItemList.Industrial_AlloyBlastSmelter.set(new GregtechMetaTileEntity_AlloyBlastSmelter( - 810, "industrialsalloyamelter.controller.tier.single", "Alloy Blast Smelter") - .getStackForm(1L)); - GregtechItemList.Mega_AlloyBlastSmelter.set(new GregTechMetaTileEntity_MegaAlloyBlastSmelter( - 31150, "industrialsalloyamelter.controller.tier.mega", "Mega Alloy Blast Smelter") - .getStackForm(1L)); + GregtechItemList.Industrial_AlloyBlastSmelter.set( + new GregtechMetaTileEntity_AlloyBlastSmelter( + 810, + "industrialsalloyamelter.controller.tier.single", + "Alloy Blast Smelter").getStackForm(1L)); + GregtechItemList.Mega_AlloyBlastSmelter.set( + new GregTechMetaTileEntity_MegaAlloyBlastSmelter( + 31150, + "industrialsalloyamelter.controller.tier.mega", + "Mega Alloy Blast Smelter").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index 2a346a26c9..edeec33ec2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -18,8 +18,10 @@ public class GregtechIndustrialCentrifuge { private static void run1() { // Industrial Centrifuge Multiblock - GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaTileEntity_IndustrialCentrifuge( - 790, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge") - .getStackForm(1L)); + GregtechItemList.Industrial_Centrifuge.set( + new GregtechMetaTileEntity_IndustrialCentrifuge( + 790, + "industrialcentrifuge.controller.tier.single", + "Industrial Centrifuge").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java index 5d5c4e43e1..feefd45619 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java @@ -17,8 +17,10 @@ public class GregtechIndustrialChisel { new GregtechMetaTileEntity_AutoChisel(31068, "chisel.tier.03", "Precision Auto-Chisel", 3) .getStackForm(1L)); - GregtechItemList.Controller_IndustrialAutoChisel.set(new GregtechMetaTileEntity_IndustrialChisel( - 31069, "multimachine.adv.chisel", "Industrial 3D Copying Machine") - .getStackForm(1L)); + GregtechItemList.Controller_IndustrialAutoChisel.set( + new GregtechMetaTileEntity_IndustrialChisel( + 31069, + "multimachine.adv.chisel", + "Industrial 3D Copying Machine").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index 578e4cd3fe..0f989692cc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -18,8 +18,10 @@ public class GregtechIndustrialCokeOven { private static void run1() { // Industrial Centrifuge Multiblock - GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntity_IndustrialCokeOven( - 791, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven") - .getStackForm(1L)); + GregtechItemList.Industrial_CokeOven.set( + new GregtechMetaTileEntity_IndustrialCokeOven( + 791, + "industrialcokeoven.controller.tier.single", + "Industrial Coke Oven").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index 118fa05099..ed7076b8a8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -18,8 +18,10 @@ public class GregtechIndustrialCuttingFactory { private static void run1() { // Industrial Wire Factory Multiblock - GregtechItemList.Industrial_CuttingFactoryController.set(new GregtechMetaTileEntity_IndustrialCuttingMachine( - 992, "industrialcuttingmachine.controller.tier.01", "Cutting Factory Controller") - .getStackForm(1L)); + GregtechItemList.Industrial_CuttingFactoryController.set( + new GregtechMetaTileEntity_IndustrialCuttingMachine( + 992, + "industrialcuttingmachine.controller.tier.01", + "Cutting Factory Controller").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 89f6f62ef9..99d13981e0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -18,8 +18,10 @@ public class GregtechIndustrialElectrolyzer { private static void run1() { // Industrial Electrolyzer Multiblock - GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntity_IndustrialElectrolyzer( - 796, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer") - .getStackForm(1L)); + GregtechItemList.Industrial_Electrolyzer.set( + new GregtechMetaTileEntity_IndustrialElectrolyzer( + 796, + "industrialelectrolyzer.controller.tier.single", + "Industrial Electrolyzer").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java index 705d5f02e9..8e1607087d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java @@ -14,8 +14,11 @@ public class GregtechIndustrialElementDuplicator { GregtechItemList.Controller_ElementalDuplicator.set( new GregtechMTE_ElementalDuplicator(31050, "gtpp.multimachine.replicator", "Elemental Duplicator") .getStackForm(1L)); - GregtechItemList.Hatch_Input_Elemental_Duplicator.set(new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder( - 31051, "hatch.input_bus.elementalorbholder", "Data Orb Repository", 7) - .getStackForm(1L)); + GregtechItemList.Hatch_Input_Elemental_Duplicator.set( + new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder( + 31051, + "hatch.input_bus.elementalorbholder", + "Data Orb Repository", + 7).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index 40396ded0b..0a591a640b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java @@ -18,8 +18,10 @@ public class GregtechIndustrialExtruder { private static void run1() { // Industrial Presser Multiblock - GregtechItemList.Industrial_Extruder.set(new GregtechMetaTileEntity_IndustrialExtruder( - 859, "industrialextruder.controller.tier.single", "Industrial Extrusion Machine") - .getStackForm(1L)); + GregtechItemList.Industrial_Extruder.set( + new GregtechMetaTileEntity_IndustrialExtruder( + 859, + "industrialextruder.controller.tier.single", + "Industrial Extrusion Machine").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java index b37216b343..bc03c6e277 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java @@ -16,8 +16,10 @@ public class GregtechIndustrialFishPond { } private static void run1() { - GregtechItemList.Industrial_FishingPond.set(new GregtechMetaTileEntity_IndustrialFishingPond( - 829, "industrial.fishpond.controller.tier.single", "Zhuhai - Fishing Port") - .getStackForm(1L)); + GregtechItemList.Industrial_FishingPond.set( + new GregtechMetaTileEntity_IndustrialFishingPond( + 829, + "industrial.fishpond.controller.tier.single", + "Zhuhai - Fishing Port").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java index a1eb79b5b1..878abd4409 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java @@ -14,8 +14,10 @@ public class GregtechIndustrialFluidHeater { } private static void run1() { - GregtechItemList.Controller_IndustrialFluidHeater.set(new GregtechMetaTileEntity_IndustrialFluidHeater( - 31077, "industrialfluidheater.controller.tier.single", "Thermic Heating Device") - .getStackForm(1L)); + GregtechItemList.Controller_IndustrialFluidHeater.set( + new GregtechMetaTileEntity_IndustrialFluidHeater( + 31077, + "industrialfluidheater.controller.tier.single", + "Thermic Heating Device").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java index 2064d15c2b..67f95cbcda 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java @@ -14,8 +14,10 @@ public class GregtechIndustrialForgeHammer { } private static void run1() { - GregtechItemList.Controller_IndustrialForgeHammer.set(new GregtechMetaTileEntity_IndustrialForgeHammer( - 31075, "industrialhammer.controller.tier.single", "Industrial Sledgehammer") - .getStackForm(1L)); + GregtechItemList.Controller_IndustrialForgeHammer.set( + new GregtechMetaTileEntity_IndustrialForgeHammer( + 31075, + "industrialhammer.controller.tier.single", + "Industrial Sledgehammer").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index 29568c32cc..a73ad190ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -18,8 +18,10 @@ public class GregtechIndustrialFuelRefinery { private static void run1() { // Industrial Maceration Stack Multiblock - GregtechItemList.Industrial_FuelRefinery.set(new GregtechMetaTileEntity_Refinery( - 835, "industrialrefinery.controller.tier.single", "Reactor Fuel Processing Plant") - .getStackForm(1L)); + GregtechItemList.Industrial_FuelRefinery.set( + new GregtechMetaTileEntity_Refinery( + 835, + "industrialrefinery.controller.tier.single", + "Reactor Fuel Processing Plant").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java index e9ad7309d3..e356de6398 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialGeneratorArray.java @@ -17,8 +17,10 @@ public class GregtechIndustrialGeneratorArray { private static void run1() { // Industrial Maceration Stack Multiblock - GregtechItemList.Generator_Array_Controller.set(new GregtechMetaTileEntityGeneratorArray( - 990, "generatorarray.controller.tier.01", "Large Generator Array") - .getStackForm(1L)); + GregtechItemList.Generator_Array_Controller.set( + new GregtechMetaTileEntityGeneratorArray( + 990, + "generatorarray.controller.tier.01", + "Large Generator Array").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index 6ceb0cc089..9bcf0a44bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -18,8 +18,10 @@ public class GregtechIndustrialMacerator { private static void run1() { // Industrial Maceration Stack Multiblock - GregtechItemList.Industrial_MacerationStack.set(new GregtechMetaTileEntity_IndustrialMacerator( - 797, "industrialmacerator.controller.tier.single", "Maceration Stack Controller") - .getStackForm(1L)); + GregtechItemList.Industrial_MacerationStack.set( + new GregtechMetaTileEntity_IndustrialMacerator( + 797, + "industrialmacerator.controller.tier.single", + "Maceration Stack Controller").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 6133919b30..997a5f7a7c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.util.GTPP_Recipe; @@ -10,8 +13,6 @@ import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_MassFabricator; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class GregtechIndustrialMassFabricator { @@ -27,9 +28,11 @@ public class GregtechIndustrialMassFabricator { private static void run1() { // Industrial Matter Fabricator Multiblock - GregtechItemList.Industrial_MassFab.set(new GregtechMetaTileEntity_MassFabricator( - 799, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU") - .getStackForm(1L)); + GregtechItemList.Industrial_MassFab.set( + new GregtechMetaTileEntity_MassFabricator( + 799, + "industrialmassfab.controller.tier.single", + "Matter Fabrication CPU").getStackForm(1L)); } private static void generateRecipes() { @@ -39,24 +42,24 @@ public class GregtechIndustrialMassFabricator { // Basic UUA1 GT_Recipe UUA_From_Scrap = new GTPP_Recipe( false, - new ItemStack[] {CI.getNumberedCircuit(9), ItemUtils.getSimpleStack(getScrapPile(), 9)}, - new ItemStack[] {GT_Values.NI}, + new ItemStack[] { CI.getNumberedCircuit(9), ItemUtils.getSimpleStack(getScrapPile(), 9) }, + new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { Materials.UUAmplifier.getFluid(1) }, 9 * 20, 32, 0); // Basic UUA2 GT_Recipe UUA_From_ScrapBoxes = new GTPP_Recipe( false, - new ItemStack[] {CI.getNumberedCircuit(19), ItemUtils.getSimpleStack(getScrapBox(), 1)}, - new ItemStack[] {GT_Values.NI}, + new ItemStack[] { CI.getNumberedCircuit(19), ItemUtils.getSimpleStack(getScrapBox(), 1) }, + new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { Materials.UUAmplifier.getFluid(1) }, 9 * 20, 32, 0); @@ -68,12 +71,12 @@ public class GregtechIndustrialMassFabricator { // Basic UUM GT_Recipe generateUUM = new GTPP_Recipe( false, - new ItemStack[] {CI.getNumberedCircuit(1)}, - new ItemStack[] {GT_Values.NI}, + new ItemStack[] { CI.getNumberedCircuit(1) }, + new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {Materials.UUMatter.getFluid(1)}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { Materials.UUMatter.getFluid(1) }, 160 * 20, 32, 0); @@ -81,12 +84,12 @@ public class GregtechIndustrialMassFabricator { // Basic UUM GT_Recipe generateUUMFromUUA = new GTPP_Recipe( false, - new ItemStack[] {CI.getNumberedCircuit(2)}, - new ItemStack[] {GT_Values.NI}, + new ItemStack[] { CI.getNumberedCircuit(2) }, + new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, - new FluidStack[] {Materials.UUMatter.getFluid(1)}, + new FluidStack[] { Materials.UUAmplifier.getFluid(1) }, + new FluidStack[] { Materials.UUMatter.getFluid(1) }, 40 * 20, 32, 0); @@ -97,12 +100,12 @@ public class GregtechIndustrialMassFabricator { // Basic UUM GT_Recipe generateUUM_LV = new GTPP_Recipe( false, - new ItemStack[] {CI.getNumberedCircuit(1)}, - new ItemStack[] {GT_Values.NI}, + new ItemStack[] { CI.getNumberedCircuit(1) }, + new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] {GT_Values.NF}, - new FluidStack[] {Materials.UUMatter.getFluid(1)}, + new FluidStack[] { GT_Values.NF }, + new FluidStack[] { Materials.UUMatter.getFluid(1) }, 160 * 20, 256, 0); @@ -110,12 +113,12 @@ public class GregtechIndustrialMassFabricator { // Basic UUM GT_Recipe generateUUMFromUUA_LV = new GTPP_Recipe( false, - new ItemStack[] {CI.getNumberedCircuit(2)}, - new ItemStack[] {GT_Values.NI}, + new ItemStack[] { CI.getNumberedCircuit(2) }, + new ItemStack[] { GT_Values.NI }, null, null, - new FluidStack[] {Materials.UUAmplifier.getFluid(1)}, - new FluidStack[] {Materials.UUMatter.getFluid(1)}, + new FluidStack[] { Materials.UUAmplifier.getFluid(1) }, + new FluidStack[] { Materials.UUMatter.getFluid(1) }, 40 * 20, 256, 0); @@ -124,8 +127,9 @@ public class GregtechIndustrialMassFabricator { GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.add(generateUUMFromUUA_LV); } - Logger.INFO("Generated " + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size() - + " Matter Fabricator recipes."); + Logger.INFO( + "Generated " + GTPP_Recipe.GTPP_Recipe_Map.sMatterFab2Recipes.mRecipeList.size() + + " Matter Fabricator recipes."); } public static ItemStack getScrapPile() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index aaa39c906d..fe348b0982 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java @@ -18,8 +18,10 @@ public class GregtechIndustrialMixer { private static void run1() { // Industrial Mixer Multiblock - GregtechItemList.Industrial_Mixer.set(new GregtechMetaTileEntity_IndustrialMixer( - 811, "industrialmixer.controller.tier.single", "Industrial Mixing Machine") - .getStackForm(1L)); + GregtechItemList.Industrial_Mixer.set( + new GregtechMetaTileEntity_IndustrialMixer( + 811, + "industrialmixer.controller.tier.single", + "Industrial Mixing Machine").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index 06b18b3d7b..aa824c9cce 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java @@ -17,8 +17,10 @@ public class GregtechIndustrialMultiMachine { } private static void run1() { - GregtechItemList.Industrial_MultiMachine.set(new GregtechMetaTileEntity_IndustrialMultiMachine( - 860, "industrialmultimachine.controller.tier.single", "Large Processing Factory") - .getStackForm(1L)); + GregtechItemList.Industrial_MultiMachine.set( + new GregtechMetaTileEntity_IndustrialMultiMachine( + 860, + "industrialmultimachine.controller.tier.single", + "Large Processing Factory").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java index f9662cfa0c..e17b8f22a2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java @@ -1,28 +1,10 @@ /* -package gtPlusPlus.xmod.gregtech.registration.gregtech; - - -public class GregtechIndustrialMultiTank { - - public static void run() { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Logger.INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); - if (CORE.ConfigSwitches.enableMultiblock_MultiTank) { - run1(); - } - } - - } - - private static void run1() { - GregtechItemList.Industrial_MultiTank - .set(new GregtechMetaTileEntity_MultiTank(827, "multitank.controller.tier.single", "Gregtech Multitank") - .getStackForm(1L)); - // GregtechItemList.Industrial_MultiTankDense.set(new - // GregtechMetaTileEntityMultiTankDense(828, - // "multitankdense.controller.tier.single", "Gregtech Dense - // Multitank").getStackForm(1L)); - - } -} -*/ + * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechIndustrialMultiTank { public static void + * run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { + * Logger.INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); if + * (CORE.ConfigSwitches.enableMultiblock_MultiTank) { run1(); } } } private static void run1() { + * GregtechItemList.Industrial_MultiTank .set(new GregtechMetaTileEntity_MultiTank(827, + * "multitank.controller.tier.single", "Gregtech Multitank") .getStackForm(1L)); // + * GregtechItemList.Industrial_MultiTankDense.set(new // GregtechMetaTileEntityMultiTankDense(828, // + * "multitankdense.controller.tier.single", "Gregtech Dense // Multitank").getStackForm(1L)); } } + */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index 2f73addbbd..5aeb63fcd0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -18,8 +18,10 @@ public class GregtechIndustrialPlatePress { private static void run1() { // Industrial Presser Multiblock - GregtechItemList.Industrial_PlatePress.set(new GregtechMetaTileEntity_IndustrialPlatePress( - 792, "industrialbender.controller.tier.single", "Industrial Material Press") - .getStackForm(1L)); + GregtechItemList.Industrial_PlatePress.set( + new GregtechMetaTileEntity_IndustrialPlatePress( + 792, + "industrialbender.controller.tier.single", + "Industrial Material Press").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java index c490ef2b81..b300a5e77c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java @@ -6,8 +6,10 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr public class GregtechIndustrialRockBreaker { public static void run() { - GregtechItemList.Controller_IndustrialRockBreaker.set(new GregtechMetaTileEntity_IndustrialRockBreaker( - 31065, "industrialrockcrusher.controller.tier.single", "Boldarnator") - .getStackForm(1L)); + GregtechItemList.Controller_IndustrialRockBreaker.set( + new GregtechMetaTileEntity_IndustrialRockBreaker( + 31065, + "industrialrockcrusher.controller.tier.single", + "Boldarnator").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index c474b5f6c0..da538eb776 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -17,8 +17,10 @@ public class GregtechIndustrialSifter { } private static void run1() { - GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter( - 840, "industrialsifter.controller.tier.single", "Large Sifter Control Block") - .getStackForm(1L)); + GregtechItemList.Industrial_Sifter.set( + new GregtechMetaTileEntity_IndustrialSifter( + 840, + "industrialsifter.controller.tier.single", + "Large Sifter Control Block").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 00552d9f3a..ec647ba787 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -17,8 +17,10 @@ public class GregtechIndustrialThermalCentrifuge { } private static void run1() { - GregtechItemList.Industrial_ThermalCentrifuge.set(new GregtechMetaTileEntity_IndustrialThermalCentrifuge( - 849, "industrialthermalcentrifuge.controller.tier.single", "Large Thermal Refinery") - .getStackForm(1L)); + GregtechItemList.Industrial_ThermalCentrifuge.set( + new GregtechMetaTileEntity_IndustrialThermalCentrifuge( + 849, + "industrialthermalcentrifuge.controller.tier.single", + "Large Thermal Refinery").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index e1d48b3395..8093f1fcc1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -17,8 +17,10 @@ public class GregtechIndustrialWashPlant { } private static void run1() { - GregtechItemList.Industrial_WashPlant.set(new GregtechMetaTileEntity_IndustrialWashPlant( - 850, "industrialwashplant.controller.tier.single", "Ore Washing Plant") - .getStackForm(1L)); + GregtechItemList.Industrial_WashPlant.set( + new GregtechMetaTileEntity_IndustrialWashPlant( + 850, + "industrialwashplant.controller.tier.single", + "Ore Washing Plant").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 456b55bf7b..e16a6fe09e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -18,8 +18,10 @@ public class GregtechIndustrialWiremill { private static void run1() { // Industrial Wire Factory Multiblock - GregtechItemList.Industrial_WireFactory.set(new GregtechMetaTileEntity_IndustrialWireMill( - 798, "industrialwiremill.controller.tier.single", "Wire Factory Controller") - .getStackForm(1L)); + GregtechItemList.Industrial_WireFactory.set( + new GregtechMetaTileEntity_IndustrialWireMill( + 798, + "industrialwiremill.controller.tier.single", + "Wire Factory Controller").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java index 5a7b082dd5..c38e386c0f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java @@ -17,8 +17,10 @@ public class GregtechIronBlastFurnace { } private static void run1() { - GregtechItemList.Machine_Iron_BlastFurnace.set(new GregtechMetaTileEntity_IronBlastFurnace( - 768, "ironmachine.blastfurnace", "Iron Plated Blast Furnace") - .getStackForm(1L)); + GregtechItemList.Machine_Iron_BlastFurnace.set( + new GregtechMetaTileEntity_IronBlastFurnace( + 768, + "ironmachine.blastfurnace", + "Iron Plated Blast Furnace").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index 05993e06a6..aebe678984 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java @@ -34,10 +34,12 @@ public class GregtechLargeTurbinesAndHeatExchanger { new GT_MTE_LargeTurbine_SCSteam(31076, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine") .getStackForm(1L)); } - GregtechItemList.Hatch_Turbine_Rotor.set( - new GT_MetaTileEntity_Hatch_Turbine(30010, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L)); - GregtechItemList.XL_HeatExchanger.set(new GregtechMetaTileEntity_Adv_HeatExchanger( - 31079, "multimachine.reallybigheatexchanger", "Whakawhiti Wera XL") - .getStackForm(1L)); + GregtechItemList.Hatch_Turbine_Rotor + .set(new GT_MetaTileEntity_Hatch_Turbine(30010, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L)); + GregtechItemList.XL_HeatExchanger.set( + new GregtechMetaTileEntity_Adv_HeatExchanger( + 31079, + "multimachine.reallybigheatexchanger", + "Whakawhiti Wera XL").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java index dead66b933..ca2b1237c3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMiniRaFusion.java @@ -1,39 +1,13 @@ /* -package gtPlusPlus.xmod.gregtech.registration.gregtech; - - -public class GregtechMiniRaFusion { - - public static void run() { - // Register the Simple Fusion Entity. - GregtechItemList.Miniature_Fusion.set(new GregtechMTE_MiniFusionPlant(31015, "gtplusplus.fusion.single", "Helium Prime").getStackForm(1L)); - GregtechItemList.Plasma_Tank.set(new GT_MetaTileEntity_Hatch_Plasma(31016, "gtplusplus.tank.plasma", "Plasma Tank").getStackForm(1L)); - - } - - public static boolean generateSlowFusionrecipes() { - for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList){ - if (x.mEnabled) { - GT_Recipe y = x.copy(); - y.mDuration *= 16; - long z = y.mEUt * 4; - if (z > Integer.MAX_VALUE) { - y.mEnabled = false; - continue; - } - y.mEUt = (int) Math.min(Math.max(0, z), Integer.MAX_VALUE); - y.mCanBeBuffered = true; - GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.add(y); - } - } - int mRecipeCount = GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.mRecipeList.size(); - if (mRecipeCount > 0) { - Logger.INFO("[Pocket Fusion] Generated "+mRecipeCount+" recipes for the Pocket Fusion Reactor."); - return true; - } - return false; - } - - -} -*/ + * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechMiniRaFusion { public static void run() + * { // Register the Simple Fusion Entity. GregtechItemList.Miniature_Fusion.set(new GregtechMTE_MiniFusionPlant(31015, + * "gtplusplus.fusion.single", "Helium Prime").getStackForm(1L)); GregtechItemList.Plasma_Tank.set(new + * GT_MetaTileEntity_Hatch_Plasma(31016, "gtplusplus.tank.plasma", "Plasma Tank").getStackForm(1L)); } public static + * boolean generateSlowFusionrecipes() { for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList){ if + * (x.mEnabled) { GT_Recipe y = x.copy(); y.mDuration *= 16; long z = y.mEUt * 4; if (z > Integer.MAX_VALUE) { + * y.mEnabled = false; continue; } y.mEUt = (int) Math.min(Math.max(0, z), Integer.MAX_VALUE); y.mCanBeBuffered = true; + * GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.add(y); } } int mRecipeCount = + * GTPP_Recipe.GTPP_Recipe_Map.sSlowFusionRecipes.mRecipeList.size(); if (mRecipeCount > 0) { + * Logger.INFO("[Pocket Fusion] Generated "+mRecipeCount+" recipes for the Pocket Fusion Reactor."); return true; } + * return false; } } + */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java index 1e024389fe..7d1d77f1b4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java @@ -14,8 +14,10 @@ public class GregtechMolecularTransformer { } private static void run1() { - GregtechItemList.Controller_MolecularTransformer.set(new GregtechMetaTileEntity_IndustrialMolecularTransformer( - 31072, "moleculartransformer.controller.tier.single", "Molecular Transformer") - .getStackForm(1L)); + GregtechItemList.Controller_MolecularTransformer.set( + new GregtechMetaTileEntity_IndustrialMolecularTransformer( + 31072, + "moleculartransformer.controller.tier.single", + "Molecular Transformer").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java index db124f510a..c98b023b08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNaqReactor.java @@ -1,21 +1,7 @@ /* -package gtPlusPlus.xmod.gregtech.registration.gregtech; - - -public class GregtechNaqReactor { - - public static void run() { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { - Logger.INFO("Gregtech5u Content | Registering Futuristic Naquadah Reactor {LNR]."); - run1(); - } - - } - - private static void run1() { - // LFTR - GregtechItemList.Controller_Naq_Reactor.set(new GregtechMTE_LargeNaqReactor(970, "lnr.controller.single", "Naquadah Reactor Mark XII").getStackForm(1L)); - - } -} -*/ + * package gtPlusPlus.xmod.gregtech.registration.gregtech; public class GregtechNaqReactor { public static void run() { + * if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { + * Logger.INFO("Gregtech5u Content | Registering Futuristic Naquadah Reactor {LNR]."); run1(); } } private static void + * run1() { // LFTR GregtechItemList.Controller_Naq_Reactor.set(new GregtechMTE_LargeNaqReactor(970, + * "lnr.controller.single", "Naquadah Reactor Mark XII").getStackForm(1L)); } } + */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java index 63eb34e97f..3a632049a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNitroDieselFix.java @@ -1,5 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.reflect.FieldUtils; + import gregtech.GT_Mod; import gregtech.api.enums.*; import gregtech.api.objects.MaterialStack; @@ -12,14 +23,6 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; public class GregtechNitroDieselFix { @@ -79,9 +82,9 @@ public class GregtechNitroDieselFix { * Reflectively get all the values to maintain 5.08.xx compat */ GT_Recipe_Map recipeMapMultiblockChemReactor; - recipeMapMultiblockChemReactor = (GT_Recipe_Map) - FieldUtils.getDeclaredField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes", true) - .get(null); + recipeMapMultiblockChemReactor = (GT_Recipe_Map) FieldUtils + .getDeclaredField(GT_Recipe_Map.class, "sMultiblockChemicalRecipes", true) + .get(null); /** * Do Recipe Stuff @@ -104,8 +107,9 @@ public class GregtechNitroDieselFix { } } } - Logger.INFO("[Nitro] Found " + mIndexSingle - + " single block Chemical Reactor recipes to remove."); + Logger.INFO( + "[Nitro] Found " + mIndexSingle + + " single block Chemical Reactor recipes to remove."); // Iterate Multi Block recipes for Nitro production. for (GT_Recipe rnd : xMulti) { @@ -115,8 +119,9 @@ public class GregtechNitroDieselFix { } } } - Logger.INFO("[Nitro] Found " + mIndexMulti - + " multi block Chemical Reactor recipes to remove."); + Logger.INFO( + "[Nitro] Found " + mIndexMulti + + " multi block Chemical Reactor recipes to remove."); // Remove Single Block recipes found. int mRemovedSingle = 0; @@ -141,12 +146,13 @@ public class GregtechNitroDieselFix { Materials mLightFuel = Materials.valueOf("LightFuel"); // Build a New Recipe set - Materials mFuels[] = {mLightFuel, Materials.Fuel}; + Materials mFuels[] = { mLightFuel, Materials.Fuel }; for (Materials fuel : mFuels) { boolean didAdd[] = new boolean[3]; Logger.INFO( "[Nitro] Getting ready to add back in the old nitro-diesel recipe to the mixer, using " - + fuel.mDefaultLocalName + " as the fuel input."); + + fuel.mDefaultLocalName + + " as the fuel input."); didAdd[0] = GT_Values.RA.addMixerRecipe( getCells(fuel, 4), getCells(mGlycerol, 1), @@ -177,15 +183,20 @@ public class GregtechNitroDieselFix { ItemList.Cell_Empty.get(1L), 20, 30); - Logger.INFO("[Nitro] Did the recipes add? 1: " + didAdd[0] + " | 2: " + didAdd[1] - + " | 3: " + didAdd[2]); + Logger.INFO( + "[Nitro] Did the recipes add? 1: " + didAdd[0] + + " | 2: " + + didAdd[1] + + " | 3: " + + didAdd[2]); } for (Materials fuel : mFuels) { boolean didAdd[] = new boolean[3]; Logger.INFO( "[Nitro] Getting ready to add back in the old nitro-diesel recipe to the chemical reactors, using " - + fuel.mDefaultLocalName + " as the fuel input."); + + fuel.mDefaultLocalName + + " as the fuel input."); didAdd[0] = GT_Values.RA.addChemicalRecipe( getCells(fuel, 4), getCells(mGlycerol, 1), @@ -207,8 +218,12 @@ public class GregtechNitroDieselFix { mNitroFix.getFluid(5000L), ItemList.Cell_Empty.get(1L), 20); - Logger.INFO("[Nitro] Did the recipes add? 1: " + didAdd[0] + " | 2: " + didAdd[1] - + " | 3: " + didAdd[2]); + Logger.INFO( + "[Nitro] Did the recipes add? 1: " + didAdd[0] + + " | 2: " + + didAdd[1] + + " | 3: " + + didAdd[2]); } Logger.INFO("[Nitro] Getting ready to add back in the old glycerol recipe!"); @@ -223,12 +238,8 @@ public class GregtechNitroDieselFix { } } } - } catch (IllegalArgumentException - | IllegalAccessException - | InstantiationException - | InvocationTargetException - | NoSuchMethodException - | SecurityException e) { + } catch (IllegalArgumentException | IllegalAccessException | InstantiationException + | InvocationTargetException | NoSuchMethodException | SecurityException e) { Logger.INFO("[Nitro] ================ Error ================"); e.printStackTrace(); Logger.INFO("[Nitro] ================ Error ================"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index 9b5968657f..348f50d3c1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -22,48 +22,80 @@ public class GregtechPollutionDevices { private static void run1() { if (CORE.ConfigSwitches.enableMachine_Pollution) { // 759 - GregtechItemList.Pollution_Detector.set(new GregtechMetaPollutionDetector( + GregtechItemList.Pollution_Detector.set( + new GregtechMetaPollutionDetector( 756, "pollutiondetector.01.tier.single", "Pollution Detection Device", 0, "Tells you if you're living in Gwalior yet.", - 0) - .getStackForm(1L)); - GregtechItemList.Pollution_Creator.set(new GregtechMetaPollutionCreator( - 951, "pollutioncreator.01.tier.single", "Smog Device", 4, "Polluting the skies.", 0) - .getStackForm(1L)); + 0).getStackForm(1L)); + GregtechItemList.Pollution_Creator.set( + new GregtechMetaPollutionCreator( + 951, + "pollutioncreator.01.tier.single", + "Smog Device", + 4, + "Polluting the skies.", + 0).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_ULV.set(new GregtechMetaAtmosphericReconditioner( - 757, "pollutioncleaner.01.tier.single", "Pollution Scrubber", 0) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_LV.set(new GregtechMetaAtmosphericReconditioner( - 758, "pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_MV.set(new GregtechMetaAtmosphericReconditioner( - 759, "pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_HV.set(new GregtechMetaAtmosphericReconditioner( - 760, "pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3) - .getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_ULV.set( + new GregtechMetaAtmosphericReconditioner( + 757, + "pollutioncleaner.01.tier.single", + "Pollution Scrubber", + 0).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_LV.set( + new GregtechMetaAtmosphericReconditioner( + 758, + "pollutioncleaner.02.tier.single", + "Upgraded Pollution Scrubber", + 1).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_MV.set( + new GregtechMetaAtmosphericReconditioner( + 759, + "pollutioncleaner.03.tier.single", + "Advanced Pollution Scrubber", + 2).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_HV.set( + new GregtechMetaAtmosphericReconditioner( + 760, + "pollutioncleaner.04.tier.single", + "Precision Pollution Scrubber", + 3).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_EV.set( new GregtechMetaAtmosphericReconditioner(761, "pollutioncleaner.05.tier.single", "Air Recycler", 4) .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_IV.set(new GregtechMetaAtmosphericReconditioner( - 762, "pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_LuV.set(new GregtechMetaAtmosphericReconditioner( - 763, "pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_ZPM.set(new GregtechMetaAtmosphericReconditioner( - 764, "pollutioncleaner.08.tier.single", "Precision Air Recycler", 7) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_UV.set(new GregtechMetaAtmosphericReconditioner( - 765, "pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8) - .getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_MAX.set(new GregtechMetaAtmosphericReconditioner( - 766, "pollutioncleaner.10.tier.single", "Biosphere Cleanser", 9) - .getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_IV.set( + new GregtechMetaAtmosphericReconditioner( + 762, + "pollutioncleaner.06.tier.single", + "Upgraded Air Recycler", + 5).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_LuV.set( + new GregtechMetaAtmosphericReconditioner( + 763, + "pollutioncleaner.07.tier.single", + "Advanced Air Recycler", + 6).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_ZPM.set( + new GregtechMetaAtmosphericReconditioner( + 764, + "pollutioncleaner.08.tier.single", + "Precision Air Recycler", + 7).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_UV.set( + new GregtechMetaAtmosphericReconditioner( + 765, + "pollutioncleaner.09.tier.single", + "Atmospheric Cleaner", + 8).getStackForm(1L)); + GregtechItemList.Pollution_Cleaner_MAX.set( + new GregtechMetaAtmosphericReconditioner( + 766, + "pollutioncleaner.10.tier.single", + "Biosphere Cleanser", + 9).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java index d1d6dd5f04..25fd245ba4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerBreakers.java @@ -17,35 +17,85 @@ public class GregtechPowerBreakers { private static void run1() { // 30200 int aStartID = 30400; - GregtechItemList.BreakerBox_ULV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.00", "Ultra Low Voltage Breaker Box", 0, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_LV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.01", "Low Voltage Breaker Box", 1, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_MV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.02", "Medium Voltage Breaker Box", 2, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_HV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.03", "High Voltage Breaker Box", 3, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_EV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.04", "Extreme Voltage Breaker Box", 4, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_IV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.05", "Insane Voltage Breaker Box", 5, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_LuV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.06", "Ludicrous Voltage Breaker Box", 6, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_ZPM.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.07", "ZPM Voltage Breaker Box", 7, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_UV.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.08", "Ultimate Voltage Breaker Box", 8, "", 16)) - .getStackForm(1L)); - GregtechItemList.BreakerBox_MAX.set((new GT_MetaTileEntity_BasicBreaker( - aStartID++, "breaker.tier.09", GT_Values.VN[9] + " Breaker Box", 9, "", 16)) - .getStackForm(1L)); + GregtechItemList.BreakerBox_ULV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.00", + "Ultra Low Voltage Breaker Box", + 0, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_LV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.01", + "Low Voltage Breaker Box", + 1, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_MV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.02", + "Medium Voltage Breaker Box", + 2, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_HV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.03", + "High Voltage Breaker Box", + 3, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_EV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.04", + "Extreme Voltage Breaker Box", + 4, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_IV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.05", + "Insane Voltage Breaker Box", + 5, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_LuV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.06", + "Ludicrous Voltage Breaker Box", + 6, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_ZPM.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.07", + "ZPM Voltage Breaker Box", + 7, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_UV.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.08", + "Ultimate Voltage Breaker Box", + 8, + "", + 16)).getStackForm(1L)); + GregtechItemList.BreakerBox_MAX.set( + (new GT_MetaTileEntity_BasicBreaker( + aStartID++, + "breaker.tier.09", + GT_Values.VN[9] + " Breaker Box", + 9, + "", + 16)).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index 17d89686a6..b9672c5382 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -23,9 +23,11 @@ public class GregtechPowerSubStation { private static void run1() { // Steam Condensors - GregtechItemList.PowerSubStation.set(new GregtechMetaTileEntity_PowerSubStationController( - 812, "substation.01.input.single", "Power Station Control Node") - .getStackForm(1L)); + GregtechItemList.PowerSubStation.set( + new GregtechMetaTileEntity_PowerSubStationController( + 812, + "substation.01.input.single", + "Power Station Control Node").getStackForm(1L)); int tID = 886; GregtechItemList.Hatch_Input_Battery_MV.set( new GT_MetaTileEntity_Hatch_InputBattery(tID++, "hatch.input_battery.tier.00", "Charging Bus (MV)", 2) @@ -34,28 +36,34 @@ public class GregtechPowerSubStation { new GT_MetaTileEntity_Hatch_InputBattery(tID++, "hatch.input_battery.tier.01", "Charging Bus (EV)", 4) .getStackForm(1L)); - GregtechItemList.Hatch_Output_Battery_MV.set(new GT_MetaTileEntity_Hatch_OutputBattery( - tID++, "hatch.output_battery.tier.00", "Discharging Bus (MV)", 2) - .getStackForm(1L)); - GregtechItemList.Hatch_Output_Battery_EV.set(new GT_MetaTileEntity_Hatch_OutputBattery( - tID++, "hatch.output_battery.tier.01", "Discharging Bus (EV)", 4) - .getStackForm(1L)); + GregtechItemList.Hatch_Output_Battery_MV.set( + new GT_MetaTileEntity_Hatch_OutputBattery( + tID++, + "hatch.output_battery.tier.00", + "Discharging Bus (MV)", + 2).getStackForm(1L)); + GregtechItemList.Hatch_Output_Battery_EV.set( + new GT_MetaTileEntity_Hatch_OutputBattery( + tID++, + "hatch.output_battery.tier.01", + "Discharging Bus (EV)", + 4).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( GregtechItemList.Hatch_Input_Battery_MV.get(1L, new Object[0]), CI.bitsd, - new Object[] {"C", "M", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV}); + new Object[] { "C", "M", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Hatch_Input_Battery_EV.get(1L, new Object[0]), CI.bitsd, - new Object[] {"C", "M", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV}); + new Object[] { "C", "M", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Hatch_Output_Battery_MV.get(1L, new Object[0]), CI.bitsd, - new Object[] {"M", "C", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV}); + new Object[] { "M", "C", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Hatch_Output_Battery_EV.get(1L, new Object[0]), CI.bitsd, - new Object[] {"M", "C", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV}); + new Object[] { "M", "C", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java index f7032838ab..392c6eced8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java @@ -11,9 +11,11 @@ public class GregtechQuantumForceTransformer { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock."); if (CORE.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { - GregtechItemList.QuantumForceTransformer.set(new GregtechMetaTileEntity_QuantumForceTransformer( - 31151, "quantumforcetransformer.controller.tier.single", "Quantum Force Transformer") - .getStackForm(1L)); + GregtechItemList.QuantumForceTransformer.set( + new GregtechMetaTileEntity_QuantumForceTransformer( + 31151, + "quantumforcetransformer.controller.tier.single", + "Quantum Force Transformer").getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java index 91902396d9..40a0c5820f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java @@ -14,8 +14,11 @@ public class GregtechRTG { } private static void run1() { - GregtechItemList.RTG.set(new GregtechMetaTileEntity_RTG( - 869, "basicgenerator.rtg.tier.01", "Radioisotope Thermoelectric Generator", 3) - .getStackForm(1L)); + GregtechItemList.RTG.set( + new GregtechMetaTileEntity_RTG( + 869, + "basicgenerator.rtg.tier.01", + "Radioisotope Thermoelectric Generator", + 3).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 689cd53d54..6d48652202 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.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.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeRocketEngine; -import net.minecraft.item.ItemStack; public class GregtechRocketFuelGenerator { @@ -27,203 +28,122 @@ public class GregtechRocketFuelGenerator { } private static void run1() { - GregtechItemList.Controller_RocketEngine.set(new GregtechMetaTileEntity_LargeRocketEngine( - 996, "gtpp.multimachine.rocketengine", "Rocketdyne F-1A Engine") - .getStackForm(1L)); + GregtechItemList.Controller_RocketEngine.set( + new GregtechMetaTileEntity_LargeRocketEngine( + 996, + "gtpp.multimachine.rocketengine", + "Rocketdyne F-1A Engine").getStackForm(1L)); - ItemList aDieselEngine = ItemUtils.getValueOfItemList( - "Machine_Multi_DieselEngine", ItemList.Machine_Multi_LargeBoiler_TungstenSteel); + ItemList aDieselEngine = ItemUtils + .getValueOfItemList("Machine_Multi_DieselEngine", ItemList.Machine_Multi_LargeBoiler_TungstenSteel); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Controller_RocketEngine.get(1L), CI.bitsd, new Object[] { - "PCP", - "EME", - "GWG", - 'M', - aDieselEngine, - 'P', - ItemList.Electric_Piston_IV, - 'E', - ItemList.Field_Generator_EV, - 'C', - OrePrefixes.circuit.get(Materials.Master), - 'W', - OrePrefixes.cableGt08.get(Materials.Platinum), - 'G', - ALLOY.MARAGING350.getGear(1) - }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Controller_RocketEngine.get(1L), + CI.bitsd, + new Object[] { "PCP", "EME", "GWG", 'M', aDieselEngine, 'P', ItemList.Electric_Piston_IV, 'E', + ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + OrePrefixes.cableGt08.get(Materials.Platinum), 'G', ALLOY.MARAGING350.getGear(1) }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Casing_RocketEngine.get(1L), CI.bitsd, new Object[] { - "PhP", - "RFR", - "PWP", - 'R', - OrePrefixes.pipeMedium.get(Materials.TungstenSteel), - 'F', - ItemList.Casing_RobustTungstenSteel, - 'P', - ALLOY.NITINOL_60.getGear(1), - 'W', - OrePrefixes.stickLong.get(Materials.TungstenSteel) - }); + GT_ModHandler.addCraftingRecipe( + GregtechItemList.Casing_RocketEngine.get(1L), + CI.bitsd, + new Object[] { "PhP", "RFR", "PWP", 'R', OrePrefixes.pipeMedium.get(Materials.TungstenSteel), 'F', + ItemList.Casing_RobustTungstenSteel, 'P', ALLOY.NITINOL_60.getGear(1), 'W', + OrePrefixes.stickLong.get(Materials.TungstenSteel) }); - GregtechItemList.Rocket_Engine_EV.set(new GregtechMetaTileEntityRocketFuelGenerator( - 793, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4) - .getStackForm(1L)); - GregtechItemList.Rocket_Engine_IV.set(new GregtechMetaTileEntityRocketFuelGenerator( - 794, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5) - .getStackForm(1L)); - GregtechItemList.Rocket_Engine_LuV.set(new GregtechMetaTileEntityRocketFuelGenerator( - 795, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6) - .getStackForm(1L)); + GregtechItemList.Rocket_Engine_EV.set( + new GregtechMetaTileEntityRocketFuelGenerator( + 793, + "advancedgenerator.rocketFuel.tier.01", + "Basic Rocket Engine", + 4).getStackForm(1L)); + GregtechItemList.Rocket_Engine_IV.set( + new GregtechMetaTileEntityRocketFuelGenerator( + 794, + "advancedgenerator.rocketFuel.tier.02", + "Advanced Rocket Engine", + 5).getStackForm(1L)); + GregtechItemList.Rocket_Engine_LuV.set( + new GregtechMetaTileEntityRocketFuelGenerator( + 795, + "advancedgenerator.rocketFuel.tier.03", + "Turbo Rocket Engine", + 6).getStackForm(1L)); if (!CORE.GTNH) { GT_ModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_EV.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[] { - "PCP", - "EME", - "GWG", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('P'), - ItemList.Electric_Piston_EV, - Character.valueOf('E'), - ItemList.Electric_Motor_EV, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Ultimate), - Character.valueOf('W'), - OrePrefixes.cableGt02.get(Materials.Aluminium), - Character.valueOf('G'), - ALLOY.TANTALLOY_61.getGear(1) - }); + new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, + Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'), + ItemList.Electric_Motor_EV, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), + OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'), + ALLOY.TANTALLOY_61.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_IV.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[] { - "PCP", - "EME", - "GWG", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('P'), - ItemList.Electric_Piston_IV, - Character.valueOf('E'), - ItemList.Electric_Motor_IV, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Superconductor), - Character.valueOf('W'), - OrePrefixes.cableGt02.get(Materials.Platinum), - Character.valueOf('G'), - ALLOY.STELLITE.getGear(1) - }); + new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, + Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'), + ItemList.Electric_Motor_IV, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Superconductor), Character.valueOf('W'), + OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'), + ALLOY.STELLITE.getGear(1) }); } if (CORE.GTNH) { GT_ModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_EV.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[] { - "PCP", - "EME", - "GWG", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('P'), - ItemList.Electric_Piston_EV, - Character.valueOf('E'), - ItemList.Electric_Motor_EV, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Elite), - Character.valueOf('W'), - OrePrefixes.cableGt02.get(Materials.Aluminium), - Character.valueOf('G'), - ALLOY.TANTALLOY_61.getGear(1) - }); + new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, + Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'), + ItemList.Electric_Motor_EV, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'), + OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'), + ALLOY.TANTALLOY_61.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_IV.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[] { - "PCP", - "EME", - "GWG", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('P'), - ItemList.Electric_Piston_IV, - Character.valueOf('E'), - ItemList.Electric_Motor_IV, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Master), - Character.valueOf('W'), - OrePrefixes.cableGt02.get(Materials.Platinum), - Character.valueOf('G'), - ALLOY.STELLITE.getGear(1) - }); + new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, + Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'), + ItemList.Electric_Motor_IV, Character.valueOf('C'), + OrePrefixes.circuit.get(Materials.Master), Character.valueOf('W'), + OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'), + ALLOY.STELLITE.getGear(1) }); } final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; if (!CORE.GTNH) { GT_ModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_LuV.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[] { - "PCP", - "EME", - "GWG", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('P'), - INGREDIENT_1, - Character.valueOf('E'), - INGREDIENT_2, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Infinite), - Character.valueOf('W'), - OrePrefixes.cableGt02.get(Materials.Tungsten), - Character.valueOf('G'), - ALLOY.ZERON_100.getGear(1) - }); + new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, + Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Infinite), Character.valueOf('W'), + OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'), + ALLOY.ZERON_100.getGear(1) }); } if (CORE.GTNH) { GT_ModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_LuV.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[] { - "PCP", - "EME", - "GWG", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('P'), - INGREDIENT_1, - Character.valueOf('E'), - INGREDIENT_2, - Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Ultimate), - Character.valueOf('W'), - OrePrefixes.cableGt02.get(Materials.Tungsten), - Character.valueOf('G'), - ALLOY.ZERON_100.getGear(1) - }); + new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, + Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, + Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), + OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'), + ALLOY.ZERON_100.getGear(1) }); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java index 60b7d5a8cc..13a3e11340 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSafeBlock.java @@ -8,6 +8,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaSafeBlock; public class GregtechSafeBlock { + public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Lockable Safe Blocks."); @@ -53,183 +54,83 @@ public class GregtechSafeBlock { // To-Do Change Recipes GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_ULV.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_ULV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Basic), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Basic) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Basic) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_LV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Basic), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Good) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Good), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Good) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Good) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_HV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Good), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Advanced) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Good), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Advanced) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_EV.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Advanced), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Elite) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Elite) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_IV.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Advanced), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Master) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_LuV.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_LuV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Elite), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Master) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_ZPM.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_ZPM, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Elite), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Master) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Master) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_UV.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_UV, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Master), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Superconductor) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Superconductor) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.GT_Safe_MAX.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[] { - "CMV", - " X ", - Character.valueOf('M'), - ItemList.Hull_MAX, - Character.valueOf('V'), - OrePrefixes.circuit.get(Materials.Master), - Character.valueOf('C'), - OreDictNames.craftingChest, - Character.valueOf('X'), - OrePrefixes.circuit.get(Materials.Infinite) - }); + new Object[] { "CMV", " X ", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('V'), + OrePrefixes.circuit.get(Materials.Master), Character.valueOf('C'), OreDictNames.craftingChest, + Character.valueOf('X'), OrePrefixes.circuit.get(Materials.Infinite) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java index c8881c7490..32e164bc84 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java @@ -7,23 +7,40 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.Gr public class GregtechSemiFluidgenerators { public static void run() { - GregtechItemList.Generator_SemiFluid_LV.set(new GT_MetaTileEntity_SemiFluidGenerator( - 837, "basicgenerator.semifluid.tier.01", "Basic Semi-Fluid Generator", 1) - .getStackForm(1L)); - GregtechItemList.Generator_SemiFluid_MV.set(new GT_MetaTileEntity_SemiFluidGenerator( - 838, "basicgenerator.semifluid.tier.02", "Advanced Semi-Fluid Generator", 2) - .getStackForm(1L)); - GregtechItemList.Generator_SemiFluid_HV.set(new GT_MetaTileEntity_SemiFluidGenerator( - 839, "basicgenerator.semifluid.tier.03", "Turbo Semi-Fluid Generator", 3) - .getStackForm(1L)); - GregtechItemList.Generator_SemiFluid_EV.set(new GT_MetaTileEntity_SemiFluidGenerator( - 993, "basicgenerator.semifluid.tier.04", "Turbo Semi-Fluid Generator II", 4) - .getStackForm(1L)); - GregtechItemList.Generator_SemiFluid_IV.set(new GT_MetaTileEntity_SemiFluidGenerator( - 994, "basicgenerator.semifluid.tier.05", "Turbo Semi-Fluid Generator III", 5) - .getStackForm(1L)); - GregtechItemList.Controller_LargeSemifluidGenerator.set(new GregtechMetaTileEntity_LargeSemifluidGenerator( - 31026, "gtpp.multimachine.semifluidgenerator", "Large Semifluid Burner") - .getStackForm(1L)); + GregtechItemList.Generator_SemiFluid_LV.set( + new GT_MetaTileEntity_SemiFluidGenerator( + 837, + "basicgenerator.semifluid.tier.01", + "Basic Semi-Fluid Generator", + 1).getStackForm(1L)); + GregtechItemList.Generator_SemiFluid_MV.set( + new GT_MetaTileEntity_SemiFluidGenerator( + 838, + "basicgenerator.semifluid.tier.02", + "Advanced Semi-Fluid Generator", + 2).getStackForm(1L)); + GregtechItemList.Generator_SemiFluid_HV.set( + new GT_MetaTileEntity_SemiFluidGenerator( + 839, + "basicgenerator.semifluid.tier.03", + "Turbo Semi-Fluid Generator", + 3).getStackForm(1L)); + GregtechItemList.Generator_SemiFluid_EV.set( + new GT_MetaTileEntity_SemiFluidGenerator( + 993, + "basicgenerator.semifluid.tier.04", + "Turbo Semi-Fluid Generator II", + 4).getStackForm(1L)); + GregtechItemList.Generator_SemiFluid_IV.set( + new GT_MetaTileEntity_SemiFluidGenerator( + 994, + "basicgenerator.semifluid.tier.05", + "Turbo Semi-Fluid Generator III", + 5).getStackForm(1L)); + GregtechItemList.Controller_LargeSemifluidGenerator.set( + new GregtechMetaTileEntity_LargeSemifluidGenerator( + 31026, + "gtpp.multimachine.semifluidgenerator", + "Large Semifluid Burner").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index 124c7731ee..01fdb612d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTPP_Recipe; @@ -8,8 +11,6 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_BasicWasher; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class GregtechSimpleWasher { @@ -46,8 +47,7 @@ public class GregtechSimpleWasher { ItemStack dustDirty; for (Materials v : Materials.values()) { if (disablePlat) { - if (v == Materials.Platinum - || v == Materials.Osmium + if (v == Materials.Platinum || v == Materials.Osmium || v == Materials.Iridium || v == Materials.Palladium) { continue; @@ -59,11 +59,11 @@ public class GregtechSimpleWasher { if (dustClean != null && dustDirty != null) { GTPP_Recipe aRecipe = new GTPP_Recipe( false, - new ItemStack[] {dustDirty}, - new ItemStack[] {dustClean}, + new ItemStack[] { dustDirty }, + new ItemStack[] { dustClean }, null, new int[] {}, - new FluidStack[] {FluidUtils.getFluidStack("water", 100)}, + new FluidStack[] { FluidUtils.getFluidStack("water", 100) }, new FluidStack[] {}, 5, 8, @@ -89,11 +89,11 @@ public class GregtechSimpleWasher { if (crushedClean != null && crushedDirty != null) { GTPP_Recipe aRecipe = new GTPP_Recipe( false, - new ItemStack[] {crushedDirty}, - new ItemStack[] {crushedClean}, + new ItemStack[] { crushedDirty }, + new ItemStack[] { crushedClean }, null, new int[] {}, - new FluidStack[] {FluidUtils.getFluidStack("water", 100)}, + new FluidStack[] { FluidUtils.getFluidStack("water", 100) }, new FluidStack[] {}, 5, 8, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java index 5004984f0e..d686270bad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarGenerators.java @@ -8,6 +8,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; public class GregtechSolarGenerators { + public static void run() { if (LoadedMods.Gregtech && ConfigSwitches.enableMachine_SolarGenerators) { Logger.INFO("Gregtech5u Content | Registering Solar Generator Blocks."); @@ -19,33 +20,51 @@ public class GregtechSolarGenerators { private static void run1() { - GregtechItemList.GT_Solar_ULV.set(new GregtechMetaTileEntitySolarGenerator( - 800, "sunabsorber.tier.00", "Ultra Low Voltage Solar Generator", 0) - .getStackForm(1L)); + GregtechItemList.GT_Solar_ULV.set( + new GregtechMetaTileEntitySolarGenerator( + 800, + "sunabsorber.tier.00", + "Ultra Low Voltage Solar Generator", + 0).getStackForm(1L)); GregtechItemList.GT_Solar_LV.set( new GregtechMetaTileEntitySolarGenerator(801, "sunabsorber.tier.01", "Low Voltage Solar Generator", 1) .getStackForm(1L)); - GregtechItemList.GT_Solar_MV.set(new GregtechMetaTileEntitySolarGenerator( - 802, "sunabsorber.tier.02", "Medium Voltage Solar Generator", 2) - .getStackForm(1L)); + GregtechItemList.GT_Solar_MV.set( + new GregtechMetaTileEntitySolarGenerator( + 802, + "sunabsorber.tier.02", + "Medium Voltage Solar Generator", + 2).getStackForm(1L)); GregtechItemList.GT_Solar_HV.set( new GregtechMetaTileEntitySolarGenerator(803, "sunabsorber.tier.03", "High Voltage Solar Generator", 3) .getStackForm(1L)); - GregtechItemList.GT_Solar_EV.set(new GregtechMetaTileEntitySolarGenerator( - 804, "sunabsorber.tier.04", "Extreme Voltage Solar Generator", 4) - .getStackForm(1L)); - GregtechItemList.GT_Solar_IV.set(new GregtechMetaTileEntitySolarGenerator( - 805, "sunabsorber.tier.05", "Insane Voltage Solar Generator", 5) - .getStackForm(1L)); - GregtechItemList.GT_Solar_LuV.set(new GregtechMetaTileEntitySolarGenerator( - 806, "sunabsorber.tier.06", "Ludicrous Voltage Solar Generator", 6) - .getStackForm(1L)); + GregtechItemList.GT_Solar_EV.set( + new GregtechMetaTileEntitySolarGenerator( + 804, + "sunabsorber.tier.04", + "Extreme Voltage Solar Generator", + 4).getStackForm(1L)); + GregtechItemList.GT_Solar_IV.set( + new GregtechMetaTileEntitySolarGenerator( + 805, + "sunabsorber.tier.05", + "Insane Voltage Solar Generator", + 5).getStackForm(1L)); + GregtechItemList.GT_Solar_LuV.set( + new GregtechMetaTileEntitySolarGenerator( + 806, + "sunabsorber.tier.06", + "Ludicrous Voltage Solar Generator", + 6).getStackForm(1L)); GregtechItemList.GT_Solar_ZPM.set( new GregtechMetaTileEntitySolarGenerator(807, "sunabsorber.tier.07", "ZPM Voltage Solar Generator", 7) .getStackForm(1L)); - GregtechItemList.GT_Solar_UV.set(new GregtechMetaTileEntitySolarGenerator( - 808, "sunabsorber.tier.08", "Ultimate Voltage Solar Generator", 8) - .getStackForm(1L)); + GregtechItemList.GT_Solar_UV.set( + new GregtechMetaTileEntitySolarGenerator( + 808, + "sunabsorber.tier.08", + "Ultimate Voltage Solar Generator", + 8).getStackForm(1L)); GregtechItemList.GT_Solar_MAX.set( new GregtechMetaTileEntitySolarGenerator(809, "sunabsorber.tier.09", "MAX Voltage Solar Generator", 9) .getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java index fdb2ea8830..3b86daf811 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java @@ -1,12 +1,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.util.GTPP_Recipe; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower; import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater; -import net.minecraftforge.fluids.FluidStack; public class GregtechSolarTower { @@ -22,14 +23,14 @@ public class GregtechSolarTower { GregtechItemList.Industrial_Solar_Tower.set( new GregtechMetaTileEntity_SolarTower(863, "solartower.controller.tier.single", "Solar Tower") .getStackForm(1L)); - GregtechItemList.Solar_Tower_Reflector.set(new TileEntitySolarHeater( + GregtechItemList.Solar_Tower_Reflector.set( + new TileEntitySolarHeater( 864, "solarreflector.simple.single", "Solar Reflector", 8, "Part of the Clean Green energy movement", - 0) - .getStackForm(1L)); + 0).getStackForm(1L)); // NEI recipe GTPP_Recipe.GTPP_Recipe_Map.sSolarTowerRecipes.addRecipe( @@ -38,8 +39,8 @@ public class GregtechSolarTower { null, null, null, - new FluidStack[] {MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000)}, - new FluidStack[] {MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000)}, + new FluidStack[] { MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000) }, + new FluidStack[] { MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000) }, 0, 0, 0); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java index c6008c6b5c..53436350cc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java @@ -16,15 +16,20 @@ public class GregtechSteamMultis { GregtechItemList.Controller_SteamMaceratorMulti.set( new GregtechMetaTileEntity_SteamMacerator(31041, "gtpp.multimachine.steam.macerator", "Steam Grinder") .getStackForm(1L)); - GregtechItemList.Controller_SteamCompressorMulti.set(new GregtechMetaTileEntity_SteamCompressor( - 31078, "gtpp.multimachine.steam.compressor", "Steam Squasher") - .getStackForm(1L)); + GregtechItemList.Controller_SteamCompressorMulti.set( + new GregtechMetaTileEntity_SteamCompressor( + 31078, + "gtpp.multimachine.steam.compressor", + "Steam Squasher").getStackForm(1L)); GregtechItemList.Hatch_Input_Bus_Steam.set( new GT_MetaTileEntity_Hatch_Steam_BusInput(31046, "hatch.input_bus.tier.steam", "Input Bus (Steam)", 0) .getStackForm(1L)); - GregtechItemList.Hatch_Output_Bus_Steam.set(new GT_MetaTileEntity_Hatch_Steam_BusOutput( - 31047, "hatch.output_bus.tier.steam", "Output Bus (Steam)", 0) - .getStackForm(1L)); + GregtechItemList.Hatch_Output_Bus_Steam.set( + new GT_MetaTileEntity_Hatch_Steam_BusOutput( + 31047, + "hatch.output_bus.tier.steam", + "Output Bus (Steam)", + 0).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java index 5c99d2b4b7..fa2edaa030 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java @@ -47,87 +47,52 @@ public class GregtechSuperChests { ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L)); } else { GT_ModHandler.addCraftingRecipe( - GregtechItemList.Super_Chest_LV.get(1L, new Object[0]), bitsd, new Object[] { - "DPD", - "PMP", - "DGD", - Character.valueOf('M'), - ItemList.Hull_LV, - Character.valueOf('G'), - ItemList.Automation_ChestBuffer_LV, - Character.valueOf('D'), - OrePrefixes.circuit.get(Materials.Basic), - Character.valueOf('P'), - OrePrefixes.plate.get(Materials.Invar) - }); + GregtechItemList.Super_Chest_LV.get(1L, new Object[0]), + bitsd, + new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_LV, + Character.valueOf('G'), ItemList.Automation_ChestBuffer_LV, Character.valueOf('D'), + OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('P'), + OrePrefixes.plate.get(Materials.Invar) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Super_Chest_MV.get(1L, new Object[0]), bitsd, new Object[] { - "DPD", - "PMP", - "DGD", - Character.valueOf('M'), - ItemList.Hull_MV, - Character.valueOf('G'), - ItemList.Automation_ChestBuffer_MV, - Character.valueOf('D'), - OrePrefixes.circuit.get(Materials.Good), - Character.valueOf('P'), - OrePrefixes.plate.get(Materials.Aluminium) - }); + GregtechItemList.Super_Chest_MV.get(1L, new Object[0]), + bitsd, + new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_MV, + Character.valueOf('G'), ItemList.Automation_ChestBuffer_MV, Character.valueOf('D'), + OrePrefixes.circuit.get(Materials.Good), Character.valueOf('P'), + OrePrefixes.plate.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Super_Chest_HV.get(1L, new Object[0]), bitsd, new Object[] { - "DPD", - "PMP", - "DGD", - Character.valueOf('M'), - ItemList.Hull_HV, - Character.valueOf('G'), - ItemList.Automation_ChestBuffer_HV, - Character.valueOf('D'), - OrePrefixes.circuit.get(Materials.Advanced), - Character.valueOf('P'), - OrePrefixes.plate.get(Materials.StainlessSteel) - }); + GregtechItemList.Super_Chest_HV.get(1L, new Object[0]), + bitsd, + new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_HV, + Character.valueOf('G'), ItemList.Automation_ChestBuffer_HV, Character.valueOf('D'), + OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('P'), + OrePrefixes.plate.get(Materials.StainlessSteel) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Super_Chest_EV.get(1L, new Object[0]), bitsd, new Object[] { - "DPD", - "PMP", - "DGD", - Character.valueOf('M'), - ItemList.Hull_EV, - Character.valueOf('G'), - ItemList.Automation_ChestBuffer_EV, - Character.valueOf('D'), - OrePrefixes.circuit.get(Materials.Data), - Character.valueOf('P'), - OrePrefixes.plate.get(Materials.Titanium) - }); + GregtechItemList.Super_Chest_EV.get(1L, new Object[0]), + bitsd, + new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_EV, + Character.valueOf('G'), ItemList.Automation_ChestBuffer_EV, Character.valueOf('D'), + OrePrefixes.circuit.get(Materials.Data), Character.valueOf('P'), + OrePrefixes.plate.get(Materials.Titanium) }); GT_ModHandler.addCraftingRecipe( - GregtechItemList.Super_Chest_IV.get(1L, new Object[0]), bitsd, new Object[] { - "DPD", - "PMP", - "DGD", - Character.valueOf('M'), - ItemList.Hull_IV, - Character.valueOf('G'), - ItemList.Automation_ChestBuffer_IV, - Character.valueOf('D'), - OrePrefixes.circuit.get(Materials.Elite), - Character.valueOf('P'), - OrePrefixes.plate.get(Materials.Tungsten) - }); + GregtechItemList.Super_Chest_IV.get(1L, new Object[0]), + bitsd, + new Object[] { "DPD", "PMP", "DGD", Character.valueOf('M'), ItemList.Hull_IV, + Character.valueOf('G'), ItemList.Automation_ChestBuffer_IV, Character.valueOf('D'), + OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('P'), + OrePrefixes.plate.get(Materials.Tungsten) }); } // Test Thing - GregtechItemList.CrateStorage.set((new GT_MetaTileEntity_ConnectableCrate( + GregtechItemList.CrateStorage.set( + (new GT_MetaTileEntity_ConnectableCrate( GT_MetaTileEntity_ConnectableCrate.mCrateID, "crate.tier.01", "Interconnecting Storage Crate", - 0)) - .getStackForm(1L)); + 0)).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java index cdeb6859c7..b36a81e101 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperConductionPoint.java @@ -12,7 +12,7 @@ public class GregtechSuperConductionPoint { private static void run1() { // Steam Condensors // GregtechItemList.SuperConductorInputNode.set(new GregtechMetaTileEntitySuperCondensor(811, - // "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L)); + // "superconductor.01.input.single", "Power Phase Shifting Station", 8).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java index 728d23ed24..4470ebe67e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java @@ -16,8 +16,13 @@ public class GregtechThaumcraftDevices { private static void run1() { // 956-960 - GregtechItemList.Thaumcraft_Researcher.set(new GregtechMetaPollutionCreator( - 956, "thaumcraft.gtpp.machine.01", "Arcane Researcher", 5, "Thinking for you.", 0) - .getStackForm(1L)); + GregtechItemList.Thaumcraft_Researcher.set( + new GregtechMetaPollutionCreator( + 956, + "thaumcraft.gtpp.machine.01", + "Arcane Researcher", + 5, + "Thinking for you.", + 0).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java index 41ea0c3d26..737f585a56 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java @@ -1,11 +1,12 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.ItemList; import gregtech.api.util.GT_Recipe; import gregtech.common.tileentities.automation.GT_MetaTileEntity_SuperBuffer; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.GT_MetaTileEntity_InfiniteItemHolder; -import net.minecraft.item.ItemStack; public class GregtechThreadedBuffers { @@ -21,86 +22,82 @@ public class GregtechThreadedBuffers { /* * This file used to contain registration and recipes for GT++ threaded super buffers. Those have now been - * deprecated and replaced by the original GT super buffers. - * - * To avoid breaking existing bases, we've assigned the threaded super buffer metadata IDs to a copy of the GT - * super buffers, with a deprecation notice attached. We've also provided disassembler recipes that are the - * reverse of the original crafting recipes, allowing players to reclaim their original materials as well as - * convert the deprecated threaded super buffer metadata ID item back to the original GT super buffer metadata - * ID item. + * deprecated and replaced by the original GT super buffers. To avoid breaking existing bases, we've assigned + * the threaded super buffer metadata IDs to a copy of the GT super buffers, with a deprecation notice attached. + * We've also provided disassembler recipes that are the reverse of the original crafting recipes, allowing + * players to reclaim their original materials as well as convert the deprecated threaded super buffer metadata + * ID item back to the original GT super buffer metadata ID item. */ final String deprecationNotice = "**DEPRECATED - Drop in disassembler!** "; - GregtechItemList.Automation_Threaded_SuperBuffer_ULV.set((new GT_MetaTileEntity_SuperBuffer( + GregtechItemList.Automation_Threaded_SuperBuffer_ULV.set( + (new GT_MetaTileEntity_SuperBuffer( 31000, "automation.superbuffer.tier.00.deprecated", deprecationNotice + "Ultra Low Voltage Super Buffer", - 0)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_LV.set((new GT_MetaTileEntity_SuperBuffer( + 0)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_LV.set( + (new GT_MetaTileEntity_SuperBuffer( 31001, "automation.superbuffer.tier.01.deprecated", deprecationNotice + "Low Voltage Super Buffer", - 1)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_MV.set((new GT_MetaTileEntity_SuperBuffer( + 1)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_MV.set( + (new GT_MetaTileEntity_SuperBuffer( 31002, "automation.superbuffer.tier.02.deprecated", deprecationNotice + "Medium Voltage Super Buffer", - 2)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_HV.set((new GT_MetaTileEntity_SuperBuffer( + 2)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_HV.set( + (new GT_MetaTileEntity_SuperBuffer( 31003, "automation.superbuffer.tier.03.deprecated", deprecationNotice + "High Voltage Super Buffer", - 3)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_EV.set((new GT_MetaTileEntity_SuperBuffer( + 3)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_EV.set( + (new GT_MetaTileEntity_SuperBuffer( 31004, "automation.superbuffer.tier.04.deprecated", deprecationNotice + "Extreme Voltage Super Buffer", - 4)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_IV.set((new GT_MetaTileEntity_SuperBuffer( + 4)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_IV.set( + (new GT_MetaTileEntity_SuperBuffer( 31005, "automation.superbuffer.tier.05.deprecated", deprecationNotice + "Insane Voltage Super Buffer", - 5)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_LuV.set((new GT_MetaTileEntity_SuperBuffer( + 5)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_LuV.set( + (new GT_MetaTileEntity_SuperBuffer( 31006, "automation.superbuffer.tier.06.deprecated", deprecationNotice + "Ludicrous Voltage Super Buffer", - 6)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.set((new GT_MetaTileEntity_SuperBuffer( + 6)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.set( + (new GT_MetaTileEntity_SuperBuffer( 31007, "automation.superbuffer.tier.07.deprecated", deprecationNotice + "ZPM Voltage Super Buffer", - 7)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_UV.set((new GT_MetaTileEntity_SuperBuffer( + 7)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_UV.set( + (new GT_MetaTileEntity_SuperBuffer( 31008, "automation.superbuffer.tier.08.deprecated", deprecationNotice + "Ultimate Voltage Super Buffer", - 8)) - .getStackForm(1L)); - GregtechItemList.Automation_Threaded_SuperBuffer_MAX.set((new GT_MetaTileEntity_SuperBuffer( + 8)).getStackForm(1L)); + GregtechItemList.Automation_Threaded_SuperBuffer_MAX.set( + (new GT_MetaTileEntity_SuperBuffer( 31009, "automation.superbuffer.tier.09.deprecated", deprecationNotice + "Highly Ultimate Voltage Super Buffer", - 9)) - .getStackForm(1L)); + 9)).getStackForm(1L)); // These recipes are all 1 sec @ 32 EU/t GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_ULV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_ULV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_LV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_ULV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_ULV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_LV.get(1L, new Object[0]), }, null, null, null, @@ -109,12 +106,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_LV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_LV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_LV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_LV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_LV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_LV.get(1L, new Object[0]), }, null, null, null, @@ -123,12 +118,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_MV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_MV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_MV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_MV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_MV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_MV.get(1L, new Object[0]), }, null, null, null, @@ -137,12 +130,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_HV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_HV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_HV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_HV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_HV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_HV.get(1L, new Object[0]), }, null, null, null, @@ -151,12 +142,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_EV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_EV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_EV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_EV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_EV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_EV.get(1L, new Object[0]), }, null, null, null, @@ -165,12 +154,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_IV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_IV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_IV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_IV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_IV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_IV.get(1L, new Object[0]), }, null, null, null, @@ -179,12 +166,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_LuV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_LuV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_LuV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_LuV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_LuV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_LuV.get(1L, new Object[0]), }, null, null, null, @@ -193,12 +178,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_ZPM.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_ZPM.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_ZPM.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_ZPM.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_ZPM.get(1L, new Object[0]), }, null, null, null, @@ -207,12 +190,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_UV.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_UV.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - ItemList.Conveyor_Module_UV.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_UV.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_UV.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + ItemList.Conveyor_Module_UV.get(1L, new Object[0]), }, null, null, null, @@ -221,12 +202,10 @@ public class GregtechThreadedBuffers { -100); GT_Recipe.GT_Recipe_Map.sDisassemblerRecipes.addRecipe( true, - new ItemStack[] {GregtechItemList.Automation_Threaded_SuperBuffer_MAX.get(1L, new Object[0])}, - new ItemStack[] { - ItemList.Automation_SuperBuffer_MAX.get(1L, new Object[0]), - ItemList.Tool_DataOrb.get(1L, new Object[0]), - GregtechItemList.Conveyor_Module_MAX.get(1L, new Object[0]), - }, + new ItemStack[] { GregtechItemList.Automation_Threaded_SuperBuffer_MAX.get(1L, new Object[0]) }, + new ItemStack[] { ItemList.Automation_SuperBuffer_MAX.get(1L, new Object[0]), + ItemList.Tool_DataOrb.get(1L, new Object[0]), + GregtechItemList.Conveyor_Module_MAX.get(1L, new Object[0]), }, null, null, null, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java index 525b3f6110..a3d1b3f22f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java @@ -6,6 +6,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; public class GregtechTieredChunkloaders { + public static void run() { if (LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Chunk Loaders."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index 88984ac0c1..ac740b8210 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -7,6 +7,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredTank; public class GregtechTieredFluidTanks { + public static void run() { if (LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index 38ef3e6b77..65c3e0b36a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -6,6 +6,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaTreeFarmerStructural; public class GregtechTreeFarmerTE { + public static void run() { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index fb14dad78f..413e9bb81c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java @@ -14,86 +14,85 @@ public class GregtechWirelessChargers { if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Logger.INFO("Gregtech5u Content | Registering Wireless Chargers."); - long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE - | GT_ModHandler.RecipeBits.NOT_REMOVABLE + long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED; int mID = 890; Utils.registerEvent(new ChargingHelper()); - GregtechItemList.Charger_LV.set(new GregtechMetaWirelessCharger( + GregtechItemList.Charger_LV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.01.tier.single", "Wireless Charger MK I", 1, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_MV.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_MV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.02.tier.single", "Wireless Charger MK II", 2, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_HV.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_HV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.03.tier.single", "Wireless Charger MK III", 3, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_EV.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_EV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.04.tier.single", "Wireless Charger MK IV", 4, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_IV.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_IV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.05.tier.single", "Wireless Charger MK V", 5, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_LuV.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_LuV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.06.tier.single", "Wireless Charger MK VI", 6, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_ZPM.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_ZPM.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.07.tier.single", "Wireless Charger MK VII", 7, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_UV.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_UV.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.08.tier.single", "Wireless Charger MK VIII", 8, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); - GregtechItemList.Charger_MAX.set(new GregtechMetaWirelessCharger( + 0).getStackForm(1L)); + GregtechItemList.Charger_MAX.set( + new GregtechMetaWirelessCharger( mID++, "wificharger.09.tier.single", "Wireless Charger MK IX", 9, "Hopefully won't give you cancer.", - 0) - .getStackForm(1L)); + 0).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java index ceeed5128d..5ed7046a93 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/NewHorizonsAccelerator.java @@ -20,221 +20,125 @@ public class NewHorizonsAccelerator { } private static void run1() { - GregtechItemList.AcceleratorLV.set(new GT_MetaTileEntity_WorldAccelerator( - 841, "basicmachine.accelerator.tier.01", "Basic World Accelerator", 1) - .getStackForm(1L)); - GregtechItemList.AcceleratorMV.set(new GT_MetaTileEntity_WorldAccelerator( - 842, "basicmachine.accelerator.tier.02", "Advanced World Accelerator", 2) - .getStackForm(1L)); - GregtechItemList.AcceleratorHV.set(new GT_MetaTileEntity_WorldAccelerator( - 843, "basicmachine.accelerator.tier.03", "Advanced World Accelerator II", 3) - .getStackForm(1L)); - GregtechItemList.AcceleratorEV.set(new GT_MetaTileEntity_WorldAccelerator( - 844, "basicmachine.accelerator.tier.04", "Advanced World Accelerator III", 4) - .getStackForm(1L)); - GregtechItemList.AcceleratorIV.set(new GT_MetaTileEntity_WorldAccelerator( - 845, "basicmachine.accelerator.tier.05", "Advanced World Accelerator IV", 5) - .getStackForm(1L)); - GregtechItemList.AcceleratorLuV.set(new GT_MetaTileEntity_WorldAccelerator( - 846, "basicmachine.accelerator.tier.06", "Elite World Accelerator", 6) - .getStackForm(1L)); - GregtechItemList.AcceleratorZPM.set(new GT_MetaTileEntity_WorldAccelerator( - 847, "basicmachine.accelerator.tier.07", "Elite World Accelerator II", 7) - .getStackForm(1L)); - GregtechItemList.AcceleratorUV.set(new GT_MetaTileEntity_WorldAccelerator( - 848, "basicmachine.accelerator.tier.08", "Ultimate Time Anomaly", 8) - .getStackForm(1L)); + GregtechItemList.AcceleratorLV.set( + new GT_MetaTileEntity_WorldAccelerator( + 841, + "basicmachine.accelerator.tier.01", + "Basic World Accelerator", + 1).getStackForm(1L)); + GregtechItemList.AcceleratorMV.set( + new GT_MetaTileEntity_WorldAccelerator( + 842, + "basicmachine.accelerator.tier.02", + "Advanced World Accelerator", + 2).getStackForm(1L)); + GregtechItemList.AcceleratorHV.set( + new GT_MetaTileEntity_WorldAccelerator( + 843, + "basicmachine.accelerator.tier.03", + "Advanced World Accelerator II", + 3).getStackForm(1L)); + GregtechItemList.AcceleratorEV.set( + new GT_MetaTileEntity_WorldAccelerator( + 844, + "basicmachine.accelerator.tier.04", + "Advanced World Accelerator III", + 4).getStackForm(1L)); + GregtechItemList.AcceleratorIV.set( + new GT_MetaTileEntity_WorldAccelerator( + 845, + "basicmachine.accelerator.tier.05", + "Advanced World Accelerator IV", + 5).getStackForm(1L)); + GregtechItemList.AcceleratorLuV.set( + new GT_MetaTileEntity_WorldAccelerator( + 846, + "basicmachine.accelerator.tier.06", + "Elite World Accelerator", + 6).getStackForm(1L)); + GregtechItemList.AcceleratorZPM.set( + new GT_MetaTileEntity_WorldAccelerator( + 847, + "basicmachine.accelerator.tier.07", + "Elite World Accelerator II", + 7).getStackForm(1L)); + GregtechItemList.AcceleratorUV.set( + new GT_MetaTileEntity_WorldAccelerator( + 848, + "basicmachine.accelerator.tier.08", + "Ultimate Time Anomaly", + 8).getStackForm(1L)); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorLV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_LV, - 'M', - ItemList.Electric_Motor_LV, - 'P', - ItemList.Electric_Pump_LV, - 'B', - ItemList.Hull_LV, - 'C', - ItemList.Conveyor_Module_LV, - 'I', - ItemList.Electric_Piston_LV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LV, 'M', ItemList.Electric_Motor_LV, 'P', + ItemList.Electric_Pump_LV, 'B', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I', + ItemList.Electric_Piston_LV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorMV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_MV, - 'M', - ItemList.Electric_Motor_MV, - 'P', - ItemList.Electric_Pump_MV, - 'B', - ItemList.Hull_MV, - 'C', - ItemList.Conveyor_Module_MV, - 'I', - ItemList.Electric_Piston_MV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_MV, 'M', ItemList.Electric_Motor_MV, 'P', + ItemList.Electric_Pump_MV, 'B', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I', + ItemList.Electric_Piston_MV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorHV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_HV, - 'M', - ItemList.Electric_Motor_HV, - 'P', - ItemList.Electric_Pump_HV, - 'B', - ItemList.Hull_HV, - 'C', - ItemList.Conveyor_Module_HV, - 'I', - ItemList.Electric_Piston_HV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_HV, 'M', ItemList.Electric_Motor_HV, 'P', + ItemList.Electric_Pump_HV, 'B', ItemList.Hull_HV, 'C', ItemList.Conveyor_Module_HV, 'I', + ItemList.Electric_Piston_HV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorEV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_EV, - 'M', - ItemList.Electric_Motor_EV, - 'P', - ItemList.Electric_Pump_EV, - 'B', - ItemList.Hull_EV, - 'C', - ItemList.Conveyor_Module_EV, - 'I', - ItemList.Electric_Piston_EV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_EV, 'M', ItemList.Electric_Motor_EV, 'P', + ItemList.Electric_Pump_EV, 'B', ItemList.Hull_EV, 'C', ItemList.Conveyor_Module_EV, 'I', + ItemList.Electric_Piston_EV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorIV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_IV, - 'M', - ItemList.Electric_Motor_IV, - 'P', - ItemList.Electric_Pump_IV, - 'B', - ItemList.Hull_IV, - 'C', - ItemList.Conveyor_Module_IV, - 'I', - ItemList.Electric_Piston_IV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_IV, 'M', ItemList.Electric_Motor_IV, 'P', + ItemList.Electric_Pump_IV, 'B', ItemList.Hull_IV, 'C', ItemList.Conveyor_Module_IV, 'I', + ItemList.Electric_Piston_IV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorLuV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_LuV, - 'M', - ItemList.Electric_Motor_LuV, - 'P', - ItemList.Electric_Pump_LuV, - 'B', - ItemList.Hull_LuV, - 'C', - ItemList.Conveyor_Module_LuV, - 'I', - ItemList.Electric_Piston_LuV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_LuV, 'M', ItemList.Electric_Motor_LuV, 'P', + ItemList.Electric_Pump_LuV, 'B', ItemList.Hull_LuV, 'C', ItemList.Conveyor_Module_LuV, 'I', + ItemList.Electric_Piston_LuV }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorZPM.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_ZPM, - 'M', - ItemList.Electric_Motor_ZPM, - 'P', - ItemList.Electric_Pump_ZPM, - 'B', - ItemList.Hull_ZPM, - 'C', - ItemList.Conveyor_Module_ZPM, - 'I', - ItemList.Electric_Piston_ZPM - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_ZPM, 'M', ItemList.Electric_Motor_ZPM, 'P', + ItemList.Electric_Pump_ZPM, 'B', ItemList.Hull_ZPM, 'C', ItemList.Conveyor_Module_ZPM, 'I', + ItemList.Electric_Piston_ZPM }); GT_ModHandler.addCraftingRecipe( GregtechItemList.AcceleratorUV.get(1L), - 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[] { - "RMR", - "PBC", - "IMI", - 'R', - ItemList.Robot_Arm_UV, - 'M', - ItemList.Electric_Motor_UV, - 'P', - ItemList.Electric_Pump_UV, - 'B', - ItemList.Hull_UV, - 'C', - ItemList.Conveyor_Module_UV, - 'I', - ItemList.Electric_Piston_UV - }); + new Object[] { "RMR", "PBC", "IMI", 'R', ItemList.Robot_Arm_UV, 'M', ItemList.Electric_Motor_UV, 'P', + ItemList.Electric_Pump_UV, 'B', ItemList.Hull_UV, 'C', ItemList.Conveyor_Module_UV, 'I', + ItemList.Electric_Piston_UV }); } } |