Added just a butt ton of stuff, also thanks to pau101 for helping me with the Hand Pedestal animation :)

1 files changed, 33 insertions, 112 deletions

diff --git a/java/darkknight/jewelrycraft/tileentity/TileEntityAltar.java b/java/darkknight/jewelrycraft/tileentity/TileEntityAltar.java
index 6a43cb3..f490456 100644
--- a/java/darkknight/jewelrycraft/tileentity/TileEntityAltar.java
+++ b/java/darkknight/jewelrycraft/tileentity/TileEntityAltar.java
@@ -1,11 +1,5 @@
 package darkknight.jewelrycraft.tileentity;
 
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -13,8 +7,6 @@ import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import darkknight.jewelrycraft.util.JewelryNBT;
 
 public class TileEntityAltar extends TileEntity
 {
@@ -22,144 +14,73 @@ public class TileEntityAltar extends TileEntity
     public boolean isDirty, hasObject;
     public String playerName;
     
+    /**
+     * 
+     */
     public TileEntityAltar()
     {
-        this.hasObject = false;
-        this.object = new ItemStack(Item.getItemById(0), 0, 0);
-        this.isDirty = false;
-        this.playerName = "";
+        hasObject = false;
+        object = new ItemStack(Item.getItemById(0), 0, 0);
+        isDirty = false;
+        playerName = "";
     }
     
+    /**
+     * @param nbt
+     */
     @Override
     public void writeToNBT(NBTTagCompound nbt)
     {
         super.writeToNBT(nbt);
         NBTTagCompound tag = new NBTTagCompound();
-        this.object.writeToNBT(tag);
+        object.writeToNBT(tag);
         nbt.setTag("object", tag);
         nbt.setBoolean("hasObject", hasObject);
         nbt.setString("playerName", playerName);
     }
     
+    /**
+     * @param nbt
+     */
     @Override
     public void readFromNBT(NBTTagCompound nbt)
     {
         super.readFromNBT(nbt);
-        this.object = new ItemStack(Item.getItemById(0), 0, 0);
-        this.object.readFromNBT(nbt.getCompoundTag("object"));
-        this.hasObject = nbt.getBoolean("hasObject");
-        this.playerName = nbt.getString("playerName");
+        object = new ItemStack(Item.getItemById(0), 0, 0);
+        object.readFromNBT(nbt.getCompoundTag("object"));
+        hasObject = nbt.getBoolean("hasObject");
+        playerName = nbt.getString("playerName");
     }
     
-    @SuppressWarnings("rawtypes")
+    /**
+     * 
+     */
+    @SuppressWarnings ("rawtypes")
     @Override
     public void updateEntity()
     {
         super.updateEntity();
-        
-        if (isDirty)
-        {
+        if (isDirty){
             worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
             isDirty = false;
         }
-        if (hasObject && playerName != "")
-        {
-            // int playerPosX = (int)player.posX, playerPosY = (int)player.posY,
-            // playerPosZ = (int)player.posZ;
-            List entitiesR = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1D, zCoord, xCoord + 0.5D, yCoord + 2D, zCoord + 0.5D));
-            List entitiesN = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(xCoord - 0.5D, yCoord + 1D, zCoord - 0.5D, xCoord + 1.5D, yCoord + 2D, zCoord + 1.5D));
-            if (object.getUnlocalizedName().contains("ring"))
-            {
-                if (JewelryNBT.isGemX(object, new ItemStack(Items.ender_pearl)) && JewelryNBT.dimension(object) != -2 && JewelryNBT.playerPosX(object) != -1 && JewelryNBT.playerPosY(object) != -1 && JewelryNBT.playerPosZ(object) != -1)
-                {
-                    double posX = JewelryNBT.playerPosX(object), posY = JewelryNBT.playerPosY(object), posZ = JewelryNBT.playerPosZ(object);
-                    int dimension = JewelryNBT.dimension(object);
-                    for (int i = 0; i < entitiesR.size(); i++)
-                    {
-                        EntityLivingBase entity = (EntityLivingBase) entitiesR.get(i);
-                        if (!JewelryNBT.isDimensionX(object, entity.dimension) && JewelryNBT.isModifierX(object, new ItemStack(Items.bed)))
-                        {
-                            entity.travelToDimension(dimension);
-                            entity.setPositionAndUpdate(posX, posY, posZ);
-                        }
-                        else if (JewelryNBT.isDimensionX(object, entity.dimension)) entity.setPositionAndUpdate(posX, posY, posZ);
-                    }
-                }
-                if (JewelryNBT.isModifierX(object, new ItemStack(Items.dye, 1, 15)))
-                {
-                    for (int i = -1; i <= 1; i++)
-                        for (int j = -1; j <= 1; j++)
-                            for (int k = -1; k <= 1; k++)
-                            {
-                                // if(worldObj.getBlockId(xCoord + i, yCoord +
-                                // j, zCoord + k) == Block.dirt.blockID &&
-                                // (worldObj.getBlockId(xCoord + i, yCoord + j +
-                                // 1, zCoord + k) == 0 ||
-                                // worldObj.getBlockId(xCoord + i, yCoord + j +
-                                // 1, zCoord + k) == Block.crops.blockID) ||
-                                // worldObj.getBlockId(xCoord + i, yCoord + j +
-                                // 1, zCoord + k) == Block.potato.blockID)
-                                // worldObj.setBlock(xCoord + i, yCoord + j,
-                                // zCoord + k, Block.tilledField.blockID);
-                                if (worldObj.getBlock(xCoord + i, yCoord + j, zCoord + k) == Blocks.farmland) worldObj.setBlockMetadataWithNotify(xCoord + i, yCoord + j, zCoord + k, 1, 7);
-                                if (worldObj.getBlock(xCoord + i, yCoord + j, zCoord + k) != Blocks.farmland) worldObj.scheduleBlockUpdate(xCoord + i, yCoord + j, zCoord + k, worldObj.getBlock(xCoord + i, yCoord + j, zCoord + k), 5);
-                                // JewelrycraftUtil.applyBonemeal(object,
-                                // worldObj, xCoord + i, yCoord + j, zCoord + k,
-                                // player);
-                            }
-                }
-            }
-            else if (object.getUnlocalizedName().contains("necklace"))
-            {
-                if (JewelryNBT.isGemX(object, new ItemStack(Items.ender_pearl)) && JewelryNBT.dimension(object) != -2 && JewelryNBT.playerPosX(object) != -1 && JewelryNBT.playerPosY(object) != -1 && JewelryNBT.playerPosZ(object) != -1)
-                {
-                    double posX = JewelryNBT.playerPosX(object), posY = JewelryNBT.playerPosY(object), posZ = JewelryNBT.playerPosZ(object);
-                    int dimension = JewelryNBT.dimension(object);
-                    for (int i = 0; i < entitiesN.size(); i++)
-                    {
-                        EntityLivingBase entity = (EntityLivingBase) entitiesN.get(i);
-                        if (!JewelryNBT.isDimensionX(object, entity.dimension) && JewelryNBT.isModifierX(object, new ItemStack(Items.bed)))
-                        {
-                            entity.travelToDimension(dimension);
-                            entity.setPositionAndUpdate(posX, posY, posZ);
-                        }
-                        else if (JewelryNBT.isDimensionX(object, entity.dimension)) entity.setPositionAndUpdate(posX, posY, posZ);
-                    }
-                }
-                if (JewelryNBT.isModifierX(object, new ItemStack(Items.dye, 1, 15)))
-                {
-                    for (int i = -3; i <= 3; i++)
-                        for (int j = -1; j <= 1; j++)
-                            for (int k = -3; k <= 3; k++)
-                            {
-                                // if(worldObj.getBlockId(xCoord + i, yCoord +
-                                // j, zCoord + k) == Block.dirt.blockID &&
-                                // (worldObj.getBlockId(xCoord + i, yCoord + j +
-                                // 1, zCoord + k) == 0 ||
-                                // worldObj.getBlockId(xCoord + i, yCoord + j +
-                                // 1, zCoord + k) == Block.crops.blockID) ||
-                                // worldObj.getBlockId(xCoord + i, yCoord + j +
-                                // 1, zCoord + k) == Block.potato.blockID)
-                                // worldObj.setBlock(xCoord + i, yCoord + j,
-                                // zCoord + k, Block.tilledField.blockID);
-                                if (worldObj.getBlock(xCoord + i, yCoord + j, zCoord + k) == Blocks.farmland) worldObj.setBlockMetadataWithNotify(xCoord + i, yCoord + j, zCoord + k, 1, 7);
-                                if (worldObj.getBlock(xCoord + i, yCoord + j, zCoord + k) != Blocks.farmland) worldObj.scheduleBlockUpdate(xCoord + i, yCoord + j, zCoord + k, worldObj.getBlock(xCoord + i, yCoord + j, zCoord + k), 5);
-                                // JewelrycraftUtil.applyBonemeal(object,
-                                // worldObj, xCoord + i, yCoord + j, zCoord + k,
-                                // player);
-                            }
-                }
-            }
-        }
     }
     
+    /**
+     * @return
+     */
+    @Override
     public Packet getDescriptionPacket()
     {
         NBTTagCompound nbttagcompound = new NBTTagCompound();
-        this.writeToNBT(nbttagcompound);
-        return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, nbttagcompound);
+        writeToNBT(nbttagcompound);
+        return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, nbttagcompound);
     }
     
+    /**
+     * @param net
+     * @param packet
+     */
     @Override
     public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet)
     {