From c918a1b6d8008773e9beebb48ba1a770405aee20 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 22 Aug 2019 19:54:41 -0400 Subject: Bulk update back to sanity --- .../main/java/fyresmodjam/items/ItemCrystal.java | 50 ++++++++-------------- 1 file changed, 17 insertions(+), 33 deletions(-) (limited to 'YWD/src/main/java/fyresmodjam/items/ItemCrystal.java') diff --git a/YWD/src/main/java/fyresmodjam/items/ItemCrystal.java b/YWD/src/main/java/fyresmodjam/items/ItemCrystal.java index ee4a6e8..4c28d4a 100755 --- a/YWD/src/main/java/fyresmodjam/items/ItemCrystal.java +++ b/YWD/src/main/java/fyresmodjam/items/ItemCrystal.java @@ -19,16 +19,10 @@ public class ItemCrystal extends ItemBlock { public IIcon texture; - public static String[] names = new String[] { - "Shining", "Void", "Firey" - }; - public static String[] particleNames = new String[] { - "spell", "portal", "flame" - }; - public static Color[] colors = new Color[] { - new Color(255, 255, 173), new Color(33, 0, 73), - new Color(255, 55, 0) - }; + public static String[] names = new String[] { "Shining", "Void", "Firey" }; + public static String[] particleNames = new String[] { "spell", "portal", "flame" }; + public static Color[] colors = new Color[] { new Color(255, 255, 173), new Color(33, 0, 73), + new Color(255, 55, 0) }; public ItemCrystal() { super(ModjamMod.crystal); @@ -37,31 +31,27 @@ public class ItemCrystal extends ItemBlock { } @Override - public void getSubItems(Item id, CreativeTabs creativeTab, - List list) { + public void getSubItems(Item id, CreativeTabs creativeTab, List list) { for (int i = 0; i < names.length; i++) { list.add(new ItemStack(id, 1, i)); } } public String getItemDisplayName(ItemStack itemStack) { - return names[itemStack.getItemDamage() % names.length] - + " Crystal"; + return names[itemStack.getItemDamage() % names.length] + " Crystal"; } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { - texture = iconRegister - .registerIcon("fyresmodjam:crystal_item"); + texture = iconRegister.registerIcon("fyresmodjam:crystal_item"); itemIcon = texture; } @Override @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack itemStack, int i) { - return colors[itemStack.getItemDamage() % colors.length] - .getRGB(); + return colors[itemStack.getItemDamage() % colors.length].getRGB(); } @Override @@ -77,8 +67,7 @@ public class ItemCrystal extends ItemBlock { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, - World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { // int value = // (!par3EntityPlayer.getEntityData().hasKey("equippedCrystal") @@ -88,23 +77,18 @@ public class ItemCrystal extends ItemBlock { // par1ItemStack.getItemDamage() : -1; /* - * if(par2World.isRemote) { - * PacketDispatcher.sendPacketToServer(PacketHandler. - * newPacket( PacketHandler.UPDATE_STAT, new Object[] - * {"equippedCrystal", "int", + * if(par2World.isRemote) { PacketDispatcher.sendPacketToServer(PacketHandler. + * newPacket( PacketHandler.UPDATE_STAT, new Object[] {"equippedCrystal", "int", * par1ItemStack.getItemDamage()})); } else { - * PacketDispatcher.sendPacketToPlayer(PacketHandler. - * newPacket( PacketHandler.UPDATE_STAT, new Object[] - * {"equippedCrystal", "int", - * par1ItemStack.getItemDamage()}), (Player) - * par3EntityPlayer); } + * PacketDispatcher.sendPacketToPlayer(PacketHandler. newPacket( + * PacketHandler.UPDATE_STAT, new Object[] {"equippedCrystal", "int", + * par1ItemStack.getItemDamage()}), (Player) par3EntityPlayer); } */ /* - * if(par2World.isRemote) { - * par3EntityPlayer.openGui(ModjamMod.instance, 1, - * par2World, (int) par3EntityPlayer.posX, (int) - * par3EntityPlayer.posY, (int) par3EntityPlayer.posZ); } + * if(par2World.isRemote) { par3EntityPlayer.openGui(ModjamMod.instance, 1, + * par2World, (int) par3EntityPlayer.posX, (int) par3EntityPlayer.posY, (int) + * par3EntityPlayer.posZ); } */ return par1ItemStack; -- cgit v1.2.3