From 74538cc891f31941467974a44cf4cdf24b7c72e8 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 12 Aug 2017 17:53:35 +1000 Subject: + More Cyclotron Work. + Added Better Accelerator Tooltip. --- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 14 +- .../multi/GregtechMetaTileEntity_Cyclotron.java | 18 +- .../registration/gregtech/Gregtech4Content.java | 77 ++++--- .../gregtech/GregtechAdvancedBoilers.java | 136 ++++++------- .../registration/gregtech/GregtechCyclotron.java | 10 +- .../registration/gregtech/GregtechDehydrator.java | 223 ++++++++------------- .../GregtechGeothermalThermalGenerator.java | 62 +++--- .../gregtech/GregtechIndustrialBlastSmelter.java | 15 +- .../gregtech/GregtechIndustrialCentrifuge.java | 18 +- .../gregtech/GregtechIndustrialCokeOven.java | 18 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 18 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 18 +- .../gregtech/GregtechIndustrialMacerator.java | 18 +- .../gregtech/GregtechIndustrialMassFabricator.java | 18 +- .../gregtech/GregtechIndustrialMultiTank.java | 22 +- .../gregtech/GregtechIndustrialPlatePress.java | 18 +- .../gregtech/GregtechIndustrialSifter.java | 20 +- .../gregtech/GregtechIndustrialTreeFarm.java | 19 +- .../gregtech/GregtechIndustrialWiremill.java | 19 +- .../gregtech/GregtechIronBlastFurnace.java | 16 +- .../registration/gregtech/GregtechLFTR.java | 19 +- .../gregtech/GregtechPollutionDevices.java | 54 +++-- .../gregtech/GregtechPowerSubStation.java | 18 +- .../registration/gregtech/GregtechRTG.java | 14 +- .../gregtech/GregtechRocketFuelGenerator.java | 62 +++--- .../registration/gregtech/GregtechSafeBlock.java | 127 +++++++++--- .../gregtech/GregtechSimpleWasher.java | 33 ++- .../gregtech/GregtechSolarGenerators.java | 46 +++-- .../gregtech/GregtechSteamCondenser.java | 18 +- .../gregtech/GregtechSuperConductionPoint.java | 18 +- .../gregtech/GregtechTieredFluidTanks.java | 54 +++-- .../gregtech/GregtechTreeFarmerTE.java | 5 +- .../gregtech/NewHorizonsAccelerator.java | 146 ++++++-------- 33 files changed, 674 insertions(+), 717 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java index 34568f60bd..e0f94036a7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; +import static gregtech.api.enums.GT_Values.V; + +import java.util.*; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Textures; @@ -9,6 +13,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; import gregtech.api.objects.GT_RenderedTexture; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerUtils; import net.minecraft.block.Block; @@ -20,12 +25,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import static gregtech.api.enums.GT_Values.V; - public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_TieredMachineBlock { public static String[] BlacklistedTileEntiyClassNames; @@ -68,7 +67,8 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered String.format("Accelerating things (Radius: %d EU/t: %d Speed Bonus: x%d)", mTier, getEnergyDemand(mTier, false), mAccelerateStatic[mTier]), "Use a screwdriver to change mode", "To accelerate TileEntities, this machine has to be adjacent to it", - "This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand" }; + "This machine accepts up to 8 Amps", "Accelerating TileEntities doubles Energy-Demand", CORE.GT_Tooltip}; + } public GT_MetaTileEntity_WorldAccelerator(String pName, int pTier, int pInvSlotCount, String pDescription, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java index 48ef351679..7d2de70c9c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java @@ -1,7 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi; -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; +import gregtech.api.enums.*; import gregtech.api.gui.GT_Container_MultiMachine; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; @@ -37,7 +36,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo @Override public long maxEUStore() { - return (640010000L/4) * (Math.min(16, this.mEnergyHatches.size())) / 16L; + return Integer.MAX_VALUE; } @Override @@ -167,21 +166,21 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo } private boolean addIfEnergyInjector(int aX, int aY, int aZ, IGregTechTileEntity aBaseMetaTileEntity) { - if (addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) { + if (addEnergyInputToMachineList(aBaseMetaTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) { return true; } return isAdvancedMachineCasing(aX, aY, aZ); } private boolean addIfInjector(int aX, int aY, int aZ, IGregTechTileEntity aTileEntity) { - if (addInputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) { + if (addInputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) { return true; } return isAdvancedMachineCasing(aX, aY, aZ); } private boolean addIfExtractor(int aX, int aY, int aZ, IGregTechTileEntity aTileEntity) { - if (addOutputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), 53)) { + if (addOutputToMachineList(aTileEntity.getIGregTechTileEntity(aX, aY, aZ), TAE.GTPP_INDEX(25))) { return true; } return isAdvancedMachineCasing(aX, aY, aZ); @@ -218,14 +217,14 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo "------------------------------------------------------------", "Particles are accelerated over 186 revolutions to 80% light speed", "Can produce a continuous beam current of 2.2 mA at 590 MeV", - "Which will be extracted from the Isochronous cyclotron", + "Which will be extracted from the Isochronous Cyclotron", "------------------------------------------------------------", "Consists of the same layout as a Fusion Reactor", "Cyclotron Machine Casings around Cyclotron Coil Blocks", "2-16 Input Hatches", "1-16 Output Hatches", "1-16 Energy Hatches", - "All Hatches must be ZPM or better"}; + "All Hatches must be LuV or better"}; } @Override @@ -304,8 +303,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlo return new String[]{ "COMET - Compact Cyclotron MK "+tier, "EU Required: "+powerRequired+"EU/t", - "Stored EU: "+mEUStore+" / "+maxEUStore(), - "Plasma Output: "+plasmaOut+"L/t"}; + "Stored EU: "+mEUStore+" / "+maxEUStore()}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index dec1d3f746..3bbdd48a0a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -9,14 +9,12 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_Aut import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GT4Entity_ThermalBoiler; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving.*; -public class Gregtech4Content -{ +public class Gregtech4Content { - //ID Range 828, 829, 833 - 850 + // ID Range 828, 829, 833 - 850 - public static void run() - { - if (LoadedMods.Gregtech){ + public static void run() { + if (LoadedMods.Gregtech) { workbenches(); thermalBoiler(); multiCrafter(); @@ -25,40 +23,57 @@ public class Gregtech4Content } } - private static void workbenches(){ - //Gregtech 4 Workbenches + private static void workbenches() { + // Gregtech 4 Workbenches Utils.LOG_INFO("Gregtech 4 Content | Registering Workbenches."); - //Free //GregtechItemList.GT4_Workbench_Bronze.set(new GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", "Bronze Workbench", 0).getStackForm(1L)); - //Free //GregtechItemList.GT4_Workbench_Advanced.set(new GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", "Advanced Workbench", 1).getStackForm(1L)); + // Free //GregtechItemList.GT4_Workbench_Bronze.set(new + // GT_MetaTileEntity_BronzeCraftingTable(828, "workbench.bronze", + // "Bronze Workbench", 0).getStackForm(1L)); + // Free //GregtechItemList.GT4_Workbench_Advanced.set(new + // GT_MetaTileEntity_AdvancedCraftingTable(829, "workbench.advanced", + // "Advanced Workbench", 1).getStackForm(1L)); } - - private static void tesseracts(){ - //Gregtech 4 Tesseracts + private static void tesseracts() { + // Gregtech 4 Tesseracts Utils.LOG_INFO("Gregtech 4 Content | Registering Tesseracts."); - GregtechItemList.GT4_Tesseract_Generator.set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4).getStackForm(1L)); - GregtechItemList.GT4_Tesseract_Terminal.set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4).getStackForm(1L)); + GregtechItemList.GT4_Tesseract_Generator + .set(new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4) + .getStackForm(1L)); + GregtechItemList.GT4_Tesseract_Terminal + .set(new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4) + .getStackForm(1L)); } - - private static void shelves(){ - //Gregtech 4 Shelves + + private static void shelves() { + // Gregtech 4 Shelves Utils.LOG_INFO("Gregtech 4 Content | Registering Shelves."); - GregtechItemList.GT4_Shelf.set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things").getStackForm(1L)); - GregtechItemList.GT4_Shelf_Iron.set(new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things").getStackForm(1L)); - GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet", "File Cabinet", "Stores Books & Things").getStackForm(1L)); - GregtechItemList.GT4_Shelf_Desk.set(new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things").getStackForm(1L)); - GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment", "Compartment", "Stores Books & Things").getStackForm(1L)); - } + GregtechItemList.GT4_Shelf + .set(new GT4Entity_Shelf(870, "gtplusplus.shelf.wooden", "Wood encased Shelf", "Stores Books & Things") + .getStackForm(1L)); + GregtechItemList.GT4_Shelf_Iron.set( + new GT4Entity_Shelf_Iron(871, "gtplusplus.shelf.iron", "Metal encased Shelf", "Stores Books & Things") + .getStackForm(1L)); + GregtechItemList.GT4_Shelf_FileCabinet.set(new GT4Entity_Shelf_FileCabinet(872, "gtplusplus.shelf.filecabinet", + "File Cabinet", "Stores Books & Things").getStackForm(1L)); + GregtechItemList.GT4_Shelf_Desk.set( + new GT4Entity_Shelf_Desk(873, "gtplusplus.shelf.desk", "Metal encased Desk", "Stores Books & Things") + .getStackForm(1L)); + GregtechItemList.GT4_Shelf_Compartment.set(new GT4Entity_Shelf_Compartment(874, "gtplusplus.shelf.compartment", + "Compartment", "Stores Books & Things").getStackForm(1L)); + } - private static void thermalBoiler(){ - //Gregtech 4 Thermal Boiler + private static void thermalBoiler() { + // Gregtech 4 Thermal Boiler Utils.LOG_INFO("Gregtech 4 Content | Registering Thermal Boiler."); - GregtechItemList.GT4_Thermal_Boiler.set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L)); + GregtechItemList.GT4_Thermal_Boiler + .set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L)); } - - private static void multiCrafter(){ - //Gregtech 4 Multiblock Auto-Crafter + + private static void multiCrafter() { + // Gregtech 4 Multiblock Auto-Crafter Utils.LOG_INFO("Gregtech 4 Content | Registering Multiblock Crafter."); - GregtechItemList.GT4_Multi_Crafter.set(new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L)); + GregtechItemList.GT4_Multi_Crafter.set( + new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Autocrafter").getStackForm(1L)); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index ea1279126d..0ac4379e7e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -14,95 +14,85 @@ import net.minecraft.item.ItemStack; public class GregtechAdvancedBoilers { public static void run() { - if (LoadedMods.Gregtech){ + if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Advanced Boilers."); run1(); } } - 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)); - - - 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); + 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)); + 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. + // 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.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)}); + // Chassis Recipes + GT_ModHandler.addCraftingRecipe(chassisT1, + 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) }); - GT_ModHandler.addCraftingRecipe( - chassisT2, - 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)}); + GT_ModHandler.addCraftingRecipe(chassisT2, + 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) }); - GT_ModHandler.addCraftingRecipe( - chassisT3, - 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)}); + GT_ModHandler.addCraftingRecipe(chassisT3, + 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) }); - ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1); ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1); ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1); - - //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.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)}); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]), - 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)}); + // 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.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) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]), - 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)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_MV.get(1L, new Object[0]), + 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) }); + + GT_ModHandler.addCraftingRecipe(GregtechItemList.Boiler_Advanced_HV.get(1L, new Object[0]), + 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) }); - } - + } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java index 44b10d81cf..193ab09b4b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java @@ -6,15 +6,17 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaT public class GregtechCyclotron { - public static void run(){ - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering COMET Cyclotron."); run1(); } } - private static void run1(){ - GregtechItemList.COMET_Cyclotron.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6).getStackForm(1L)); + private static void run1() { + GregtechItemList.COMET_Cyclotron + .set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6) + .getStackForm(1L)); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 63621c627e..aed701d6cd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -14,11 +14,9 @@ import gtPlusPlus.core.util.recipe.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; -public class GregtechDehydrator -{ - public static void run() - { - if (LoadedMods.Gregtech){ +public class GregtechDehydrator { + public static void run() { + if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Chemical Dehydrators."); if (CORE.configSwitches.enableMachine_Dehydrators) { run1(); @@ -27,79 +25,49 @@ public class GregtechDehydrator } - private static void run1() - { + 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) { + * */ - GregtechItemList.GT_Dehydrator_EV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 813, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4, - "This dehydrates your Grapes into Raisins. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 814, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, - "A hangover is the way your body reacts to dehydration. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 815, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, - "You could probably make space icecream with this.. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); - GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( - 816, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, - "You can definitely make space icecream with this.. "+CORE.GT_Tooltip, - Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, - 2, 9, - 10000, - 2, 5, - "Dehydrator.png", "", - false, false, - 0, - "UNBOXINATOR", - null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_EV + .set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(813, "advancedmachine.dehydrator.tier.01", + "Chemical Dehydrator I", 4, "This dehydrates your Grapes into Raisins. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", + "", false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_IV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(814, + "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, + "A hangover is the way your body reacts to dehydration. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "", + false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_LuV.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(815, + "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, + "You could probably make space icecream with this.. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "", + false, false, 0, "UNBOXINATOR", null).getStackForm(1L)); + GregtechItemList.GT_Dehydrator_ZPM.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(816, + "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, + "You can definitely make space icecream with this.. " + CORE.GT_Tooltip, + Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes, 2, 9, 10000, 2, 5, "Dehydrator.png", "", + false, false, 0, "UNBOXINATOR", null).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); @@ -108,78 +76,49 @@ public class GregtechDehydrator ItemStack spoolT2 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumSteel", 1); ItemStack spoolT3 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumStainlessSteel", 1); ItemStack spoolT4 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumTitanium", 1); - - //Make some coils by wrapping wire around a spool. - GT_Values.RA.addAssemblerRecipe( - coilWire1, - spoolT1, - coilT1, - 8*20, - 120); - GT_Values.RA.addAssemblerRecipe( - coilWire2, - spoolT2, - coilT2, - 8*20, - 240); - GT_Values.RA.addAssemblerRecipe( - coilWire3, - spoolT3, - coilT3, - 8*20, - 480); - GT_Values.RA.addAssemblerRecipe( - coilWire4, - spoolT4, - coilT4, - 8*20, - 960); - - - //Add recipes for the Dehydrators. - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]), - 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.Advanced), - 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.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)}); + // Make some coils by wrapping wire around a spool. + GT_Values.RA.addAssemblerRecipe(coilWire1, spoolT1, coilT1, 8 * 20, 120); + GT_Values.RA.addAssemblerRecipe(coilWire2, spoolT2, coilT2, 8 * 20, 240); + GT_Values.RA.addAssemblerRecipe(coilWire3, spoolT3, coilT3, 8 * 20, 480); + GT_Values.RA.addAssemblerRecipe(coilWire4, spoolT4, coilT4, 8 * 20, 960); + + // Add recipes for the Dehydrators. + GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_EV.get(1L, new Object[0]), + 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.Advanced), 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.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) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]), - 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)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_LuV.get(1L, new Object[0]), + 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) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]), - 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)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.GT_Dehydrator_ZPM.get(1L, new Object[0]), + 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) }); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index b7b89d4aba..a81e29bb77 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -13,9 +13,8 @@ import net.minecraft.item.ItemStack; public class GregtechGeothermalThermalGenerator { - public static void run() - { - if (LoadedMods.Gregtech){ + public static void run() { + if (LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); if (CORE.configSwitches.enableMachine_GeothermalEngines) { run1(); @@ -24,43 +23,42 @@ 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)); + 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)); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Geothermal_Engine_EV.get(1L, new Object[0]), - 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)}); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_EV.get(1L, new Object[0]), + 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) }); GT_ModHandler.addCraftingRecipe(GregtechItemList.Geothermal_Engine_IV.get(1L, new Object[0]), - 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, + 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)}); + 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.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)}); + 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) }); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 94b2462cb3..600ac3346a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -5,11 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_AlloyBlastSmelter; -public class GregtechIndustrialBlastSmelter{ +public class GregtechIndustrialBlastSmelter { - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter) { run1(); @@ -18,10 +17,10 @@ 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)); + 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)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index b09c36b020..a6b452a4b7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCentrifuge; -public class GregtechIndustrialCentrifuge -{ +public class GregtechIndustrialCentrifuge { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); if (CORE.configSwitches.enableMultiblock_IndustrialCentrifuge) { run1(); @@ -21,10 +17,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)); + private static void run1() { + // Industrial Centrifuge Multiblock + GregtechItemList.Industrial_Centrifuge.set(new GregtechMetaTileEntity_IndustrialCentrifuge(790, + "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L)); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index e366658c65..d5bd5c58d3 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialCokeOven; -public class GregtechIndustrialCokeOven -{ +public class GregtechIndustrialCokeOven { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); if (CORE.configSwitches.enableMultiblock_IndustrialCokeOven) { run1(); @@ -21,10 +17,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)); + private static void run1() { + // Industrial Centrifuge Multiblock + GregtechItemList.Industrial_CokeOven.set(new GregtechMetaTileEntity_IndustrialCokeOven(791, + "industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 932da8fcff..453a6644e8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialElectrolyzer; -public class GregtechIndustrialElectrolyzer -{ +public class GregtechIndustrialElectrolyzer { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); if (CORE.configSwitches.enableMultiblock_IndustrialElectrolyzer) { run1(); @@ -21,10 +17,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)); + private static void run1() { + // Industrial Electrolyzer Multiblock + GregtechItemList.Industrial_Electrolyzer.set(new GregtechMetaTileEntity_IndustrialElectrolyzer(796, + "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index a892d31d50..f172f6b325 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_Refinery; -public class GregtechIndustrialFuelRefinery -{ +public class GregtechIndustrialFuelRefinery { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); if (CORE.configSwitches.enableMultiblock_NuclearFuelRefinery) { run1(); @@ -21,10 +17,10 @@ public class GregtechIndustrialFuelRefinery } - private static void run1() - { - //Industrial Maceration Stack Multiblock - GregtechItemList.Industrial_FuelRefinery.set(new GregtechMetaTileEntity_Refinery(835, "industrialrefinery.controller.tier.single", "Fission Fuel Processing Plant").getStackForm(1L)); + private static void run1() { + // Industrial Maceration Stack Multiblock + GregtechItemList.Industrial_FuelRefinery.set(new GregtechMetaTileEntity_Refinery(835, + "industrialrefinery.controller.tier.single", "Fission Fuel Processing Plant").getStackForm(1L)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index acdce264a9..5ce1fc4a70 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator; -public class GregtechIndustrialMacerator -{ +public class GregtechIndustrialMacerator { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); if (CORE.configSwitches.enableMultiblock_IndustrialMacerationStack) { run1(); @@ -21,10 +17,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)); + 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)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 4110d06acc..a04c516bce 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MassFabricator; -public class GregtechIndustrialMassFabricator -{ +public class GregtechIndustrialMassFabricator { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); if (CORE.configSwitches.enableMultiblock_MatterFabricator) { run1(); @@ -21,10 +17,10 @@ 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)); + 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)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java index 63f461d6f0..b07ba7f275 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiTank.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_MultiTank; -public class GregtechIndustrialMultiTank -{ +public class GregtechIndustrialMultiTank { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Multitank controller blocks."); if (CORE.configSwitches.enableMultiblock_MultiTank) { run1(); @@ -21,10 +17,14 @@ public class GregtechIndustrialMultiTank } - 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)); + 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/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index bc345715c1..e94f3ac364 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialPlatePress; -public class GregtechIndustrialPlatePress -{ +public class GregtechIndustrialPlatePress { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); if (CORE.configSwitches.enableMultiblock_IndustrialPlatePress) { run1(); @@ -21,10 +17,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)); + private static void run1() { + // Industrial Presser Multiblock + GregtechItemList.Industrial_PlatePress.set(new GregtechMetaTileEntity_IndustrialPlatePress(792, + "industrialbender.controller.tier.single", "Industrial Material Press").getStackForm(1L)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index 32ca4cd716..664f1c0d78 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -6,26 +6,22 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialMacerator; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialSifter; -public class GregtechIndustrialSifter -{ +public class GregtechIndustrialSifter { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); - if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { //TODO + if (CORE.configSwitches.enableMultiblock_IndustrialSifter) { // TODO run1(); } } } - private static void run1() - { - //Industrial Maceration Stack Multiblock - GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(840, "industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L)); + private static void run1() { + // Industrial Maceration Stack Multiblock + GregtechItemList.Industrial_Sifter.set(new GregtechMetaTileEntity_IndustrialSifter(840, + "industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 0512d4c1dd..dc3949997e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -5,14 +5,10 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntityTreeFarm; -public class GregtechIndustrialTreeFarm -{ +public class GregtechIndustrialTreeFarm { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); if (CORE.configSwitches.enableMultiblock_TreeFarmer) { run1(); @@ -21,10 +17,11 @@ public class GregtechIndustrialTreeFarm } - private static void run1() - { - //Industrial Maceration Stack Multiblock - GregtechItemList.Industrial_TreeFarm.set(new GregtechMetaTileEntityTreeFarm(836, "treefarm.controller.tier.single", "Tree Farmer").getStackForm(1L)); + private static void run1() { + // Industrial Maceration Stack Multiblock + GregtechItemList.Industrial_TreeFarm + .set(new GregtechMetaTileEntityTreeFarm(836, "treefarm.controller.tier.single", "Tree Farmer") + .getStackForm(1L)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 5cfd25931d..b3ad360c23 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -5,26 +5,21 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_IndustrialWireMill; -public class GregtechIndustrialWiremill -{ +public class GregtechIndustrialWiremill { - - - public static void run() - { - if (gtPlusPlus.core.lib.LoadedMods.Gregtech){ + public static void run() { + if (gtPlusPlus.core.lib.LoadedMods.Gregtech) { Utils.LOG_INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); if (CORE.configSwitches.enableMultiblock_IndustrialWireMill) { run1(); } } - } - 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)); + 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)); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIronBlastFurnace.java index 731caaf706..6df2b6df38 100644 ---