Update of all changes

10 files changed, 468 insertions, 437 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java
index 24588bd..5b92385 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerCurseInfo.java
@@ -4,20 +4,17 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.ICrafting;
 
-public class ContainerCurseInfo extends Container
-{
-    public ContainerCurseInfo()
-    {}
-    
-    @Override
-    public void addCraftingToCrafters(ICrafting c)
-    {
-        return;
-    }
-    
-    @Override
-    public boolean canInteractWith(EntityPlayer entityplayer)
-    {
-        return true;
-    }
+public class ContainerCurseInfo extends Container {
+	public ContainerCurseInfo() {
+	}
+
+	@Override
+	public void addCraftingToCrafters(ICrafting c) {
+		return;
+	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer entityplayer) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java
index ccb9ca9..fc6c5bf 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerGuide.java
@@ -6,22 +6,20 @@ import net.minecraft.inventory.Container;
 /**
  * User: joel / Date: 16.12.13 / Time: 22:36
  */
-public class ContainerGuide extends Container
-{
-    
-    /**
-     * 
-     */
-    public ContainerGuide()
-    {}
-    
-    /**
-     * @param entityplayer
-     * @return
-     */
-    @Override
-    public boolean canInteractWith(EntityPlayer entityplayer)
-    {
-        return true;
-    }
+public class ContainerGuide extends Container {
+
+	/**
+	 * 
+	 */
+	public ContainerGuide() {
+	}
+
+	/**
+	 * @param entityplayer
+	 * @return
+	 */
+	@Override
+	public boolean canInteractWith(EntityPlayer entityplayer) {
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java
index e749506..652d628 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryModifier.java
@@ -7,41 +7,45 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

-public class ContainerJewelryModifier extends Container

-{    

-    public IInventory modInv;

-    public ContainerJewelryModifier(InventoryPlayer inv, IInventory mod)

-    {        

-        int x, y;

-        modInv = mod;

-        for(x = 0; x < 9; x++)

-            addSlotToContainer(new Slot(inv, x, 26 + 18 * x, 225));

-        for(y = 0; y < 3; y++)

-            for(x = 0; x < 9; x++)

-                addSlotToContainer(new Slot(inv, x + 9 + y * 9, 26 + 18 * x, 167 + y * 18));

-        addSlotToContainer(new Slot(mod, 36, 37, 9));

-    }

-    

-    @Override

-    public boolean canInteractWith(EntityPlayer player)

-    {

-        return true;

-    }

-    

-    @Override

-    public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)

-    {

-        ItemStack itemstack = null;

-        Slot slot = (Slot)inventorySlots.get(par2);

-        if (slot != null && slot.getHasStack()){

-            ItemStack itemstack1 = slot.getStack();

-            itemstack = itemstack1.copy();

-            if (par2 < 27){

-                if (!mergeItemStack(itemstack1, 27, inventorySlots.size(), true)) return null;

-            }else if (!mergeItemStack(itemstack1, 0, 27, false)) return null;

-            if (itemstack1.stackSize == 0) slot.putStack((ItemStack)null);

-            else slot.onSlotChanged();

-        }

-        return itemstack;

-    }

+public class ContainerJewelryModifier extends Container {

+	public IInventory modInv;

+

+	public ContainerJewelryModifier(InventoryPlayer inv, IInventory mod) {

+		int x, y;

+		modInv = mod;

+		for (x = 0; x < 9; x++)

+			addSlotToContainer(new Slot(inv, x, 26 + 18 * x, 225));

+		for (y = 0; y < 3; y++)

+			for (x = 0; x < 9; x++)

+				addSlotToContainer(new Slot(inv, x + 9 + y * 9,

+						26 + 18 * x, 167 + y * 18));

+		addSlotToContainer(new Slot(mod, 36, 37, 9));

+	}

+

+	@Override

+	public boolean canInteractWith(EntityPlayer player) {

+		return true;

+	}

+

+	@Override

+	public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer,

+			int par2) {

+		ItemStack itemstack = null;

+		Slot slot = (Slot) inventorySlots.get(par2);

+		if (slot != null && slot.getHasStack()) {

+			ItemStack itemstack1 = slot.getStack();

+			itemstack = itemstack1.copy();

+			if (par2 < 27) {

+				if (!mergeItemStack(itemstack1, 27, inventorySlots.size(),

+						true))

+					return null;

+			} else if (!mergeItemStack(itemstack1, 0, 27, false))

+				return null;

+			if (itemstack1.stackSize == 0)

+				slot.putStack((ItemStack) null);

+			else

+				slot.onSlotChanged();

+		}

+		return itemstack;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java
index dd12540..3061bfd 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java
@@ -17,98 +17,139 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

-public class ContainerJewelryTab extends Container

-{

-    public ContainerJewelryTab(EntityPlayer player, IInventory inv, IInventory extra)

-    {

-        int x, y;

-        // Rings

-        for(x = 0; x <= 9; x++)

-            addSlotToContainer(new SlotRing(extra, x, 8 + x * 18, 7));

-        // Bracelets

-        for(x = 10; x <= 13; x++)

-            addSlotToContainer(new SlotBracelet(extra, x, 8 + (x - 10) * 18, 26));

-        // Necklaces

-        for(x = 14; x <= 16; x++)

-            addSlotToContainer(new SlotNecklace(extra, x, 8 + (x - 14) * 18, 45));

-        // Earrings

-        addSlotToContainer(new SlotEarrings(extra, 17, 8, 64));

-        // Hotbar

-        for(x = 0; x < 9; ++x)

-            addSlotToContainer(new Slot(inv, x, 17 + x * 18, 142));

-        // Inventory

-        for(x = 0; x < 3; ++x)

-            for(y = 0; y < 9; ++y)

-                addSlotToContainer(new Slot(inv, 9 + y + x * 9, 17 + y * 18, 84 + x * 18));

-    }

-    

-    @Override

-    public boolean canInteractWith(EntityPlayer player)

-    {

-        return true;

-    }

-    

-    public ItemStack slotClick(int slotID, int j, int k, EntityPlayer player)

-    {

-        if (slotID >= 0 && slotID <= 17 && !player.worldObj.isRemote) {

-            try{

-                if (player.inventory.getItemStack() == null && inventoryItemStacks.get(slotID) != null && ((ItemStack)inventoryItemStacks.get(slotID)).getItem() instanceof ItemBaseJewelry)

-                    ((ItemBaseJewelry)((ItemStack)inventoryItemStacks.get(slotID)).getItem()).onJewelryUnequipped((ItemStack)inventoryItemStacks.get(slotID));

-                else if (player.inventory.getItemStack() != null && player.inventory.getItemStack().getItem() instanceof ItemBaseJewelry && inventoryItemStacks.get(slotID) == null)

-                    ((ItemBaseJewelry)player.inventory.getItemStack().getItem()).onJewelryEquipped(player.inventory.getItemStack());

-                if (player.inventory.getItemStack() == null && inventoryItemStacks.get(slotID) != null && ((ItemStack)inventoryItemStacks.get(slotID)).getItem() instanceof IJewelryItem)

-                    ((IJewelryItem)((ItemStack)inventoryItemStacks.get(slotID)).getItem()).onJewelryUnequipped((ItemStack)inventoryItemStacks.get(slotID));

-                else if (player.inventory.getItemStack() != null && player.inventory.getItemStack().getItem() instanceof IJewelryItem && inventoryItemStacks.get(slotID) == null)

-                    ((IJewelryItem)player.inventory.getItemStack().getItem()).onJewelryEquipped(player.inventory.getItemStack());

-            }

-            catch(Exception e){

-                JewelrycraftMod.logger.error("An error has occured while equipping an item.");

-                e.printStackTrace();

-            }

-        }

-        return super.slotClick(slotID, j, k, player);

-    }

-    

-    @Override

-    public ItemStack transferStackInSlot(EntityPlayer player, int slotID)

-    {

-        ItemStack itemstack = null;

-        Slot slot = (Slot)inventorySlots.get(slotID);

-        if (slot != null && slot.getHasStack()) {

-            ItemStack itemstack1 = slot.getStack();

-            itemstack = itemstack1.copy();

-            if (slotID >= 18) {

-                if (itemstack.getItem() instanceof ItemRing || (itemstack.getItem() instanceof IJewelryItem && ((IJewelryItem)itemstack.getItem()).type() == 0)) {

-                    if (!mergeItemStack(itemstack, 0, 10, false) && !slot.getHasStack())

-                        return null;

-                }else  if (itemstack.getItem() instanceof ItemBracelet || (itemstack.getItem() instanceof IJewelryItem && ((IJewelryItem)itemstack.getItem()).type() == 1)) {

-                    if (!mergeItemStack(itemstack, 10, 14, false) && !slot.getHasStack())

-                        return null;

-                }else if (itemstack.getItem() instanceof ItemNecklace || (itemstack.getItem() instanceof IJewelryItem && ((IJewelryItem)itemstack.getItem()).type() == 2)) {

-                    if (!mergeItemStack(itemstack, 14, 17, false) && !slot.getHasStack())

-                        return null;

-                }else if (itemstack.getItem() instanceof ItemEarrings || (itemstack.getItem() instanceof IJewelryItem && ((IJewelryItem)itemstack.getItem()).type() == 3)) {

-                    if (!mergeItemStack(itemstack, 17, 18, false) && !slot.getHasStack())

-                        return null;

-                }else{

-                    if (slotID < 27) {

-                        if (!mergeItemStack(itemstack, 27, 36 + 18, false))

-                            return null;

-                    }else{

-                        if (!mergeItemStack(itemstack, 18, 27, false))

-                            return null;

-                    }

-                }

-            }else

-                if (!mergeItemStack(itemstack, 18, inventorySlots.size(), false))

-                    return null;

-            if (itemstack.stackSize == 0)

-                slot.putStack(null);

-            else slot.onSlotChanged();

-            if (itemstack.stackSize != itemstack.stackSize)

-                slot.onPickupFromSlot(player, itemstack);

-            else return null;

-        }

-        return itemstack;

-    }

+public class ContainerJewelryTab extends Container {

+	public ContainerJewelryTab(EntityPlayer player, IInventory inv,

+			IInventory extra) {

+		int x, y;

+		// Rings

+		for (x = 0; x <= 9; x++)

+			addSlotToContainer(new SlotRing(extra, x, 8 + x * 18, 7));

+		// Bracelets

+		for (x = 10; x <= 13; x++)

+			addSlotToContainer(

+					new SlotBracelet(extra, x, 8 + (x - 10) * 18, 26));

+		// Necklaces

+		for (x = 14; x <= 16; x++)

+			addSlotToContainer(

+					new SlotNecklace(extra, x, 8 + (x - 14) * 18, 45));

+		// Earrings

+		addSlotToContainer(new SlotEarrings(extra, 17, 8, 64));

+		// Hotbar

+		for (x = 0; x < 9; ++x)

+			addSlotToContainer(new Slot(inv, x, 17 + x * 18, 142));

+		// Inventory

+		for (x = 0; x < 3; ++x)

+			for (y = 0; y < 9; ++y)

+				addSlotToContainer(new Slot(inv, 9 + y + x * 9,

+						17 + y * 18, 84 + x * 18));

+	}

+

+	@Override

+	public boolean canInteractWith(EntityPlayer player) {

+		return true;

+	}

+

+	@Override

+	public ItemStack slotClick(int slotID, int j, int k,

+			EntityPlayer player) {

+		if (slotID >= 0 && slotID <= 17 && !player.worldObj.isRemote) {

+			try {

+				if (player.inventory.getItemStack() == null

+						&& inventoryItemStacks.get(slotID) != null

+						&& ((ItemStack) inventoryItemStacks.get(slotID))

+								.getItem() instanceof ItemBaseJewelry)

+					((ItemBaseJewelry) ((ItemStack) inventoryItemStacks

+							.get(slotID)).getItem()).onJewelryUnequipped(

+									(ItemStack) inventoryItemStacks

+											.get(slotID));

+				else if (player.inventory.getItemStack() != null

+						&& player.inventory.getItemStack()

+								.getItem() instanceof ItemBaseJewelry

+						&& inventoryItemStacks.get(slotID) == null)

+					((ItemBaseJewelry) player.inventory.getItemStack()

+							.getItem()).onJewelryEquipped(

+									player.inventory.getItemStack());

+				if (player.inventory.getItemStack() == null

+						&& inventoryItemStacks.get(slotID) != null

+						&& ((ItemStack) inventoryItemStacks.get(slotID))

+								.getItem() instanceof IJewelryItem)

+					((IJewelryItem) ((ItemStack) inventoryItemStacks

+							.get(slotID)).getItem()).onJewelryUnequipped(

+									(ItemStack) inventoryItemStacks

+											.get(slotID));

+				else if (player.inventory.getItemStack() != null

+						&& player.inventory.getItemStack()

+								.getItem() instanceof IJewelryItem

+						&& inventoryItemStacks.get(slotID) == null)

+					((IJewelryItem) player.inventory.getItemStack()

+							.getItem()).onJewelryEquipped(

+									player.inventory.getItemStack());

+			} catch (Exception e) {

+				JewelrycraftMod.logger.error(

+						"An error has occured while equipping an item.");

+				e.printStackTrace();

+			}

+		}

+		return super.slotClick(slotID, j, k, player);

+	}

+

+	@Override

+	public ItemStack transferStackInSlot(EntityPlayer player, int slotID) {

+		ItemStack itemstack = null;

+		Slot slot = (Slot) inventorySlots.get(slotID);

+		if (slot != null && slot.getHasStack()) {

+			ItemStack itemstack1 = slot.getStack();

+			itemstack = itemstack1.copy();

+			if (slotID >= 18) {

+				if (itemstack.getItem() instanceof ItemRing

+						|| (itemstack.getItem() instanceof IJewelryItem

+								&& ((IJewelryItem) itemstack.getItem())

+										.type() == 0)) {

+					if (!mergeItemStack(itemstack, 0, 10, false)

+							&& !slot.getHasStack())

+						return null;

+				} else if (itemstack.getItem() instanceof ItemBracelet

+						|| (itemstack.getItem() instanceof IJewelryItem

+								&& ((IJewelryItem) itemstack.getItem())

+										.type() == 1)) {

+					if (!mergeItemStack(itemstack, 10, 14, false)

+							&& !slot.getHasStack())

+						return null;

+				} else if (itemstack.getItem() instanceof ItemNecklace

+						|| (itemstack.getItem() instanceof IJewelryItem

+								&& ((IJewelryItem) itemstack.getItem())

+										.type() == 2)) {

+					if (!mergeItemStack(itemstack, 14, 17, false)

+							&& !slot.getHasStack())

+						return null;

+				} else if (itemstack.getItem() instanceof ItemEarrings

+						|| (itemstack.getItem() instanceof IJewelryItem

+								&& ((IJewelryItem) itemstack.getItem())

+										.type() == 3)) {

+					if (!mergeItemStack(itemstack, 17, 18, false)

+							&& !slot.getHasStack())

+						return null;

+				} else {

+					if (slotID < 27) {

+						if (!mergeItemStack(itemstack, 27, 36 + 18, false))

+							return null;

+					} else {

+						if (!mergeItemStack(itemstack, 18, 27, false))

+							return null;

+					}

+				}

+			} else if (!mergeItemStack(itemstack, 18,

+					inventorySlots.size(), false))

+				return null;

+			if (itemstack.stackSize == 0)

+				slot.putStack(null);

+			else

+				slot.onSlotChanged();

+			if (itemstack.stackSize != itemstack.stackSize)

+				slot.onPickupFromSlot(player, itemstack);

+			else

+				return null;

+		}

+		return itemstack;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java
index 3d7beb6..e848b38 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerRingChest.java
@@ -8,57 +8,63 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityChest;
 
-public class ContainerRingChest extends Container
-{
-    public TileEntityChest theChest;
-    
-    /**
-     * @param inv
-     * @param chest
-     */
-    public ContainerRingChest(InventoryPlayer inv, TileEntityChest chest)
-    {
-        theChest = chest;
-        int x, y;
-        for(x = 0; x < 9; x++)
-            addSlotToContainer(new SlotRingChest(inv, x, 8 + 18 * x, 142, x == inv.currentItem));
-        for(y = 0; y < 3; y++)
-            for(x = 0; x < 9; x++)
-                addSlotToContainer(new Slot(inv, x + 9 + y * 9, 8 + 18 * x, 84 + y * 18));
-        for(y = 0; y < 3; y++)
-            for(x = 0; x < 9; x++)
-                addSlotToContainer(new SlotRingChest(chest, 26 - (x + y * 9), 8 + 18 * (8 - x), 17 + (2 - y) * 18, false));
-    }
-    
-    /**
-     * @param player
-     * @return
-     */
-    @Override
-    public boolean canInteractWith(EntityPlayer player)
-    {
-        return true;
-    }
-    
-    /**
-     * @param par1EntityPlayer
-     * @param par2
-     * @return
-     */
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2)
-    {
-        ItemStack itemstack = null;
-        Slot slot = (Slot)inventorySlots.get(par2);
-        if (slot != null && slot.getHasStack()){
-            ItemStack itemstack1 = slot.getStack();
-            itemstack = itemstack1.copy();
-            if (par2 < 27){
-                if (!mergeItemStack(itemstack1, 27, inventorySlots.size(), true)) return null;
-            }else if (!mergeItemStack(itemstack1, 0, 27, false)) return null;
-            if (itemstack1.stackSize == 0) slot.putStack((ItemStack)null);
-            else slot.onSlotChanged();
-        }
-        return itemstack;
-    }
+public class ContainerRingChest extends Container {
+	public TileEntityChest theChest;
+
+	/**
+	 * @param inv
+	 * @param chest
+	 */
+	public ContainerRingChest(InventoryPlayer inv, TileEntityChest chest) {
+		theChest = chest;
+		int x, y;
+		for (x = 0; x < 9; x++)
+			addSlotToContainer(new SlotRingChest(inv, x, 8 + 18 * x, 142,
+					x == inv.currentItem));
+		for (y = 0; y < 3; y++)
+			for (x = 0; x < 9; x++)
+				addSlotToContainer(new Slot(inv, x + 9 + y * 9, 8 + 18 * x,
+						84 + y * 18));
+		for (y = 0; y < 3; y++)
+			for (x = 0; x < 9; x++)
+				addSlotToContainer(new SlotRingChest(chest,
+						26 - (x + y * 9), 8 + 18 * (8 - x),
+						17 + (2 - y) * 18, false));
+	}
+
+	/**
+	 * @param player
+	 * @return
+	 */
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return true;
+	}
+
+	/**
+	 * @param par1EntityPlayer
+	 * @param par2
+	 * @return
+	 */
+	@Override
+	public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer,
+			int par2) {
+		ItemStack itemstack = null;
+		Slot slot = (Slot) inventorySlots.get(par2);
+		if (slot != null && slot.getHasStack()) {
+			ItemStack itemstack1 = slot.getStack();
+			itemstack = itemstack1.copy();
+			if (par2 < 27) {
+				if (!mergeItemStack(itemstack1, 27, inventorySlots.size(),
+						true))
+					return null;
+			} else if (!mergeItemStack(itemstack1, 0, 27, false))
+				return null;
+			if (itemstack1.stackSize == 0)
+				slot.putStack((ItemStack) null);
+			else
+				slot.onSlotChanged();
+		}
+		return itemstack;
+	}
 }
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java
index cfd2e20..2f3a9cc 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java
@@ -7,47 +7,44 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

-public class SlotBracelet extends Slot

-{

-    

-    /**

-     * @param tile

-     * @param slotID

-     * @param x

-     * @param y

-     */

-    public SlotBracelet(IInventory tile, int slotID, int x, int y)

-    {

-        super(tile, slotID, x, y);

-    }

-    

-    /**

-     * @param stack

-     * @return

-     */

-    @Override

-    public boolean isItemValid(ItemStack stack)

-    {

-        return stack.getItem() instanceof ItemBracelet || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 1);

-    }

-    

-    /**

-     * @param amount

-     * @return

-     */

-    @Override

-    public ItemStack decrStackSize(int amount)

-    {

-        return super.decrStackSize(amount);

-    }

-    

-    /**

-     * @param player

-     * @return

-     */

-    @Override

-    public boolean canTakeStack(EntityPlayer player)

-    {

-        return true;

-    }

+public class SlotBracelet extends Slot {

+

+	/**

+	 * @param tile

+	 * @param slotID

+	 * @param x

+	 * @param y

+	 */

+	public SlotBracelet(IInventory tile, int slotID, int x, int y) {

+		super(tile, slotID, x, y);

+	}

+

+	/**

+	 * @param stack

+	 * @return

+	 */

+	@Override

+	public boolean isItemValid(ItemStack stack) {

+		return stack.getItem() instanceof ItemBracelet

+				|| (stack.getItem() instanceof IJewelryItem

+						&& ((IJewelryItem) stack.getItem()).type() == 1);

+	}

+

+	/**

+	 * @param amount

+	 * @return

+	 */

+	@Override

+	public ItemStack decrStackSize(int amount) {

+		return super.decrStackSize(amount);

+	}

+

+	/**

+	 * @param player

+	 * @return

+	 */

+	@Override

+	public boolean canTakeStack(EntityPlayer player) {

+		return true;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java
index e0603a3..c563f4d 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java
@@ -7,47 +7,44 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

-public class SlotEarrings extends Slot

-{

-    

-    /**

-     * @param tile

-     * @param slotID

-     * @param x

-     * @param y

-     */

-    public SlotEarrings(IInventory tile, int slotID, int x, int y)

-    {

-        super(tile, slotID, x, y);

-    }

-    

-    /**

-     * @param stack

-     * @return

-     */

-    @Override

-    public boolean isItemValid(ItemStack stack)

-    {

-        return stack.getItem() instanceof ItemEarrings || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 3);

-    }

-    

-    /**

-     * @param amount

-     * @return

-     */

-    @Override

-    public ItemStack decrStackSize(int amount)

-    {

-        return super.decrStackSize(amount);

-    }

-    

-    /**

-     * @param player

-     * @return

-     */

-    @Override

-    public boolean canTakeStack(EntityPlayer player)

-    {

-        return true;

-    }

+public class SlotEarrings extends Slot {

+

+	/**

+	 * @param tile

+	 * @param slotID

+	 * @param x

+	 * @param y

+	 */

+	public SlotEarrings(IInventory tile, int slotID, int x, int y) {

+		super(tile, slotID, x, y);

+	}

+

+	/**

+	 * @param stack

+	 * @return

+	 */

+	@Override

+	public boolean isItemValid(ItemStack stack) {

+		return stack.getItem() instanceof ItemEarrings

+				|| (stack.getItem() instanceof IJewelryItem

+						&& ((IJewelryItem) stack.getItem()).type() == 3);

+	}

+

+	/**

+	 * @param amount

+	 * @return

+	 */

+	@Override

+	public ItemStack decrStackSize(int amount) {

+		return super.decrStackSize(amount);

+	}

+

+	/**

+	 * @param player

+	 * @return

+	 */

+	@Override

+	public boolean canTakeStack(EntityPlayer player) {

+		return true;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java
index 4b810be..ab2d04e 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java
@@ -7,47 +7,44 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

-public class SlotNecklace extends Slot

-{

-    

-    /**

-     * @param tile

-     * @param slotID

-     * @param x

-     * @param y

-     */

-    public SlotNecklace(IInventory tile, int slotID, int x, int y)

-    {

-        super(tile, slotID, x, y);

-    }

-    

-    /**

-     * @param stack

-     * @return

-     */

-    @Override

-    public boolean isItemValid(ItemStack stack)

-    {

-        return stack.getItem() instanceof ItemNecklace || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 2);

-    }

-    

-    /**

-     * @param amount

-     * @return

-     */

-    @Override

-    public ItemStack decrStackSize(int amount)

-    {

-        return super.decrStackSize(amount);

-    }

-    

-    /**

-     * @param player

-     * @return

-     */

-    @Override

-    public boolean canTakeStack(EntityPlayer player)

-    {

-        return true;

-    }

+public class SlotNecklace extends Slot {

+

+	/**

+	 * @param tile

+	 * @param slotID

+	 * @param x

+	 * @param y

+	 */

+	public SlotNecklace(IInventory tile, int slotID, int x, int y) {

+		super(tile, slotID, x, y);

+	}

+

+	/**

+	 * @param stack

+	 * @return

+	 */

+	@Override

+	public boolean isItemValid(ItemStack stack) {

+		return stack.getItem() instanceof ItemNecklace

+				|| (stack.getItem() instanceof IJewelryItem

+						&& ((IJewelryItem) stack.getItem()).type() == 2);

+	}

+

+	/**

+	 * @param amount

+	 * @return

+	 */

+	@Override

+	public ItemStack decrStackSize(int amount) {

+		return super.decrStackSize(amount);

+	}

+

+	/**

+	 * @param player

+	 * @return

+	 */

+	@Override

+	public boolean canTakeStack(EntityPlayer player) {

+		return true;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java
index 4fb9265..6c16509 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java
@@ -7,47 +7,44 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;

 import net.minecraft.item.ItemStack;

 

-public class SlotRing extends Slot

-{

-    

-    /**

-     * @param tile

-     * @param slotID

-     * @param x

-     * @param y

-     */

-    public SlotRing(IInventory tile, int slotID, int x, int y)

-    {

-        super(tile, slotID, x, y);

-    }

-    

-    /**

-     * @param stack

-     * @return

-     */

-    @Override

-    public boolean isItemValid(ItemStack stack)

-    {

-        return stack.getItem() instanceof ItemRing || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 0);

-    }

-    

-    /**

-     * @param amount

-     * @return

-     */

-    @Override

-    public ItemStack decrStackSize(int amount)

-    {

-        return super.decrStackSize(amount);

-    }

-    

-    /**

-     * @param player

-     * @return

-     */

-    @Override

-    public boolean canTakeStack(EntityPlayer player)

-    {

-        return true;

-    }

+public class SlotRing extends Slot {

+

+	/**

+	 * @param tile

+	 * @param slotID

+	 * @param x

+	 * @param y

+	 */

+	public SlotRing(IInventory tile, int slotID, int x, int y) {

+		super(tile, slotID, x, y);

+	}

+

+	/**

+	 * @param stack

+	 * @return

+	 */

+	@Override

+	public boolean isItemValid(ItemStack stack) {

+		return stack.getItem() instanceof ItemRing

+				|| (stack.getItem() instanceof IJewelryItem

+						&& ((IJewelryItem) stack.getItem()).type() == 0);

+	}

+

+	/**

+	 * @param amount

+	 * @return

+	 */

+	@Override

+	public ItemStack decrStackSize(int amount) {

+		return super.decrStackSize(amount);

+	}

+

+	/**

+	 * @param player

+	 * @return

+	 */

+	@Override

+	public boolean canTakeStack(EntityPlayer player) {

+		return true;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java
index 8cc5431..72c149d 100644..100755
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRingChest.java
@@ -5,51 +5,48 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-public class SlotRingChest extends Slot
-{
-    public boolean locked = false;
-    
-    /**
-     * @param tile
-     * @param slotID
-     * @param x
-     * @param y
-     * @param locked
-     */
-    public SlotRingChest(IInventory tile, int slotID, int x, int y, boolean locked)
-    {
-        super(tile, slotID, x, y);
-        this.locked = locked;
-    }
-    
-    /**
-     * @param stack
-     * @return
-     */
-    @Override
-    public boolean isItemValid(ItemStack stack)
-    {
-        return !locked;
-    }
-    
-    /**
-     * @param amount
-     * @return
-     */
-    @Override
-    public ItemStack decrStackSize(int amount)
-    {
-        if (!locked) return super.decrStackSize(amount);
-        return null;
-    }
-    
-    /**
-     * @param player
-     * @return
-     */
-    @Override
-    public boolean canTakeStack(EntityPlayer player)
-    {
-        return !locked;
-    }
+public class SlotRingChest extends Slot {
+	public boolean locked = false;
+
+	/**
+	 * @param tile
+	 * @param slotID
+	 * @param x
+	 * @param y
+	 * @param locked
+	 */
+	public SlotRingChest(IInventory tile, int slotID, int x, int y,
+			boolean locked) {
+		super(tile, slotID, x, y);
+		this.locked = locked;
+	}
+
+	/**
+	 * @param stack
+	 * @return
+	 */
+	@Override
+	public boolean isItemValid(ItemStack stack) {
+		return !locked;
+	}
+
+	/**
+	 * @param amount
+	 * @return
+	 */
+	@Override
+	public ItemStack decrStackSize(int amount) {
+		if (!locked)
+			return super.decrStackSize(amount);
+		return null;
+	}
+
+	/**
+	 * @param player
+	 * @return
+	 */
+	@Override
+	public boolean canTakeStack(EntityPlayer player) {
+		return !locked;
+	}
 }