Merge branch 'master' of https://github.com/sor1n/Modjam-Mod

2 files changed, 13 insertions, 8 deletions

diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java b/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java
index 5f60c3f..1e36225 100644
--- a/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntityMolder.java
@@ -1,12 +1,12 @@
 package darkknight.jewelrycraft.tileentity;
 
-import darkknight.jewelrycraft.item.ItemList;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.Packet132TileEntityData;
 import net.minecraft.tileentity.TileEntity;
+import darkknight.jewelrycraft.item.ItemList;
 
 public class TileEntityMolder extends TileEntity
 {
@@ -44,7 +44,7 @@ public class TileEntityMolder extends TileEntity
         nbt.setCompoundTag("jewelBase", tag1);
         this.moltenMetal.writeToNBT(tag2);
         nbt.setCompoundTag("moltenMetal", tag2);
-        this.ringMetal.writeToNBT(tag2);
+        this.ringMetal.writeToNBT(tag3);
         nbt.setCompoundTag("ringMetal", tag3);
     }
     
@@ -66,16 +66,17 @@ public class TileEntityMolder extends TileEntity
         this.ringMetal.readFromNBT(nbt.getCompoundTag("ringMetal"));
     }
     
+    @Override
     public void updateEntity()
     {
         super.updateEntity();
         if (moltenMetal.itemID != 0)
         {
-            this.worldObj.playSoundEffect((double) ((float) xCoord + 0.5F), (double) ((float) yCoord + 0.5F), (double) ((float) zCoord + 0.5F), "random.fizz", 0.5F, 2.6F + 0.2F * 0.8F);
+            this.worldObj.playSoundEffect(xCoord + 0.5F, yCoord + 0.5F, zCoord + 0.5F, "random.fizz", 0.5F, 2.6F + 0.2F * 0.8F);
             for (int l = 0; l < 2; ++l)
             {
                 //EntityFX entityfx = new EntityReddustFX(this.worldObj, (double)xCoord + Math.random(), (double)yCoord + 0.2D, (double)zCoord + Math.random(), 0.0F, 0.0F, 0.0F);
-                this.worldObj.spawnParticle("reddust", (double) xCoord + Math.random(), (double) yCoord + 0.2F, (double) zCoord + Math.random(), 0.0D, 1.0D, 1.0D);
+                this.worldObj.spawnParticle("reddust", xCoord + Math.random(), (double) yCoord + 0.2F, zCoord + Math.random(), 0.0D, 1.0D, 1.0D);
             }
         }
         if (this.hasMoltenMetal && !this.hasJewelBase)
@@ -96,11 +97,13 @@ public class TileEntityMolder extends TileEntity
         }
     }
     
+    @Override
     public void onDataPacket(INetworkManager net, Packet132TileEntityData pkt)
     {
         readFromNBT(pkt.data);
     }
     
+    @Override
     public Packet getDescriptionPacket()
     {
         NBTTagCompound nbtTag = new NBTTagCompound();
diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
index 514d879..06e97ac 100644
--- a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
+++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java
@@ -52,6 +52,7 @@ public class TileEntitySmelter extends TileEntity
         this.moltenMetal.readFromNBT(nbt.getCompoundTag("moltenMetal"));
     }
     
+    @Override
     public void updateEntity()
     {
         super.updateEntity();
@@ -77,14 +78,14 @@ public class TileEntitySmelter extends TileEntity
             for (int l = 0; l < 5; ++l)
             {
                 //EntityFX entityfx = new EntityReddustFX(this.worldObj, (double)xCoord + Math.random(), (double)yCoord + 0.2D, (double)zCoord + Math.random(), 0.0F, 0.0F, 0.0F);
-                this.worldObj.spawnParticle("flame", (double) xCoord, (double) yCoord + 1.5F, (double) zCoord, 0.0D, 0.0D, 0.0D);
+                this.worldObj.spawnParticle("flame", xCoord, yCoord + 1.1D, zCoord, 0.0D, 0.5D, 0.0D);
             }
         }
         if (rand.nextInt(65) == 0)
         {
-            double d5 = (double) ((float) this.xCoord + rand.nextFloat());
-            double d7 = (double) this.yCoord;
-            double d6 = (double) ((float) this.zCoord + rand.nextFloat());
+            double d5 = this.xCoord + rand.nextFloat();
+            double d7 = this.yCoord;
+            double d6 = this.zCoord + rand.nextFloat();
             //this.worldObj.spawnParticle("lava", d5, d7, d6, 0.0D, 0.0D, 0.0D);
             this.worldObj.playSound(d5, d7, d6, "liquid.lavapop", 0.2F + rand.nextFloat() * 0.2F, 0.9F + rand.nextFloat() * 0.15F, false);
         }
@@ -102,6 +103,7 @@ public class TileEntitySmelter extends TileEntity
         }
     }
     
+    @Override
     public Packet getDescriptionPacket()
     {
         NBTTagCompound nbtTag = new NBTTagCompound();