1 files changed, 7 insertions, 32 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java
index c11f2ee..38e60a5 100644
--- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java
@@ -9,6 +9,11 @@ package darkknight.jewelrycraft.events;
 
 import java.util.HashMap;
 import java.util.Map;
+import cpw.mods.fml.common.eventhandler.Event.Result;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import darkknight.jewelrycraft.block.BlockMoltenMetal;
+import darkknight.jewelrycraft.tileentity.TileEntityMoltenMetal;
+import darkknight.jewelrycraft.util.JewelryNBT;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
@@ -16,26 +21,15 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
-import cpw.mods.fml.common.eventhandler.Event.Result;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.block.BlockMoltenMetal;
-import darkknight.jewelrycraft.util.JewelryNBT;
 
 public class BucketHandler
 {
     public static BucketHandler INSTANCE = new BucketHandler();
     public Map<Block, Item> buckets = new HashMap<Block, Item>();
     
-    /**
-     * 
-     */
     private BucketHandler()
     {}
     
-    /**
-     * @param event
-     */
     @SubscribeEvent
     public void onBucketFill(FillBucketEvent event)
     {
@@ -45,33 +39,14 @@ public class BucketHandler
         event.setResult(Result.ALLOW);
     }
     
-    /**
-     * @param world
-     * @param pos
-     * @return
-     */
     private ItemStack fillCustomBucket(World world, MovingObjectPosition pos)
     {
         Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ);
         Item bucket = buckets.get(block);
         if (bucket != null && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) != Blocks.air && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) instanceof BlockMoltenMetal){
-            world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ);
             ItemStack item = new ItemStack(bucket);
-            String ingotData = JewelrycraftMod.saveData.getString(pos.blockX + " " + pos.blockY + " " + pos.blockZ + " " + world.provider.dimensionId);
-            if (ingotData != null && ingotData != ""){
-                String[] splitData = ingotData.split(":");
-                if (splitData.length == 2){
-                    int itemID, itemDamage;
-                    try{
-                        itemID = Integer.parseInt(splitData[0]);
-                        itemDamage = Integer.parseInt(splitData[1]);
-                        JewelryNBT.addMetal(item, new ItemStack(Item.getItemById(itemID), 1, itemDamage));
-                    }
-                    catch(Exception e){
-                        e.printStackTrace();
-                    }
-                }
-            }
+            if(BlockMoltenMetal.getTileEntity(world, pos.blockX, pos.blockY, pos.blockZ) != null) JewelryNBT.addMetal(item, BlockMoltenMetal.getTileEntity(world, pos.blockX, pos.blockY, pos.blockZ).getMetal());
+            world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ);
             return item;
         }else return null;
     }