Liquids!

5 files changed, 133 insertions, 14 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemList.java b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
index 3a91c7b..370c1d3 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemList.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemList.java
@@ -22,6 +22,7 @@ public class ItemList
 	public static ItemNecklace     necklace;
 	public static Item     guide;
 	public static ItemMoltenMetalBucket     bucket;
+	public static ItemMoltenMetal     metal;
 
 	private static boolean isInitialized = false;
 
@@ -38,6 +39,7 @@ public class ItemList
 			necklace = (ItemNecklace) new ItemNecklace().setUnlocalizedName("Jewelrycraft.necklace").setTextureName("jewelrycraft:necklace");
 			guide = new ItemGuide().setUnlocalizedName("Jewelrycraft.guide").setTextureName("jewelrycraft:guide").setCreativeTab(JewelrycraftMod.jewelrycraft);
 			bucket = (ItemMoltenMetalBucket) new ItemMoltenMetalBucket().setUnlocalizedName("Jewelrycraft.bucket");
+			metal = (ItemMoltenMetal) new ItemMoltenMetal().setUnlocalizedName("Jewelrycraft.bucket");
 
 			GameRegistry.registerItem(thiefGloves, "thiefGloves");
 			GameRegistry.registerItem(shadowIngot, "shadowIngot");
@@ -48,6 +50,7 @@ public class ItemList
 			GameRegistry.registerItem(crystal, "crystal");
 			GameRegistry.registerItem(guide, "guide");
 			GameRegistry.registerItem(bucket, "moltenMetalBucket");
+			GameRegistry.registerItem(metal, "moltenMetal");
 
 			isInitialized = true;
 		}
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
new file mode 100644
index 0000000..9bf9896
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetal.java
@@ -0,0 +1,122 @@
+package darkknight.jewelrycraft.item;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import javax.imageio.ImageIO;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockChest;
+import net.minecraft.block.BlockSkull;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.monster.EntityIronGolem;
+import net.minecraft.entity.monster.EntitySnowman;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryEnderChest;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.tileentity.TileEntityChest;
+import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import darkknight.jewelrycraft.JewelrycraftMod;
+import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.util.JewelryNBT;
+
+public class ItemMoltenMetal extends Item
+{
+    private int amplifier, cooldown = 0;
+    int index = 0;
+
+    public ItemMoltenMetal()
+    {
+        super();
+        this.setMaxStackSize(1);
+    }
+
+    public void registerIcons(IIconRegister iconRegister)
+    {
+        itemIcon = iconRegister.registerIcon("jewelrycraft:moltenMetalStill");
+    }
+
+    @SideOnly(Side.CLIENT)
+    public int getColorFromItemStack(ItemStack stack, int pass)
+    {
+        try
+        {
+            return color(stack, pass);
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        return 16777215;
+    }
+
+    public static int color(ItemStack stack, int pass) throws IOException
+    {
+        String domain = "", texture;
+        IResourceManager rm = Minecraft.getMinecraft().getResourceManager();
+        BufferedImage icon;
+        int x=0, y=0, ok = 0, red, green, blue;
+        if (stack != null && stack != new ItemStack(Item.getItemById(0), 0, 0) && JewelryNBT.ingot(stack) != null && JewelryNBT.ingot(stack) != new ItemStack(Item.getItemById(0), 0, 0) && JewelryNBT.ingot(stack).getIconIndex() != null && JewelryNBT.ingotColor(stack) == 16777215)
+        {
+            String ingotIconName = JewelryNBT.ingot(stack).getIconIndex().getIconName(); 
+
+            if (ingotIconName.substring(0, ingotIconName.indexOf(":") + 1) != "") domain = ingotIconName.substring(0, ingotIconName.indexOf(":") + 1).replace(":", " ").trim();
+            else domain = "minecraft";
+
+            texture = ingotIconName.substring(ingotIconName.lastIndexOf(":") + 1) + ".png";
+            ResourceLocation ingot = null;
+
+            if (JewelryNBT.ingot(stack).getUnlocalizedName().contains("item")) ingot = new ResourceLocation(domain, "textures/items/" + texture);
+            else ingot = new ResourceLocation(domain, "textures/blocks/" + texture);
+
+            icon = ImageIO.read(rm.getResource(ingot).getInputStream());
+            while(ok == 0)
+            {
+                red = (icon.getRGB(x, y) >> 16) & 0xFF;
+                green = (icon.getRGB(x, y) >> 8) & 0xFF;
+                blue = icon.getRGB(x, y) & 0xFF;
+                if((red <= 80 && green <= 80 && blue <= 80) || (red >= 180 && green >= 180 && blue >= 180))
+                {
+                    if(x<icon.getTileWidth()-1) x++;
+                    if(x>=icon.getTileWidth()-1 && y<icon.getTileWidth()-1)
+                    { 
+                        x=0; 
+                        y++;
+                    }
+                    if(x == icon.getTileWidth()-1 && y==icon.getTileWidth()-1) ok=1;
+                }
+                else ok=1;
+            }
+            JewelryNBT.addIngotColor(stack, icon.getRGB(x, y));
+        }
+        if(JewelryNBT.ingot(stack) != null) return JewelryNBT.ingotColor(stack);
+        return 16777215;
+    }
+}
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
index 18a17ad..4bb9050 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemMoltenMetalBucket.java
@@ -1,14 +1,9 @@
 package darkknight.jewelrycraft.item;
 
 import java.awt.image.BufferedImage;
-import java.io.BufferedOutputStream;
-import java.io.BufferedWriter;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
 
 import javax.imageio.ImageIO;
 
@@ -28,6 +23,7 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
+import net.minecraft.world.storage.WorldInfo;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
 import cpw.mods.fml.common.eventhandler.Event;
@@ -35,6 +31,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import darkknight.jewelrycraft.JewelrycraftMod;
 import darkknight.jewelrycraft.block.BlockList;
+import darkknight.jewelrycraft.block.BlockMoltenMetal;
 import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 
@@ -206,12 +203,9 @@ public class ItemMoltenMetalBucket extends Item
 			else
 			{
 				if (!par1World.isRemote && flag && !material.isLiquid()) par1World.func_147480_a(par2, par3, par4, true);
-				JewelrycraftUtil.liquids.put(String.valueOf(par2) + " " + String.valueOf(par3) + " " + String.valueOf(par4), JewelryNBT.ingot(stack).getItem());
-				JewelrycraftMod.saveData = new NBTTagCompound();
-				JewelrycraftMod.saveData.setString("coords", String.valueOf(par2) + " " + String.valueOf(par3) + " " + String.valueOf(par4));
-				JewelrycraftMod.saveData.setInteger("item", Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()));
-				CompressedStreamTools.writeCompressed(JewelrycraftMod.saveData, new FileOutputStream(JewelrycraftMod.liquidsConf));
-				System.out.println(JewelrycraftMod.saveData.getString("coords"));
+				
+				JewelrycraftMod.saveData.setInteger(String.valueOf(par2) + " " + String.valueOf(par3) + " " + String.valueOf(par4), Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()));
+				
 				par1World.setBlock(par2, par3, par4, BlockList.moltenMetal, 0, 3);
 				return true;
 			}
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java
index 71af0a0..7206423 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemNecklace.java
@@ -145,7 +145,7 @@ public class ItemNecklace extends Item
      */
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
     {
-        if (stack.hasTagCompound() && Minecraft.getMinecraft().gameSettings.advancedItemTooltips)
+        if (stack.hasTagCompound())
         {
             ItemStack ingot = JewelryNBT.ingot(stack);
             if (ingot != null) list.add("Ingot: " + EnumChatFormatting.YELLOW + ingot.getDisplayName());
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
index fff9120..75b335d 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemRing.java
@@ -268,7 +268,7 @@ public class ItemRing extends Item
      */
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
     {
-        if (stack.hasTagCompound() && stack.getDisplayName() != "Wedding Ring" && Minecraft.getMinecraft().gameSettings.advancedItemTooltips)
+        if (stack.hasTagCompound() && stack.getDisplayName() != "Wedding Ring")
         {
             ItemStack ingot = JewelryNBT.ingot(stack);
             if (ingot != null) list.add("Ingot: " + EnumChatFormatting.YELLOW + ingot.getDisplayName());