From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../gregtech/common/items/MetaCustomCoverItem.java | 49 +- .../common/items/MetaGeneratedGregtechItems.java | 1534 +++++++++++--------- .../common/items/MetaGeneratedGregtechTools.java | 64 +- .../items/behaviours/Behaviour_Choocher.java | 54 +- .../behaviours/Behaviour_Electric_Lighter.java | 86 +- .../common/items/behaviours/Behaviour_Grinder.java | 44 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 73 +- .../common/items/covers/MetaItemCoverCasings.java | 13 +- 8 files changed, 1036 insertions(+), 881 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/items') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index 7012f6d0f7..4fe1fda076 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java @@ -1,5 +1,18 @@ package gtPlusPlus.xmod.gregtech.common.items; +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +import org.apache.commons.lang3.StringUtils; + import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; @@ -13,16 +26,6 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual; -import java.util.List; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import org.apache.commons.lang3.StringUtils; public class MetaCustomCoverItem extends Item { @@ -32,8 +35,8 @@ public class MetaCustomCoverItem extends Item { protected final IIconContainer[] mTextures; private final short[][] mRGB; - public MetaCustomCoverItem( - String aModId, int aTextureCount, String aTextureSetName, IIconContainer[] aTextures, short[][] aRGB) { + public MetaCustomCoverItem(String aModId, int aTextureCount, String aTextureSetName, IIconContainer[] aTextures, + short[][] aRGB) { super(); icons = new IIcon[aTextureCount]; mModID = aModId; @@ -48,8 +51,13 @@ public class MetaCustomCoverItem extends Item { this.setMaxStackSize(1); GameRegistry.registerItem(this, unlocalizedName); registerCover(); - Logger.INFO("[Covers] Generated Custom covers for " + mModID + " using " + aTextureCount + " textures from " - + mTextureSetName + "."); + Logger.INFO( + "[Covers] Generated Custom covers for " + mModID + + " using " + + aTextureCount + + " textures from " + + mTextureSetName + + "."); } public boolean hide() { @@ -65,17 +73,15 @@ public class MetaCustomCoverItem extends Item { } GregTech_API.registerCover( thisStack, - new GT_MultiTexture(new ITexture[] {new GT_RenderedTexture(mTextures[i])}), + new GT_MultiTexture(new ITexture[] { new GT_RenderedTexture(mTextures[i]) }), new GTPP_Cover_ToggleVisual()); } } /* - * @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < - * icons.length; i++) { this.icons[i] = mTextures[i].getIcon(); } } - * - * @Override public IIcon getIconFromDamage(int meta) { return this.icons[meta]; - * } + * @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i < icons.length; i++) { this.icons[i] = + * mTextures[i].getIcon(); } } + * @Override public IIcon getIconFromDamage(int meta) { return this.icons[meta]; } */ @Override @@ -92,8 +98,7 @@ public class MetaCustomCoverItem extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { - return StringUtils.capitalize(mTextureSetName) + " (" + tItem.getItemDamage() - + ")"; // super.getItemStackDisplayName(tItem); + return StringUtils.capitalize(mTextureSetName) + " (" + tItem.getItemDamage() + ")"; // super.getItemStackDisplayName(tItem); } private static boolean createNBT(ItemStack rStack) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index 9ff348ddcc..4ccec0bb93 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.items; import static gtPlusPlus.core.util.Utils.getTcAspectStack; +import net.minecraft.item.EnumAction; + import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -35,7 +37,6 @@ import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow; import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual; -import net.minecraft.item.EnumAction; public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { @@ -46,7 +47,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { } public MetaGeneratedGregtechItems() { - super("MU-metaitem.01", new OrePrefixes[] {null}); + super("MU-metaitem.01", new OrePrefixes[] { null }); } public void generateMetaItems() { @@ -59,60 +60,60 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { Logger.INFO( "Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)"); GregtechItemList.Electric_Pump_LuV.set( - this.addItem(tLastID = 0, "Electric Pump (LuV)", "163920 L/sec (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + tLastID = 0, + "Electric Pump (LuV)", + "163920 L/sec (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L) })); GregtechItemList.Electric_Pump_ZPM.set( - this.addItem(tLastID = 1, "Electric Pump (ZPM)", "655680 L/sec (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.ITER, 2L), - getTcAspectStack(TC_Aspects.AQUA, 2L) - })); + this.addItem( + tLastID = 1, + "Electric Pump (ZPM)", + "655680 L/sec (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L), + getTcAspectStack(TC_Aspects.AQUA, 2L) })); GregtechItemList.Electric_Pump_UV.set( - this.addItem(tLastID = 2, "Electric Pump (UV)", "2622720 L/sec (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.ITER, 4L), - getTcAspectStack(TC_Aspects.AQUA, 4L) - })); + this.addItem( + tLastID = 2, + "Electric Pump (UV)", + "2622720 L/sec (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L), + getTcAspectStack(TC_Aspects.AQUA, 4L) })); GregtechItemList.Electric_Pump_MAX.set( - this.addItem(tLastID = 3, "Electric Pump (MAX)", "10490880 L/sec (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.ITER, 8L), - getTcAspectStack(TC_Aspects.AQUA, 8L) - })); + this.addItem( + tLastID = 3, + "Electric Pump (MAX)", + "10490880 L/sec (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L), + getTcAspectStack(TC_Aspects.AQUA, 8L) })); GregTech_API.registerCover( GregtechItemList.Electric_Pump_LuV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), new GT_Cover_Pump(8196)); GregTech_API.registerCover( GregtechItemList.Electric_Pump_ZPM.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[6][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[6][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), new GT_Cover_Pump(32768)); GregTech_API.registerCover( GregtechItemList.Electric_Pump_UV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[7][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[7][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), new GT_Cover_Pump(131072)); GregTech_API.registerCover( GregtechItemList.Electric_Pump_MAX.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), new GT_Cover_Pump(524288)); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | @@ -146,26 +147,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('P'), // OrePrefixes.pipeMedium.get(Materials.Titanium)}); tLastID = 4; - GregtechItemList.Electric_Motor_LuV.set(this.addItem(tLastID = 4, "Electric Motor (LuV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.MOTUS, 1L) - })); - GregtechItemList.Electric_Motor_ZPM.set(this.addItem(tLastID = 5, "Electric Motor (ZPM)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.MOTUS, 2L) - })); - GregtechItemList.Electric_Motor_UV.set(this.addItem(tLastID = 6, "Electric Motor (UV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.MOTUS, 4L) - })); - GregtechItemList.Electric_Motor_MAX.set(this.addItem(tLastID = 7, "Electric Motor (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.MOTUS, 8L) - })); + GregtechItemList.Electric_Motor_LuV.set( + this.addItem( + tLastID = 4, + "Electric Motor (LuV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.MOTUS, 1L) })); + GregtechItemList.Electric_Motor_ZPM.set( + this.addItem( + tLastID = 5, + "Electric Motor (ZPM)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), + getTcAspectStack(TC_Aspects.MOTUS, 2L) })); + GregtechItemList.Electric_Motor_UV.set( + this.addItem( + tLastID = 6, + "Electric Motor (UV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), + getTcAspectStack(TC_Aspects.MOTUS, 4L) })); + GregtechItemList.Electric_Motor_MAX.set( + this.addItem( + tLastID = 7, + "Electric Motor (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), + getTcAspectStack(TC_Aspects.MOTUS, 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'), @@ -196,30 +209,34 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // OrePrefixes.cableGt01.get(Materials.Nichrome)}); tLastID = 8; - GregtechItemList.Conveyor_Module_LuV.set(this.addItem( - tLastID = 8, "Conveyor Module (LuV)", "1 Stack every 20 secs (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L) - })); + GregtechItemList.Conveyor_Module_LuV.set( + this.addItem( + tLastID = 8, + "Conveyor Module (LuV)", + "1 Stack every 20 secs (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) })); GregtechItemList.Conveyor_Module_ZPM.set( - this.addItem(tLastID = 9, "Conveyor Module (ZPM)", "1 Stack every 5 secs (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.ITER, 2L) - })); + this.addItem( + tLastID = 9, + "Conveyor Module (ZPM)", + "1 Stack every 5 secs (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L) })); GregtechItemList.Conveyor_Module_UV.set( - this.addItem(tLastID = 10, "Conveyor Module (UV)", "1 Stack every 1 sec (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.ITER, 4L) - })); - GregtechItemList.Conveyor_Module_MAX.set(this.addItem( - tLastID = 11, "Conveyor Module (MAX)", "1 Stack every 1/5 sec (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.ITER, 8L) - })); + this.addItem( + tLastID = 10, + "Conveyor Module (UV)", + "1 Stack every 1 sec (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L) })); + GregtechItemList.Conveyor_Module_MAX.set( + this.addItem( + tLastID = 11, + "Conveyor Module (MAX)", + "1 Stack every 1/5 sec (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'), @@ -244,57 +261,61 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // OrePrefixes.plate.get(Materials.Rubber)}); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_LuV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[1][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), new GT_Cover_Conveyor(400)); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_ZPM.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[2][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), new GT_Cover_Conveyor(100)); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_UV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[3][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), new GT_Cover_Conveyor(20)); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_MAX.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), new GT_Cover_Conveyor(4)); tLastID = 12; GregtechItemList.Electric_Piston_LuV.set( - this.addItem(tLastID = 12, "Electric Piston (LuV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.MOTUS, 1L) - })); + this.addItem( + tLastID = 12, + "Electric Piston (LuV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), + getTcAspectStack(TC_Aspects.MOTUS, 1L) })); GregtechItemList.Electric_Piston_ZPM.set( - this.addItem(tLastID = 13, "Electric Piston (ZPM)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.MOTUS, 2L) - })); + this.addItem( + tLastID = 13, + "Electric Piston (ZPM)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), + getTcAspectStack(TC_Aspects.MOTUS, 2L) })); GregtechItemList.Electric_Piston_UV.set( - this.addItem(tLastID = 14, "Electric Piston (UV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.MOTUS, 4L) - })); + this.addItem( + tLastID = 14, + "Electric Piston (UV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), + getTcAspectStack(TC_Aspects.MOTUS, 4L) })); GregtechItemList.Electric_Piston_MAX.set( - this.addItem(tLastID = 15, "Electric Piston (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 16L), - getTcAspectStack(TC_Aspects.MOTUS, 8L) - })); + this.addItem( + tLastID = 15, + "Electric Piston (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 16L), + getTcAspectStack(TC_Aspects.MOTUS, 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Piston_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"PPP", "CSS", "CMG", Character.valueOf('P'), @@ -325,34 +346,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'), // OrePrefixes.cableGt01.get(Materials.Aluminium)}); tLastID = 16; - GregtechItemList.Robot_Arm_LuV.set(this.addItem( - tLastID = 16, "Robot Arm (LuV)", "Inserts into specific Slots (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.MOTUS, 1L), - Utils.getTcAspectStack("COGNITIO", 1L) - })); - GregtechItemList.Robot_Arm_ZPM.set(this.addItem( - tLastID = 17, "Robot Arm (ZPM)", "Inserts into specific Slots (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.MOTUS, 2L), - getTcAspectStack("COGNITIO", 2L) - })); - GregtechItemList.Robot_Arm_UV.set(this.addItem( - tLastID = 18, "Robot Arm (UV)", "Inserts into specific Slots (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.MOTUS, 4L), - getTcAspectStack("COGNITIO", 4L) - })); - GregtechItemList.Robot_Arm_MAX.set(this.addItem( - tLastID = 19, "Robot Arm (MAX)", "Inserts into specific Slots (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 16L), - getTcAspectStack(TC_Aspects.MOTUS, 8L), - getTcAspectStack("COGNITIO", 8L) - })); + GregtechItemList.Robot_Arm_LuV.set( + this.addItem( + tLastID = 16, + "Robot Arm (LuV)", + "Inserts into specific Slots (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L), + Utils.getTcAspectStack("COGNITIO", 1L) })); + GregtechItemList.Robot_Arm_ZPM.set( + this.addItem( + tLastID = 17, + "Robot Arm (ZPM)", + "Inserts into specific Slots (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.MOTUS, 2L), + getTcAspectStack("COGNITIO", 2L) })); + GregtechItemList.Robot_Arm_UV.set( + this.addItem( + tLastID = 18, + "Robot Arm (UV)", + "Inserts into specific Slots (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 4L), + getTcAspectStack("COGNITIO", 4L) })); + GregtechItemList.Robot_Arm_MAX.set( + this.addItem( + tLastID = 19, + "Robot Arm (MAX)", + "Inserts into specific Slots (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L), + getTcAspectStack("COGNITIO", 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Robot_Arm_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CCC", "MSM", "PES", Character.valueOf('S'), @@ -383,57 +408,61 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // OrePrefixes.cableGt01.get(Materials.Aluminium)}); GregTech_API.registerCover( GregtechItemList.Robot_Arm_LuV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[1][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), new GT_Cover_Arm(400)); GregTech_API.registerCover( GregtechItemList.Robot_Arm_ZPM.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[2][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), new GT_Cover_Arm(100)); GregTech_API.registerCover( GregtechItemList.Robot_Arm_UV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[3][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), new GT_Cover_Arm(20)); GregTech_API.registerCover( GregtechItemList.Robot_Arm_MAX.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], + new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), new GT_Cover_Arm(4)); tLastID = 20; GregtechItemList.Field_Generator_LuV.set( - this.addItem(tLastID = 20, "Field Generator (LuV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.TUTAMEN, 1L) - })); + this.addItem( + tLastID = 20, + "Field Generator (LuV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.TUTAMEN, 1L) })); GregtechItemList.Field_Generator_ZPM.set( - this.addItem(tLastID = 21, "Field Generator (ZPM)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.TUTAMEN, 2L) - })); + this.addItem( + tLastID = 21, + "Field Generator (ZPM)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), + getTcAspectStack(TC_Aspects.TUTAMEN, 2L) })); GregtechItemList.Field_Generator_UV.set( - this.addItem(tLastID = 22, "Field Generator (UV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.TUTAMEN, 4L) - })); + this.addItem( + tLastID = 22, + "Field Generator (UV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), + getTcAspectStack(TC_Aspects.TUTAMEN, 4L) })); GregtechItemList.Field_Generator_MAX.set( - this.addItem(tLastID = 23, "Field Generator (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 16L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.TUTAMEN, 8L) - })); + this.addItem( + tLastID = 23, + "Field Generator (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), + getTcAspectStack(TC_Aspects.TUTAMEN, 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Field_Generator_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WCW", "CGC", "WCW", Character.valueOf('G'), @@ -458,26 +487,34 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'), // OrePrefixes.wireGt08.get(Materials.Osmium)}); tLastID = 24; - GregtechItemList.Emitter_LuV.set(this.addItem(tLastID = 24, "Emitter (LuV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.LUX, 1L) - })); - GregtechItemList.Emitter_ZPM.set(this.addItem(tLastID = 25, "Emitter (ZPM)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.LUX, 2L) - })); - GregtechItemList.Emitter_UV.set(this.addItem(tLastID = 26, "Emitter (UV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.LUX, 4L) - })); - GregtechItemList.Emitter_MAX.set(this.addItem(tLastID = 27, "Emitter (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.LUX, 8L) - })); + GregtechItemList.Emitter_LuV.set( + this.addItem( + tLastID = 24, + "Emitter (LuV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) })); + GregtechItemList.Emitter_ZPM.set( + this.addItem( + tLastID = 25, + "Emitter (ZPM)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.LUX, 2L) })); + GregtechItemList.Emitter_UV.set( + this.addItem( + tLastID = 26, + "Emitter (UV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.LUX, 4L) })); + GregtechItemList.Emitter_MAX.set( + this.addItem( + tLastID = 27, + "Emitter (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Emitter_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SSC", "WQS", "CWS", Character.valueOf('Q'), @@ -505,26 +542,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // OrePrefixes.circuit.get(Materials.Elite), Character.valueOf('W'), // OrePrefixes.cableGt01.get(Materials.Aluminium)}); tLastID = 28; - GregtechItemList.Sensor_LuV.set(this.addItem(tLastID = 28, "Sensor (LuV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.SENSUS, 1L) - })); - GregtechItemList.Sensor_ZPM.set(this.addItem(tLastID = 29, "Sensor (ZPM)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.SENSUS, 2L) - })); - GregtechItemList.Sensor_UV.set(this.addItem(tLastID = 30, "Sensor (UV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 4L), - getTcAspectStack(TC_Aspects.MACHINA, 4L), - getTcAspectStack(TC_Aspects.SENSUS, 4L) - })); - GregtechItemList.Sensor_MAX.set(this.addItem(tLastID = 31, "Sensor (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.SENSUS, 8L) - })); + GregtechItemList.Sensor_LuV.set( + this.addItem( + tLastID = 28, + "Sensor (LuV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.SENSUS, 1L) })); + GregtechItemList.Sensor_ZPM.set( + this.addItem( + tLastID = 29, + "Sensor (ZPM)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), + getTcAspectStack(TC_Aspects.SENSUS, 2L) })); + GregtechItemList.Sensor_UV.set( + this.addItem( + tLastID = 30, + "Sensor (UV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L), + getTcAspectStack(TC_Aspects.MACHINA, 4L), + getTcAspectStack(TC_Aspects.SENSUS, 4L) })); + GregtechItemList.Sensor_MAX.set( + this.addItem( + tLastID = 31, + "Sensor (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), + getTcAspectStack(TC_Aspects.SENSUS, 8L) })); // GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_LuV.get(1L), // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'), @@ -562,96 +611,123 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { } // Extruder Shape - GregtechItemList.Shape_Extruder_WindmillShaft.set( - this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); + GregtechItemList.Shape_Extruder_WindmillShaft + .set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); // GTNH Already adds this. if (!CORE.GTNH) { - GregtechItemList.Shape_Extruder_SmallGear.set( - this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears")); + GregtechItemList.Shape_Extruder_SmallGear + .set(this.addItem(221, "Extruder Shape (Small Gear)", "Extruder Shape for making small gears")); } // Batteries GregtechItemList.Battery_RE_EV_Sodium.set( - this.addItem(tLastID = 50, "Quad Cell Sodium Battery", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L) - })); + this.addItem( + tLastID = 50, + "Quad Cell Sodium Battery", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L) })); this.setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true); GregtechItemList.Battery_RE_EV_Cadmium.set( - this.addItem(tLastID = 52, "Quad Cell Cadmium Battery", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.METALLUM, 1L), - getTcAspectStack(TC_Aspects.POTENTIA, 1L) - })); + this.addItem( + tLastID = 52, + "Quad Cell Cadmium Battery", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.METALLUM, 1L), + getTcAspectStack(TC_Aspects.POTENTIA, 1L) })); this.setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true); GregtechItemList.Battery_RE_EV_Lithium.set( - this.addItem(tLastID = 54, "Quad Cell Lithium Battery", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 3L), - getTcAspectStack(TC_Aspects.METALLUM, 3L), - getTcAspectStack(TC_Aspects.POTENTIA, 3L) - })); + this.addItem( + tLastID = 54, + "Quad Cell Lithium Battery", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 3L), + getTcAspectStack(TC_Aspects.METALLUM, 3L), + getTcAspectStack(TC_Aspects.POTENTIA, 3L) })); this.setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true); /** * Power Gems */ - GregtechItemList.Battery_Gem_1.set(this.addItem(tLastID = 66, "Proton Cell", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 24L), - getTcAspectStack(TC_Aspects.POTENTIA, 16L) - })); + GregtechItemList.Battery_Gem_1.set( + this.addItem( + tLastID = 66, + "Proton Cell", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.METALLUM, 24L), + getTcAspectStack(TC_Aspects.POTENTIA, 16L) })); this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false); - GregtechItemList.Battery_Gem_2.set(this.addItem(tLastID = 68, "Electron Cell", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 16L), - getTcAspectStack(TC_Aspects.METALLUM, 32L), - getTcAspectStack(TC_Aspects.POTENTIA, 32L) - })); + GregtechItemList.Battery_Gem_2.set( + this.addItem( + tLastID = 68, + "Electron Cell", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L), + getTcAspectStack(TC_Aspects.METALLUM, 32L), + getTcAspectStack(TC_Aspects.POTENTIA, 32L) })); this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false); - GregtechItemList.Battery_Gem_3.set(this.addItem(tLastID = 70, "Quark Entanglement", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 32L), - getTcAspectStack(TC_Aspects.METALLUM, 48L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L) - })); + GregtechItemList.Battery_Gem_3.set( + this.addItem( + tLastID = 70, + "Quark Entanglement", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 32L), + getTcAspectStack(TC_Aspects.METALLUM, 48L), + getTcAspectStack(TC_Aspects.POTENTIA, 64L) })); this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false); // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic"); // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood"); // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced"); - /*GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); - setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true); - - GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); - setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);*/ + /* + * GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new + * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), + * getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, + * -3L, true); GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", + * "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, + * 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, + * GT_Values.V[2], 4L, -3L, true); + */ // RTG Pellet GregtechItemList.Pellet_RTG_PU238.set( - this.addItem(41, StringUtils.superscript("238") + "Pu Pellet", "", new Object[] { - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) - })); + this.addItem( + 41, + StringUtils.superscript("238") + "Pu Pellet", + "", + new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L) })); GregtechItemList.Pellet_RTG_SR90.set( - this.addItem(42, StringUtils.superscript("90") + "Sr Pellet", "", new Object[] { - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) - })); + this.addItem( + 42, + StringUtils.superscript("90") + "Sr Pellet", + "", + new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L) })); GregtechItemList.Pellet_RTG_PO210.set( - this.addItem(43, StringUtils.superscript("210") + "Po Pellet", "", new Object[] { - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) - })); + this.addItem( + 43, + StringUtils.superscript("210") + "Po Pellet", + "", + new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L) })); GregtechItemList.Pellet_RTG_AM241.set( - this.addItem(44, StringUtils.superscript("241") + "Am Pellet", "", new Object[] { - getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) - })); + this.addItem( + 44, + StringUtils.superscript("241") + "Am Pellet", + "", + new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L) })); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32); @@ -661,193 +737,207 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // Computer Cube GregtechItemList.Gregtech_Computer_Cube.set( - this.addItem(tLastID = 55, "Gregtech Computer Cube", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) - })); + this.addItem( + tLastID = 55, + "Gregtech Computer Cube", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.METALLUM, 8L), + getTcAspectStack(TC_Aspects.POTENTIA, 8L) })); this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true); // FOOOOOOOOOOOOOOD GregtechItemList.Food_Baked_Raisin_Bread.set( - this.addItem(tLastID = 60, "Raisin Bread", "Extra Raisins, Just for ImQ009", new Object[] { - new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), - getTcAspectStack(TC_Aspects.CORPUS, 1L), - getTcAspectStack(TC_Aspects.FAMES, 1L), - getTcAspectStack(TC_Aspects.IGNIS, 1L) - })); + this.addItem( + tLastID = 60, + "Raisin Bread", + "Extra Raisins, Just for ImQ009", + new Object[] { new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), + getTcAspectStack(TC_Aspects.CORPUS, 1L), getTcAspectStack(TC_Aspects.FAMES, 1L), + getTcAspectStack(TC_Aspects.IGNIS, 1L) })); if (!CORE.GTNH) { - GregtechItemList.Fluid_Cell_144L.set(this.addItem( - tLastID = 61, "144L Invar Fluid Cell", "Holds exactly one dust worth of liquid.", new Object[] { - new ItemData( - Materials.Invar, - (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), - new MaterialStack[0]), - getTcAspectStack(TC_Aspects.VACUOS, 2L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + GregtechItemList.Fluid_Cell_144L.set( + this.addItem( + tLastID = 61, + "144L Invar Fluid Cell", + "Holds exactly one dust worth of liquid.", + new Object[] { + new ItemData( + Materials.Invar, + (OrePrefixes.plate.mMaterialAmount * 8L) + + (4L * OrePrefixes.ring.mMaterialAmount), + new MaterialStack[0]), + getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) })); this.setFluidContainerStats(32000 + tLastID, 144L, 64L); - GregtechItemList.Fluid_Cell_36L.set(this.addItem( - tLastID = 62, - "36L Brass Fluid Cell", - "Holds exactly one small dust worth of liquid.", - new Object[] { - new ItemData( - Materials.Brass, - (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), - new MaterialStack[0]), - getTcAspectStack(TC_Aspects.VACUOS, 2L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + GregtechItemList.Fluid_Cell_36L.set( + this.addItem( + tLastID = 62, + "36L Brass Fluid Cell", + "Holds exactly one small dust worth of liquid.", + new Object[] { + new ItemData( + Materials.Brass, + (OrePrefixes.plate.mMaterialAmount * 8L) + + (4L * OrePrefixes.ring.mMaterialAmount), + new MaterialStack[0]), + getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) })); this.setFluidContainerStats(32000 + tLastID, 36L, 64L); - GregtechItemList.Fluid_Cell_16L.set(this.addItem( - tLastID = 63, - "16L Bronze Fluid Cell", - "Holds exactly one tiny dust / nugget worth of liquid.", - new Object[] { - new ItemData( - Materials.Bronze, - (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), - new MaterialStack[0]), - getTcAspectStack(TC_Aspects.VACUOS, 2L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + GregtechItemList.Fluid_Cell_16L.set( + this.addItem( + tLastID = 63, + "16L Bronze Fluid Cell", + "Holds exactly one tiny dust / nugget worth of liquid.", + new Object[] { + new ItemData( + Materials.Bronze, + (OrePrefixes.plate.mMaterialAmount * 8L) + + (4L * OrePrefixes.ring.mMaterialAmount), + new MaterialStack[0]), + getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) })); this.setFluidContainerStats(32000 + tLastID, 16L, 64L); - GregtechItemList.Fluid_Cell_1L.set(this.addItem( - tLastID = 64, - "1L Wrought Iron Fluid Cell", - "Holds exactly one litre worth of liquid.", - new Object[] { - new ItemData( - Materials.WroughtIron, - (OrePrefixes.plate.mMaterialAmount * 8L) + (4L * OrePrefixes.ring.mMaterialAmount), - new MaterialStack[0]), - getTcAspectStack(TC_Aspects.VACUOS, 2L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + GregtechItemList.Fluid_Cell_1L.set( + this.addItem( + tLastID = 64, + "1L Wrought Iron Fluid Cell", + "Holds exactly one litre worth of liquid.", + new Object[] { + new ItemData( + Materials.WroughtIron, + (OrePrefixes.plate.mMaterialAmount * 8L) + + (4L * OrePrefixes.ring.mMaterialAmount), + new MaterialStack[0]), + getTcAspectStack(TC_Aspects.VACUOS, 2L), getTcAspectStack(TC_Aspects.AQUA, 1L) })); this.setFluidContainerStats(32000 + tLastID, 1L, 64L); } GregtechItemList.Cover_Overflow_ULV.set( - this.addItem(71, "Overflow Valve (ULV)", "Maximum void amount: 8000", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + 71, + "Overflow Valve (ULV)", + "Maximum void amount: 8000", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L) })); GregtechItemList.Cover_Overflow_LV.set( - this.addItem(72, "Overflow Valve (LV)", "Maximum void amount: 64000", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + 72, + "Overflow Valve (LV)", + "Maximum void amount: 64000", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L