diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/items')
8 files changed, 1036 insertions, 881 deletions
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), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L) })); GregtechItemList.Cover_Overflow_MV.set( - this.addItem(73, "Overflow Valve (MV)", "Maximum void amount: 512000", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + 73, + "Overflow Valve (MV)", + "Maximum void amount: 512000", + 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_HV.set( - this.addItem(74, "Overflow Valve (HV)", "Maximum void amount: 4096000", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + 74, + "Overflow Valve (HV)", + "Maximum void amount: 4096000", + 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_EV.set( - this.addItem(75, "Overflow Valve (EV)", "Maximum void amount: 32768000", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + 75, + "Overflow Valve (EV)", + "Maximum void amount: 32768000", + 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_IV.set( - this.addItem(76, "Overflow Valve (IV)", "Maximum void amount: 262144000", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) - })); + this.addItem( + 76, + "Overflow Valve (IV)", + "Maximum void amount: 262144000", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L) })); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_ULV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), new GTPP_Cover_Overflow(8)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_LV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), new GTPP_Cover_Overflow(64)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_MV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), new GTPP_Cover_Overflow(512)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_HV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), new GTPP_Cover_Overflow(4096)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_EV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), new GTPP_Cover_Overflow(32768)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_IV.get(1L), - new GT_MultiTexture(new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) - }), + new GT_MultiTexture( + new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), new GTPP_Cover_Overflow(262144)); // Fusion Reactor MK4 Singularity - GregtechItemList.Compressed_Fusion_Reactor.set(this.addItem( - 100, "Hypervisor Matrix (Fusion)", "A memory unit containing an RI (Restricted Intelligence)")); + GregtechItemList.Compressed_Fusion_Reactor.set( + this.addItem( + 100, + "Hypervisor Matrix (Fusion)", + "A memory unit containing an RI (Restricted Intelligence)")); // NanoTubes - GregtechItemList.NanoTube_Base_Substrate.set( - this.addItem(101, "Silicon Base Substrate", "Used in the production of Carbon Nanotubes")); + GregtechItemList.NanoTube_Base_Substrate + .set(this.addItem(101, "Silicon Base Substrate", "Used in the production of Carbon Nanotubes")); GregtechItemList.NanoTube_Finished.set( this.addItem(102, "Carbon Nanotubes", "Multi-walled Zigzag nanotubes, possibly Carbon's final form")); - GregtechItemList.Carbyne_Tube_Finished.set(this.addItem( - 103, - "Linear Acetylenic Carbon (LAC/Carbyne)", - "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable")); - GregtechItemList.Carbyne_Sheet_Finished.set(this.addItem( - 104, - "Carbyne Composite Panel", - "Nanotubes which contain LAC, arranged side by side and compressed further")); - GregtechItemList.Laser_Lens_Special.set( - this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers")); + GregtechItemList.Carbyne_Tube_Finished.set( + this.addItem( + 103, + "Linear Acetylenic Carbon (LAC/Carbyne)", + "LAC chains grown inside Multi-walled Carbon Nanotubes, highly stable")); + GregtechItemList.Carbyne_Sheet_Finished.set( + this.addItem( + 104, + "Carbyne Composite Panel", + "Nanotubes which contain LAC, arranged side by side and compressed further")); + GregtechItemList.Laser_Lens_Special + .set(this.addItem(105, "Quantum Anomaly", "Probably should shoot it with lasers")); GregtechItemList.Battery_Casing_Gem_1.set(this.addItem(106, "Containment Unit I", "Used in crafting")); GregtechItemList.Battery_Casing_Gem_2.set(this.addItem(107, "Containment Unit II", "Used in crafting")); GregtechItemList.Battery_Casing_Gem_3.set(this.addItem(108, "Advanced Containment Unit", "Used in crafting")); GregtechItemList.Battery_Casing_Gem_4.set(this.addItem(109, "Exotic Containment Unit", "Used in crafting")); - GregtechItemList.Battery_Gem_4.set(this.addItem(tLastID = 110, "Graviton Anomaly", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 64L), - getTcAspectStack(TC_Aspects.METALLUM, 64L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L) - })); + GregtechItemList.Battery_Gem_4.set( + this.addItem( + tLastID = 110, + "Graviton Anomaly", + "Reusable", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 64L), + getTcAspectStack(TC_Aspects.METALLUM, 64L), + getTcAspectStack(TC_Aspects.POTENTIA, 64L) })); this.setElectricStats(32000 + tLastID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false); /* @@ -855,8 +945,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { */ GregtechItemList.Bomb_Cast.set(this.addItem(111, "Bomb Cast", "Used in the production of Bombs")); GregtechItemList.Bomb_Cast_Molten.set(this.addItem(112, "Bomb Cast (Hot)", "Consider cooling this off")); - GregtechItemList.Bomb_Cast_Set.set( - this.addItem(113, "Bomb Cast (Set)", "Break it open for the goodies inside!")); + GregtechItemList.Bomb_Cast_Set + .set(this.addItem(113, "Bomb Cast (Set)", "Break it open for the goodies inside!")); GregtechItemList.Bomb_Cast_Broken.set(this.addItem(114, "Bomb Cast (Broken)", "This is probably just junk")); GregtechItemList.Bomb_Cast_Mold.set(this.addItem(115, "Mold (Bomb Cast)", "Used in the production of Bombs")); @@ -864,255 +954,311 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { * High Tier 'Saws' for the tree Farm */ GregtechItemList.Farm_Processor_EV.set( - this.addItem(tLastID = 120, "Farm Processor [EV]", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) - })); + this.addItem( + tLastID = 120, + "Farm Processor [EV]", + "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[5] * 10 * 60 * 20, GT_Values.V[4], 4L, -3L, false); GregtechItemList.Farm_Processor_IV.set( - this.addItem(tLastID = 122, "Farm Processor [IV]", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) - })); + this.addItem( + tLastID = 122, + "Farm Processor [IV]", + "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, false); GregtechItemList.Farm_Processor_LuV.set( - this.addItem(tLastID = 124, "Farm Processor [LuV]", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) - })); + this.addItem( + tLastID = 124, + "Farm Processor [LuV]", + "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[7] * 10 * 60 * 20, GT_Values.V[6], 6L, -3L, false); GregtechItemList.Farm_Processor_ZPM.set( - this.addItem(tLastID = 126, "Farm Processor [ZPM]", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) - })); + this.addItem( + tLastID = 126, + "Farm Processor [ZPM]", + "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[8] * 10 * 60 * 20, GT_Values.V[7], 7L, -3L, false); GregtechItemList.Farm_Processor_UV.set( - this.addItem(tLastID = 128, "Farm Processor [UV]", "Reusable", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) - })); + this.addItem( + tLastID = 128, + "Farm Processor [UV]", + "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[9] * 10 * 60 * 20, GT_Values.V[8], 8L, -3L, false); String aTierName; int aFirstMachineCasingID = 130; - GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { - GregtechItemList.FakeMachineCasingPlate_ULV, - GregtechItemList.FakeMachineCasingPlate_LV, - GregtechItemList.FakeMachineCasingPlate_MV, - GregtechItemList.FakeMachineCasingPlate_HV, - GregtechItemList.FakeMachineCasingPlate_EV, - GregtechItemList.FakeMachineCasingPlate_IV, - GregtechItemList.FakeMachineCasingPlate_LuV, - GregtechItemList.FakeMachineCasingPlate_ZPM, - GregtechItemList.FakeMachineCasingPlate_UV, - GregtechItemList.FakeMachineCasingPlate_MAX, - }; + GregtechItemList[] mMachineCasingCovers = new GregtechItemList[] { GregtechItemList.FakeMachineCasingPlate_ULV, + GregtechItemList.FakeMachineCasingPlate_LV, GregtechItemList.FakeMachineCasingPlate_MV, + GregtechItemList.FakeMachineCasingPlate_HV, GregtechItemList.FakeMachineCasingPlate_EV, + GregtechItemList.FakeMachineCasingPlate_IV, GregtechItemList.FakeMachineCasingPlate_LuV, + GregtechItemList.FakeMachineCasingPlate_ZPM, GregtechItemList.FakeMachineCasingPlate_UV, + GregtechItemList.FakeMachineCasingPlate_MAX, }; for (int i = 0; i < 10; i++) { if (i == 10) { break; } else { aTierName = GT_Values.VN[i]; - mMachineCasingCovers[i].set(this.addItem( - aFirstMachineCasingID++, - aTierName + " Machine Plate Cover", - "Deprecated - Shapeless Craft to new version", - new Object[] {})); + mMachineCasingCovers[i].set( + this.addItem( + aFirstMachineCasingID++, + aTierName + " Machine Plate Cover", + "Deprecated - Shapeless Craft to new version", + new Object[] {})); GregTech_API.registerCover( mMachineCasingCovers[i].get(1L), - new GT_MultiTexture(new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[i][0]}), + new GT_MultiTexture(new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[i][0] }), new GTPP_Cover_ToggleVisual()); } } - GregtechItemList.Laser_Lens_WoodsGlass.set(this.addItem( - 140, "Wood's Glass Lens", "Allows UV & IF to pass through, blocks visible light spectrums")); + GregtechItemList.Laser_Lens_WoodsGlass.set( + this.addItem( + 140, + "Wood's Glass Lens", + "Allows UV & IF to pass through, blocks visible light spectrums")); int aStartID = 141; - GregtechItemList[] aTransParts = new GregtechItemList[] { - GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, - GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, - GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, - GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, - GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, - }; + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, + GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, + GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, + GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, + GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, + GregtechItemList.TransmissionComponent_MAX, }; for (int aIndex = 0; aIndex < 10; aIndex++) { aTransParts[aIndex].set( - this.addItem(aStartID++, "Transmission Component (" + GT_Values.VN[aIndex] + ")", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, aIndex), - getTcAspectStack(TC_Aspects.MACHINA, aIndex), - getTcAspectStack(TC_Aspects.MAGNETO, aIndex) - })); + this.addItem( + aStartID++, + "Transmission Component (" + GT_Values.VN[aIndex] + ")", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, aIndex), + getTcAspectStack(TC_Aspects.MACHINA, aIndex), + getTcAspectStack(TC_Aspects.MAGNETO, aIndex) })); } // Distillus Chip - GregtechItemList.Distillus_Upgrade_Chip.set( - this.addItem(151, "Upgrade Chip", "Used to upgrade Distillus to Tier 2")); + GregtechItemList.Distillus_Upgrade_Chip + .set(this.addItem(151, "Upgrade Chip", "Used to upgrade Distillus to Tier 2")); - GregtechItemList.Chip_MultiNerf_NoOutputBonus.set( - this.addItem(160, "No-Bonus Chip", "You won't like using this")); - GregtechItemList.Chip_MultiNerf_NoSpeedBonus.set( - this.addItem(161, "No-Bonus Chip", "You won't like using this")); + GregtechItemList.Chip_MultiNerf_NoOutputBonus + .set(this.addItem(160, "No-Bonus Chip", "You won't like using this")); + GregtechItemList.Chip_MultiNerf_NoSpeedBonus + .set(this.addItem(161, "No-Bonus Chip", "You won't like using this")); GregtechItemList.Chip_MultiNerf_NoEuBonus.set(this.addItem(162, "No-Bonus Chip", "You won't like using this")); /* - GregtechItemList.Cover_Overflow_Item_ULV.set(this.addItem(165, "Item 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_Item_LV.set(this.addItem(166, "Item 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)})); - GregtechItemList.Cover_Overflow_Item_MV.set(this.addItem(167, "Item Overflow Valve (MV)", "Maximum void amount: 512000", 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_Item_HV.set(this.addItem(168, "Item Overflow Valve (HV)", "Maximum void amount: 4096000", 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_Item_EV.set(this.addItem(169, "Item Overflow Valve (EV)", "Maximum void amount: 32768000", 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_Item_IV.set(this.addItem(170, "Item Overflow Valve (IV)", "Maximum void amount: 262144000", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); - - GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8)); - GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64)); - GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512)); - GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096)); - GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768)); - GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144)); - */ + * GregtechItemList.Cover_Overflow_Item_ULV.set(this.addItem(165, "Item 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_Item_LV.set(this.addItem(166, + * "Item 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)})); GregtechItemList.Cover_Overflow_Item_MV.set(this.addItem(167, + * "Item Overflow Valve (MV)", "Maximum void amount: 512000", 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_Item_HV.set(this.addItem(168, + * "Item Overflow Valve (HV)", "Maximum void amount: 4096000", 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_Item_EV.set(this.addItem(169, "Item Overflow Valve (EV)", + * "Maximum void amount: 32768000", 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_Item_IV.set(this.addItem(170, + * "Item Overflow Valve (IV)", "Maximum void amount: 262144000", new + * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L), + * getTcAspectStack(TC_Aspects.ITER, 1L), getTcAspectStack(TC_Aspects.AQUA, 1L)})); + * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_ULV.get(1L), new GT_MultiTexture(new + * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new + * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(8)); + * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_LV.get(1L), new GT_MultiTexture(new + * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[4][0], new + * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(64)); + * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_MV.get(1L), new GT_MultiTexture(new + * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new + * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(512)); + * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_HV.get(1L), new GT_MultiTexture(new + * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[5][0], new + * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(4096)); + * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_EV.get(1L), new GT_MultiTexture(new + * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new + * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(32768)); + * GregTech_API.registerCover(GregtechItemList.Cover_Overflow_Item_IV.get(1L), new GT_MultiTexture(new + * ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[8][0], new + * GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)}), new GTPP_Cover_Overflow_Item(262144)); + */ } private boolean registerComponents_ULV() { GregtechItemList.Electric_Pump_ULV.set( - this.addItem(32, "Electric Pump (ULV)", "160 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_Motor_ULV.set(this.addItem(33, "Electric Motor (ULV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.MOTUS, 1L) - })); + this.addItem( + 32, + "Electric Pump (ULV)", + "160 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_Motor_ULV.set( + this.addItem( + 33, + "Electric Motor (ULV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.MOTUS, 1L) })); GregtechItemList.Conveyor_Module_ULV.set( - this.addItem(34, "Conveyor Module (ULV)", "1 Stack every 80 secs (as Cover)", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.ITER, 1L) - })); - GregtechItemList.Electric_Piston_ULV.set(this.addItem(35, "Electric Piston (ULV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), - getTcAspectStack(TC_Aspects.MOTUS, 1L) - })); + this.addItem( + 34, + "Conveyor Module (ULV)", + "1 Stack every 80 secs (as Cover)", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) })); + GregtechItemList.Electric_Piston_ULV.set( + this.addItem( + 35, + "Electric Piston (ULV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L) })); GregtechItemList.Robot_Arm_ULV.set( - this.addItem(36, "Robot Arm (ULV)", "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.Field_Generator_ULV.set(this.addItem(37, "Field Generator (ULV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.TUTAMEN, 1L) - })); - GregtechItemList.Emitter_ULV.set(this.addItem(38, "Emitter (ULV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.LUX, 1L) - })); - GregtechItemList.Sensor_ULV.set(this.addItem(39, "Sensor (ULV)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), - getTcAspectStack(TC_Aspects.SENSUS, 1L) - })); + this.addItem( + 36, + "Robot Arm (ULV)", + "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.Field_Generator_ULV.set( + this.addItem( + 37, + "Field Generator (ULV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.TUTAMEN, 1L) })); + GregtechItemList.Emitter_ULV.set( + this.addItem( + 38, + "Emitter (ULV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) })); + GregtechItemList.Sensor_ULV.set( + this.addItem( + 39, + "Sensor (ULV)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.SENSUS, 1L) })); GregTech_API.registerCover( GregtechItemList.Electric_Pump_ULV.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(8)); GregTech_API.registerCover( GregtechItemList.Conveyor_Module_ULV.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(1600)); GregTech_API.registerCover( GregtechItemList.Robot_Arm_ULV.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(1600)); return true; } private boolean registerComponents_MAX() { - GregtechItemList.Electric_Pump_MAX.set(this.addItem(3, "Electric Pump (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.ITER, 8L), - getTcAspectStack(TC_Aspects.AQUA, 8L) - })); - GregtechItemList.Electric_Motor_MAX.set(this.addItem(7, "Electric Motor (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.MOTUS, 8L) - })); - GregtechItemList.Conveyor_Module_MAX.set(this.addItem(11, "Conveyor Module (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.ITER, 8L) - })); - GregtechItemList.Electric_Piston_MAX.set(this.addItem(15, "Electric Piston (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 16L), - getTcAspectStack(TC_Aspects.MOTUS, 8L) - })); - GregtechItemList.Robot_Arm_MAX.set(this.addItem(19, "Robot Arm (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 16L), - getTcAspectStack(TC_Aspects.MOTUS, 8L), - getTcAspectStack("COGNITIO", 8L) - })); - GregtechItemList.Field_Generator_MAX.set(this.addItem(23, "Field Generator (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 16L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.TUTAMEN, 8L) - })); - GregtechItemList.Emitter_MAX.set(this.addItem(27, "Emitter (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.LUX, 8L) - })); - GregtechItemList.Sensor_MAX.set(this.addItem(31, "Sensor (MAX)", "", new Object[] { - getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.MACHINA, 8L), - getTcAspectStack(TC_Aspects.SENSUS, 8L) - })); + GregtechItemList.Electric_Pump_MAX.set( + this.addItem( + 3, + "Electric Pump (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L), + getTcAspectStack(TC_Aspects.AQUA, 8L) })); + GregtechItemList.Electric_Motor_MAX.set( + this.addItem( + 7, + "Electric Motor (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.MOTUS, 8L) })); + GregtechItemList.Conveyor_Module_MAX.set( + this.addItem( + 11, + "Conveyor Module (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) })); + GregtechItemList.Electric_Piston_MAX.set( + this.addItem( + 15, + "Electric Piston (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L) })); + GregtechItemList.Robot_Arm_MAX.set( + this.addItem( + 19, + "Robot Arm (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 16L), getTcAspectStack(TC_Aspects.MOTUS, 8L), + getTcAspectStack("COGNITIO", 8L) })); + GregtechItemList.Field_Generator_MAX.set( + this.addItem( + 23, + "Field Generator (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.TUTAMEN, 8L) })); + GregtechItemList.Emitter_MAX.set( + this.addItem( + 27, + "Emitter (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.LUX, 8L) })); + GregtechItemList.Sensor_MAX.set( + this.addItem( + 31, + "Sensor (MAX)", + "", + new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.SENSUS, 8L) })); 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)); 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)); 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)); return true; @@ -1122,69 +1268,93 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { // Enable Old Circuits Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage."); - GregtechItemList.Old_Circuit_Primitive.set(this.addItem( - 200, "NAND Chip", "A very simple Circuit", new Object[] {OrePrefixes.circuit.get(Materials.Primitive) - })); + GregtechItemList.Old_Circuit_Primitive.set( + this.addItem( + 200, + "NAND Chip", + "A very simple Circuit", + new Object[] { OrePrefixes.circuit.get(Materials.Primitive) })); GregtechItemList.Old_Circuit_Basic.set( - this.addItem(201, "Basic Electronic Circuit", "A basic Circuit", new Object[] { - OrePrefixes.circuit.get(Materials.Basic) - })); - GregtechItemList.Old_Circuit_Good.set(this.addItem( - 202, "Good Electronic Circuit", "A good Circuit", new Object[] {OrePrefixes.circuit.get(Materials.Good) - })); + this.addItem( + 201, + "Basic Electronic Circuit", + "A basic Circuit", + new Object[] { OrePrefixes.circuit.get(Materials.Basic) })); + GregtechItemList.Old_Circuit_Good.set( + this.addItem( + 202, + "Good Electronic Circuit", + "A good Circuit", + new Object[] { OrePrefixes.circuit.get(Materials.Good) })); GregtechItemList.Old_Circuit_Advanced.set( - this.addItem(203, "Advanced Circuit", "An advanced Circuit", new Object[] { - OrePrefixes.circuit.get(Materials.Advanced) - })); + this.addItem( + 203, + "Advanced Circuit", + "An advanced Circuit", + new Object[] { OrePrefixes.circuit.get(Materials.Advanced) })); GregtechItemList.Old_Circuit_Data.set( - this.addItem(204, "Data Storage Circuit", "A Data Storage Chip", new Object[] { - OrePrefixes.circuit.get(Materials.Data) - })); - GregtechItemList.Old_Circuit_Elite.set(this.addItem( - 205, "Data Control Circuit", "A Processor", new Object[] {OrePrefixes.circuit.get(Materials.Elite)})); + this.addItem( + 204, + "Data Storage Circuit", + "A Data Storage Chip", + new Object[] { OrePrefixes.circuit.get(Materials.Data) })); + GregtechItemList.Old_Circuit_Elite.set( + this.addItem( + 205, + "Data Control Circuit", + "A Processor", + new Object[] { OrePrefixes.circuit.get(Materials.Elite) })); GregtechItemList.Old_Circuit_Master.set( - this.addItem(206, "Energy Flow Circuit", "A High Voltage Processor", new Object[] { - OrePrefixes.circuit.get(Materials.Master) - })); + this.addItem( + 206, + "Energy Flow Circuit", + "A High Voltage Processor", + new Object[] { OrePrefixes.circuit.get(Materials.Master) })); GregtechItemList.Old_Tool_DataOrb.set( - this.addItem(207, "Data Orb [GT++]", "A High Capacity Data Storage", new Object[] { - OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb() - })); + this.addItem( + 207, + "Data Orb [GT++]", + "A High Capacity Data Storage", + new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, + new Behaviour_DataOrb() })); GregtechItemList.Old_Circuit_Ultimate.set(GregtechItemList.Old_Tool_DataOrb.get(1L)); GT_ModHandler.addShapelessCraftingRecipe( GregtechItemList.Old_Tool_DataOrb.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {GregtechItemList.Old_Tool_DataOrb.get(1L)}); + new Object[] { GregtechItemList.Old_Tool_DataOrb.get(1L) }); GregtechItemList.Old_Tool_DataStick.set( - this.addItem(208, "Data Stick [GT++]", "A Low Capacity Data Storage", new Object[] { - OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick() - })); + this.addItem( + 208, + "Data Stick [GT++]", + "A Low Capacity Data Storage", + new Object[] { OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, + new Behaviour_DataStick() })); GT_ModHandler.addShapelessCraftingRecipe( GregtechItemList.Old_Tool_DataStick.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] {GregtechItemList.Old_Tool_DataStick.get(1L)}); + new Object[] { GregtechItemList.Old_Tool_DataStick.get(1L) }); GregtechItemList.Old_Circuit_Board_Basic.set(this.addItem(210, "Basic Circuit Board", "A basic Board")); - GregtechItemList.Old_Circuit_Board_Advanced.set( - this.addItem(211, "Advanced Circuit Board", "An advanced Board")); + GregtechItemList.Old_Circuit_Board_Advanced + .set(this.addItem(211, "Advanced Circuit Board", "An advanced Board")); GregtechItemList.Old_Circuit_Board_Elite.set(this.addItem(212, "Processor Board", "A Processor Board")); - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.set( - this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits")); - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.set( - this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits")); - GregtechItemList.Old_Circuit_Parts_Advanced.set( - this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts")); - GregtechItemList.Old_Circuit_Parts_Wiring_Basic.set( - this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.set( - this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Circuit_Parts_Wiring_Elite.set( - this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards")); + GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite + .set(this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits")); + GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master + .set(this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits")); + GregtechItemList.Old_Circuit_Parts_Advanced + .set(this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts")); + GregtechItemList.Old_Circuit_Parts_Wiring_Basic + .set(this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards")); + GregtechItemList.Old_Circuit_Parts_Wiring_Advanced + .set(this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards")); + GregtechItemList.Old_Circuit_Parts_Wiring_Elite + .set(this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards")); GregtechItemList.Old_Empty_Board_Basic.set(this.addItem(219, "Empty Circuit Board", "A Board Part")); - GregtechItemList.Old_Empty_Board_Elite.set( - this.addItem(220, "Empty Processor Board", "A Processor Board Part")); + GregtechItemList.Old_Empty_Board_Elite + .set(this.addItem(220, "Empty Processor Board", "A Processor Board Part")); return true; } @@ -1192,39 +1362,45 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { public boolean registerCustomCircuits() { if (CORE.ConfigSwitches.enableCustomCircuits) { GregtechItemList.Circuit_IV.set( - this.addItem(704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", new Object[] { - GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic) - })); + this.addItem( + 704, + "Symbiotic Circuit (IV)", + "A Symbiotic Data Processor", + new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic) })); GregtechItemList.Circuit_LuV.set( - this.addItem(705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", new Object[] { - GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic) - })); + this.addItem( + 705, + "Neutronic Circuit (LuV)", + "A Neutron Particle Processor", + new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic) })); GregtechItemList.Circuit_ZPM.set( - this.addItem(706, "Quantum Circuit (ZPM)", "A Singlularity Processor", new Object[] { - GregtechOrePrefixes.circuit.get(GT_Materials.Quantum) - })); - GregtechItemList.Circuit_Board_IV.set( - this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board")); - GregtechItemList.Circuit_Board_LuV.set( - this.addItem(711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board")); - GregtechItemList.Circuit_Board_ZPM.set( - this.addItem(712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board")); - GregtechItemList.Circuit_Parts_Crystal_Chip_IV.set( - this.addItem(713, "(IV) Energized Crystal Chip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_Crystal_Chip_LuV.set( - this.addItem(714, "(LuV) Neutron based Microchip", "Needed for Circuits")); - GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM.set( - this.addItem(715, "(ZPM) Quantum Chip", "Needed for Circuits")); + this.addItem( + 706, + "Quantum Circuit (ZPM)", + "A Singlularity Processor", + new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Quantum) })); + GregtechItemList.Circuit_Board_IV + .set(this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board")); + GregtechItemList.Circuit_Board_LuV + .set(this.addItem(711, "LuV Circuit Board", "An LuV Voltage Rated Circuit Board")); + GregtechItemList.Circuit_Board_ZPM + .set(this.addItem(712, "ZPM Processor Board", "A ZPM Voltage Rated Processor Board")); + GregtechItemList.Circuit_Parts_Crystal_Chip_IV + .set(this.addItem(713, "(IV) Energized Crystal Chip", "Needed for Circuits")); + GregtechItemList.Circuit_Parts_Crystal_Chip_LuV + .set(this.addItem(714, "(LuV) Neutron based Microchip", "Needed for Circuits")); + GregtechItemList.Circuit_Parts_Crystal_Chip_ZPM + .set(this.addItem(715, "(ZPM) Quantum Chip", "Needed for Circuits")); GregtechItemList.Circuit_Parts_IV.set(this.addItem(716, "(IV) Energized Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_LuV.set( - this.addItem(717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts")); + GregtechItemList.Circuit_Parts_LuV + .set(this.addItem(717, "(LuV) Neutron-based Circuit Parts", "Circuit Parts")); GregtechItemList.Circuit_Parts_ZPM.set(this.addItem(718, "(ZPM) Quantum Circuit Parts", "Circuit Parts")); - GregtechItemList.Circuit_Parts_Wiring_IV.set( - this.addItem(719, "Etched IV Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Circuit_Parts_Wiring_LuV.set( - this.addItem(720, "Etched LuV Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Circuit_Parts_Wiring_ZPM.set( - this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards")); + GregtechItemList.Circuit_Parts_Wiring_IV + .set(this.addItem(719, "Etched IV Voltage Wiring", "Part of Circuit Boards")); + GregtechItemList.Circuit_Parts_Wiring_LuV + .set(this.addItem(720, "Etched LuV Voltage Wiring", "Part of Circuit Boards")); + GregtechItemList.Circuit_Parts_Wiring_ZPM + .set(this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards")); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor"); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite"); return true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java index 0e937a9485..e59c71c5bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.items; +import java.lang.reflect.Field; + import gregtech.api.GregTech_API; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.ToolDictNames; @@ -13,7 +15,6 @@ import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips; -import java.lang.reflect.Field; public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { @@ -41,14 +42,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Skookum Choocher", "Can Really Chooch. Does a Skookum job at Hammering and Wrenching stuff.", new TOOL_Gregtech_Choocher(), - new Object[] { - GregtechToolDictNames.craftingToolSkookumChoocher, - ToolDictNames.craftingToolHardHammer, - ToolDictNames.craftingToolWrench, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) - }), + new Object[] { GregtechToolDictNames.craftingToolSkookumChoocher, + ToolDictNames.craftingToolHardHammer, ToolDictNames.craftingToolWrench, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }), GregTech_API.sWrenchList); // Electric File @@ -57,13 +55,10 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Angle Grinder", "Hand-held electric filing device", new TOOL_Gregtech_AngleGrinder(), - new Object[] { - GregtechToolDictNames.craftingToolAngleGrinder, - ToolDictNames.craftingToolFile, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) - }); + new Object[] { GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); GT_HashSet<GT_ItemStack> aWireCutterList = new GT_HashSet<GT_ItemStack>(); // Does not exist prior to 5.09.32, use an empty field if we can't find the existing one. @@ -89,23 +84,23 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Automatic Snips", "Hand-held electric wire cutter", new TOOL_Gregtech_ElectricSnips(), - new Object[] { - GregtechToolDictNames.craftingToolElectricSnips, - ToolDictNames.craftingToolWireCutter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L) - }), + new Object[] { GregtechToolDictNames.craftingToolElectricSnips, + ToolDictNames.craftingToolWireCutter, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L) }), aWireCutterList); // Electric Lighter this.addTool( - ELECTRIC_LIGHTER, "Pyromatic 9k", "Electric Fire!", new TOOL_Gregtech_ElectricLighter(), new Object[] { - GregtechToolDictNames.craftingToolElectricLighter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) - }); + ELECTRIC_LIGHTER, + "Pyromatic 9k", + "Electric Fire!", + new TOOL_Gregtech_ElectricLighter(), + new Object[] { GregtechToolDictNames.craftingToolElectricLighter, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); // Electric Butcher Knife this.addTool( @@ -113,12 +108,9 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Meat-o-matic", "Electric butcher knife", new TOOL_Gregtech_ElectricButcherKnife(), - new Object[] { - GregtechToolDictNames.craftingToolElectricButcherKnife, - ToolDictNames.craftingToolKnife, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) - }); + new Object[] { GregtechToolDictNames.craftingToolElectricButcherKnife, ToolDictNames.craftingToolKnife, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java index ef72c5edd4..9d27818686 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java @@ -1,5 +1,11 @@ package gtPlusPlus.xmod.gregtech.common.items.behaviours; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_LanguageManager; import gregtech.common.items.behaviors.Behaviour_None; @@ -7,39 +13,27 @@ import gregtech.common.items.behaviors.Behaviour_Wrench; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class Behaviour_Choocher extends Behaviour_None { + private boolean isWrench = true; private final Behaviour_Wrench wrench = new Behaviour_Wrench(150); private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250); - private final String mTooltip1 = - GT_LanguageManager.addStringLocalization("gt.behaviour.choochering1", "Current tool mode: "); - private final String mTooltip2 = GT_LanguageManager.addStringLocalization( - "gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick."); - private final String mTooltipH = GT_LanguageManager.addStringLocalization( - "gt.behaviour.prospectingEx", "Usable for Prospecting large areas."); - private final String mTooltipW = - GT_LanguageManager.addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick."); + private final String mTooltip1 = GT_LanguageManager + .addStringLocalization("gt.behaviour.choochering1", "Current tool mode: "); + private final String mTooltip2 = GT_LanguageManager + .addStringLocalization("gt.behaviour.choochering2", "Change tool mode using Shift+Rightclick."); + private final String mTooltipH = GT_LanguageManager + .addStringLocalization("gt.behaviour.prospectingEx", "Usable for Prospecting large areas."); + private final String mTooltipW = GT_LanguageManager + .addStringLocalization("gt.behaviour.wrench", "Rotates Blocks on Rightclick."); public Behaviour_Choocher() {} @Override - public boolean onItemUseFirst( - final GT_MetaBase_Item aItem, - final ItemStack aStack, - final EntityPlayer aPlayer, - final World aWorld, - final int aX, - final int aY, - final int aZ, - final int aSide, - final float hitX, - final float hitY, - final float hitZ) { + public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, + final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, + final float hitY, final float hitZ) { if (aWorld.isRemote) { return false; } @@ -59,18 +53,18 @@ public class Behaviour_Choocher extends Behaviour_None { return true; } else { if (inWrenchMode) { - return this.wrench.onItemUseFirst( - aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ); + return this.wrench + .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ); } else { - return this.prospecting.onItemUseFirst( - aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ); + return this.prospecting + .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ); } } } @Override - public List<String> getAdditionalToolTips( - final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) { + public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, + final ItemStack aStack) { boolean inWrenchMode; if (NBTUtils.hasKey(aStack, "aMode")) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java index 922c09c1eb..ce393beccb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java @@ -1,5 +1,16 @@ package gtPlusPlus.xmod.gregtech.common.items.behaviours; +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + import codechicken.lib.math.MathHelper; import gregtech.api.GregTech_API; import gregtech.api.items.GT_MetaBase_Item; @@ -15,24 +26,15 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; import ic2.api.item.IElectricItemManager; -import java.util.List; -import net.minecraft.entity.Entity; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class Behaviour_Electric_Lighter extends Behaviour_None { - private final String mTooltip = - GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire"); - private final String mTooltipUses = - GT_LanguageManager.addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:"); - private final String mTooltipUnstackable = - GT_LanguageManager.addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); + private final String mTooltip = GT_LanguageManager + .addStringLocalization("gt.behaviour.lighter.tooltip", "Can light things on Fire"); + private final String mTooltipUses = GT_LanguageManager + .addStringLocalization("gt.behaviour.lighter.uses", "Remaining Uses:"); + private final String mTooltipUnstackable = GT_LanguageManager + .addStringLocalization("gt.behaviour.unstackable", "Not usable when stacked!"); public Behaviour_Electric_Lighter() {} @@ -59,18 +61,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { } } - public boolean onItemUse( - GT_MetaBase_Item aItem, - ItemStack aStack, - EntityPlayer aPlayer, - World aWorld, - int aX, - int aY, - int aZ, - int aSide, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) { if (aPlayer.isSneaking()) { Logger.INFO("Changing Mode"); @@ -88,7 +80,10 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (aCurrentMode) { // Shoot Lightning Attack aWorld.playSoundAtEntity( - aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F)); + aPlayer, + "random.bow", + 0.5F, + 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F)); if (!aWorld.isRemote) { aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ)); } @@ -105,7 +100,13 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { Logger.WARNING("Preparing Lighter c"); GT_Utility.sendSoundToPlayers( - aWorld, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F, aX, aY, aZ); + aWorld, + (String) GregTech_API.sSoundList.get(6), + 1.0F, + 1.0F, + aX, + aY, + aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); rOutput = true; // ItemNBT.setLighterFuel(aStack, tFuelAmount); @@ -119,18 +120,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { return false; } - public boolean onItemUseFirst( - GT_MetaBase_Item aItem, - ItemStack aStack, - EntityPlayer aPlayer, - World aWorld, - int aX, - int aY, - int aZ, - int aSide, - float hitX, - float hitY, - float hitZ) { + public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, + int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) { if (aPlayer.isSneaking()) { Logger.INFO("Changing Mode"); @@ -148,7 +139,10 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (aCurrentMode) { // Shoot Lightning Attack aWorld.playSoundAtEntity( - aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F)); + aPlayer, + "random.bow", + 0.5F, + 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F)); if (!aWorld.isRemote) { aWorld.spawnEntityInWorld(new EntityLightningAttack(aWorld, aPlayer, hitX, hitY, hitZ)); } @@ -165,7 +159,13 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) { Logger.WARNING("Preparing Lighter c"); GT_Utility.sendSoundToPlayers( - aWorld, (String) GregTech_API.sSoundList.get(6), 1.0F, 1.0F, aX, aY, aZ); + aWorld, + (String) GregTech_API.sSoundList.get(6), + 1.0F, + 1.0F, + aX, + aY, + aZ); aWorld.setBlock(aX, aY, aZ, Blocks.fire); rOutput = true; // ItemNBT.setLighterFuel(aStack, tFuelAmount); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java index a2106fe679..cb892da129 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java @@ -1,9 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.items.behaviours; -import gregtech.api.enums.SubTag; -import gregtech.api.interfaces.IItemBehaviour; -import gregtech.api.items.GT_MetaBase_Item; import java.util.List; + import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -12,6 +10,10 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import gregtech.api.enums.SubTag; +import gregtech.api.interfaces.IItemBehaviour; +import gregtech.api.items.GT_MetaBase_Item; + public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> { @Override @@ -21,35 +23,15 @@ public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> { } @Override - public boolean onItemUse( - GT_MetaBase_Item var1, - ItemStack var2, - EntityPlayer var3, - World var4, - int var5, - int var6, - int var7, - int var8, - float var9, - float var10, - float var11) { + public boolean onItemUse(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5, int var6, + int var7, int var8, float var9, float var10, float var11) { // TODO Auto-generated method stub return false; } @Override - public boolean onItemUseFirst( - GT_MetaBase_Item var1, - ItemStack var2, - EntityPlayer var3, - World var4, - int var5, - int var6, - int var7, - int var8, - float var9, - float var10, - float var11) { + public boolean onItemUseFirst(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5, + int var6, int var7, int var8, float var9, float var10, float var11) { // TODO Auto-generated method stub return false; } @@ -97,15 +79,15 @@ public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> { } @Override - public EntityArrow getProjectile( - GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, double var5, double var7, double var9) { + public EntityArrow getProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, double var5, + double var7, double var9) { // TODO Auto-generated method stub return null; } @Override - public EntityArrow getProjectile( - GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, EntityLivingBase var5, float var6) { + public EntityArrow getProjectile(GT_MetaBase_Item var1, SubTag var2, ItemStack var3, World var4, + EntityLivingBase var5, float var6) { // TODO Auto-generated method stub return null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java index 514e1070ac..307cde3233 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java @@ -1,5 +1,16 @@ package gtPlusPlus.xmod.gregtech.common.items.behaviours; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidBlock; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.items.GT_MetaBase_Item; @@ -11,17 +22,9 @@ import gregtech.api.util.GT_Utility; import gregtech.common.blocks.GT_Block_Ores; import gregtech.common.blocks.GT_TileEntity_Ores; import gregtech.common.items.behaviors.Behaviour_Prospecting; -import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.IFluidBlock; public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { + private final int mVanillaCosts; private final int mEUCosts; @@ -32,18 +35,9 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { } @Override - public boolean onItemUseFirst( - final GT_MetaBase_Item aItem, - final ItemStack aStack, - final EntityPlayer aPlayer, - final World aWorld, - final int aX, - final int aY, - final int aZ, - final int aSide, - final float hitX, - final float hitY, - final float hitZ) { + public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, + final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, + final float hitY, final float hitZ) { if (aWorld.isRemote) { return false; } @@ -56,9 +50,16 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(aBlock, 1, aMeta)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { GT_Utility.sendChatToPlayer( - aPlayer, "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); + aPlayer, + "This is " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); GT_Utility.sendSoundToPlayers( - aWorld, GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ); + aWorld, + GregTech_API.sSoundList.get(Integer.valueOf(1)), + 1.0F, + -1.0F, + aX, + aY, + aZ); return true; } if ((aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) @@ -69,15 +70,20 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { || (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.grass))) { if (GT_ModHandler.damageOrDechargeItem(aStack, this.mVanillaCosts, this.mEUCosts, aPlayer)) { GT_Utility.sendSoundToPlayers( - aWorld, GregTech_API.sSoundList.get(Integer.valueOf(1)), 1.0F, -1.0F, aX, aY, aZ); + aWorld, + GregTech_API.sSoundList.get(Integer.valueOf(1)), + 1.0F, + -1.0F, + aX, + aY, + aZ); int tX = aX; int tY = aY; int tZ = aZ; int tMetaID = 0; final int tQuality = ((aItem instanceof GT_MetaGenerated_Tool) - ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") - : 0) - * 3; + ? ((GT_MetaGenerated_Tool) aItem).getHarvestLevel(aStack, "") + : 0) * 3; int i = 0; for (final int j = 6 + tQuality; i < j; i++) { @@ -90,8 +96,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Block."); break; } - if ((tBlock == Blocks.water) - || (tBlock == Blocks.flowing_water) + if ((tBlock == Blocks.water) || (tBlock == Blocks.flowing_water) || ((tBlock instanceof IFluidBlock))) { GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Block."); break; @@ -118,19 +123,19 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting { if ((tBlock instanceof GT_Block_Ores)) { final TileEntity tTileEntity = aWorld.getTileEntity(tX, tY, tZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { - final Materials tMaterial = GregTech_API.sGeneratedMaterials[ - (((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)]; + final Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData + % 1000)]; if ((tMaterial != null) && (tMaterial != Materials._NULL)) { GT_Utility.sendChatToPlayer( - aPlayer, "Found traces of " + tMaterial.mDefaultLocalName + " Ore."); + aPlayer, + "Found traces of " + tMaterial.mDefaultLocalName + " Ore."); return true; } } } else { tMetaID = aWorld.getBlockMetadata(tX, tY, tZ); tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) - && (tAssotiation.mPrefix.toString().startsWith("ore"))) { + if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { GT_Utility.sendChatToPlayer( aPlayer, "Found traces of " + tAssotiation.mMaterial.mMaterial.mDefaultLocalName + " Ore."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java index b1f2309b69..e34ca2b77f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java @@ -1,14 +1,15 @@ package gtPlusPlus.xmod.gregtech.common.items.covers; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; public class MetaItemCoverCasings extends MetaCustomCoverItem { @@ -40,8 +41,8 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem { @Override public String getItemStackDisplayName(final ItemStack tItem) { return EnumChatFormatting.LIGHT_PURPLE - + GT_Values.VOLTAGE_NAMES[ - MathUtils.balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)] + + GT_Values.VOLTAGE_NAMES[MathUtils + .balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length - 1)] + " Machine Plate Cover"; // super.getItemStackDisplayName(tItem); } } |