Woohoo! Improvements!

1 files changed, 7 insertions, 120 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
index 8a3af07..204ec9b 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
@@ -9,7 +9,9 @@ import java.util.HashMap;
 import java.util.LinkedList;

 import java.util.List;

 import java.util.Map;

+

 import javax.imageio.ImageIO;

+

 import net.minecraft.block.Block;

 import net.minecraft.block.BlockAir;

 import net.minecraft.client.Minecraft;

@@ -31,6 +33,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import darkknight.jewelrycraft.JewelrycraftMod;

 import darkknight.jewelrycraft.api.ModifierEffects;

 import darkknight.jewelrycraft.util.JewelryNBT;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

 import darkknight.jewelrycraft.util.Variables;

 

 public abstract class ItemBaseJewelry extends Item

@@ -50,130 +53,14 @@ public abstract class ItemBaseJewelry extends Item
     @SideOnly (Side.CLIENT)

     public int getColorFromItemStack(ItemStack stack, int pass)

     {

-        try{

-            return color(stack, pass);

-        }

-        catch(IOException e){

-            e.printStackTrace();

-        }

+        if (pass == 0 && JewelryNBT.ingot(stack) != null) return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack));

+        if (pass == 1 && JewelryNBT.gem(stack) != null) return JewelrycraftUtil.getColor(JewelryNBT.gem(stack));

+        else if (JewelryNBT.ingot(stack) != null) return JewelrycraftUtil.getColor(JewelryNBT.ingot(stack));

         return 16777215;

     }

     

     /**

      * @param stack

-     * @param pass

-     * @return

-     * @throws IOException

-     */

-    public static int color(ItemStack stack, int pass) throws IOException

-    {

-        IResourceManager rm = Minecraft.getMinecraft().getResourceManager();

-        BufferedImage icon;

-        if (pass == 0 && stack != null && JewelryNBT.ingot(stack) != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0 && JewelryNBT.ingot(stack).getIconIndex() != null && JewelryNBT.ingotColor(stack) == 16777215){

-            ItemStack ingot = JewelryNBT.ingot(stack);

-            icon = ImageIO.read(rm.getResource(getLocation(ingot, stack, true)).getInputStream());

-            int height = icon.getHeight();

-            int width = icon.getWidth();

-            Map m = new HashMap();

-            for(int i = 0; i < width; i++)

-                for(int j = 0; j < height; j++){

-                    int rgb = icon.getRGB(i, j);

-                    int red = rgb >> 16 & 0xff;

-                    int green = rgb >> 8 & 0xff;

-                    int blue = rgb & 0xff;

-                    int[] rgbArr = {red, green, blue};

-                    int Cmax = Math.max(red, Math.max(green, blue));

-                    int Cmin = Math.min(red, Math.min(green, blue));

-                    if (!isGray(rgbArr)) m.put(rgb, (Cmax + Cmin) / 2);

-                }

-            int color = getMostCommonColour(m);

-            if (JewelryNBT.ingot(stack) != null && JewelryNBT.ingot(stack).getItem().getColorFromItemStack(JewelryNBT.ingot(stack), 1) != 16777215) JewelryNBT.addIngotColor(stack, JewelryNBT.ingot(stack).getItem().getColorFromItemStack(JewelryNBT.ingot(stack), 1));

-            else JewelryNBT.addIngotColor(stack, color);

-        }else if (pass == 1 && stack != null && stack.getItem() != null && JewelryNBT.gem(stack) != null && !(Block.getBlockFromItem(JewelryNBT.gem(stack).getItem()) instanceof BlockAir) && JewelryNBT.gem(stack).getIconIndex() != null){

-            ItemStack gem = JewelryNBT.gem(stack);

-            icon = ImageIO.read(rm.getResource(getLocation(gem, stack, true)).getInputStream());

-            int height = icon.getHeight();

-            int width = icon.getWidth();

-            Map m = new HashMap();

-            for(int i = 0; i < width; i++)

-                for(int j = 0; j < height; j++){

-                    int rgb = icon.getRGB(i, j);

-                    int red = rgb >> 16 & 0xff;

-                    int green = rgb >> 8 & 0xff;

-                    int blue = rgb & 0xff;

-                    int[] rgbArr = {red, green, blue};

-                    int Cmax = Math.max(red, Math.max(green, blue));

-                    int Cmin = Math.min(red, Math.min(green, blue));

-                    if (!isGray(rgbArr)) m.put(rgb, (Cmax + Cmin) / 2);

-                }

-            int color = getMostCommonColour(m);

-            if (JewelryNBT.gem(stack).getItem().getColorFromItemStack(JewelryNBT.gem(stack), 1) == 16777215) JewelryNBT.addGemColor(stack, color);

-            else JewelryNBT.addGemColor(stack, JewelryNBT.gem(stack).getItem().getColorFromItemStack(JewelryNBT.gem(stack), 1));

-        }

-        if (pass == 0 && JewelryNBT.ingot(stack) != null) return JewelryNBT.ingotColor(stack);

-        if (pass == 1 && JewelryNBT.gem(stack) != null) return JewelryNBT.gemColor(stack);

-        else if (JewelryNBT.ingot(stack) != null) return JewelryNBT.ingotColor(stack);

-        return 16777215;

-    }

-    

-    /**

-     * @param item

-     * @param stack

-     * @param changeMeta

-     * @return

-     */

-    public static ResourceLocation getLocation(ItemStack item, ItemStack stack, boolean changeMeta)

-    {

-        String domain = "";

-        String texture;

-        if (changeMeta && (Item.getIdFromItem(item.getItem()) == Block.getIdFromBlock(Blocks.stained_glass) || Item.getIdFromItem(item.getItem()) == Block.getIdFromBlock(Blocks.stained_hardened_clay) || Item.getIdFromItem(item.getItem()) == Block.getIdFromBlock(Blocks.wool) || Item.getIdFromItem(item.getItem()) == Block.getIdFromBlock(Blocks.carpet))) item.setItemDamage(15 - item.getItemDamage());

-        IIcon itemIcon = item.getItem().getIcon(item, 0);

-        String iconName = itemIcon.getIconName();

-        if (iconName.substring(0, iconName.indexOf(":") + 1) != "") domain = iconName.substring(0, iconName.indexOf(":") + 1).replace(":", " ").trim();

-        else domain = "minecraft";

-        texture = iconName.substring(iconName.lastIndexOf(":") + 1) + ".png";

-        ResourceLocation textureLocation = null;

-        TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();

-        if (texturemanager.getResourceLocation(item.getItemSpriteNumber()).toString().contains("items")) textureLocation = new ResourceLocation(domain.toLowerCase(), "textures/items/" + texture);

-        else textureLocation = new ResourceLocation(domain.toLowerCase(), "textures/blocks/" + texture);

-        return textureLocation;

-    }

-    

-    /**

-     * @param map

-     * @return

-     */

-    public static int getMostCommonColour(Map map)

-    {

-        List list = new LinkedList(map.entrySet());

-        Collections.sort(list, new Comparator(){

-            public int compare(Object o1, Object o2)

-            {

-                return ((Comparable)((Map.Entry)o1).getValue()).compareTo(((Map.Entry)o2).getValue());

-            }

-        });

-        Map.Entry me = (Map.Entry)list.get(list.size() - 1);

-        for(int i = 0; i < list.size(); i++){

-            float alpha = Float.valueOf(list.get(i).toString().split("=")[1]);

-            if (alpha < 180) me = (Map.Entry)list.get(i);

-        }

-        int rgb = (Integer)me.getKey();

-        return rgb;

-    }

-    

-    /**

-     * @param rgbArr

-     * @return

-     */

-    public static boolean isGray(int[] rgbArr)

-    {

-        int rgbSum = rgbArr[0] + rgbArr[1] + rgbArr[2];

-        if (rgbSum > 0 && rgbSum < 256 * 3) return false;

-        return true;

-    }

-    

-    /**

-     * @param stack

      * @return

      */

     public String getItemStackDisplayName(ItemStack stack)

@@ -192,7 +79,7 @@ public abstract class ItemBaseJewelry extends Item
      */

     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)

     {

-        if (stack.hasTagCompound() && par4){

+        if (stack.hasTagCompound()){

             ItemStack ingot = JewelryNBT.ingot(stack);

             if (ingot != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) list.add(StatCollector.translateToLocal("info." + Variables.MODID + ".metal") + ": " + EnumChatFormatting.YELLOW + ingot.getDisplayName().replace(StatCollector.translateToLocal("info." + Variables.MODID + ".ingot"), " "));

             ItemStack gem = JewelryNBT.gem(stack);