- Added EE3 EMC values, thank you to MineMarteen for providing the ThirdPartyManager code :)

- Working on making it possible to translate every part of the mod
- Created an interface modders can use to make an item wearable in the jewelry inventory and have special effects

5 files changed, 13 insertions, 25 deletions

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 3b323e6..634782c 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/ContainerJewelryTab.java
@@ -5,6 +5,7 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.api.IJewelryItem;
 import darkknight.jewelrycraft.client.gui.container.slots.SlotBracelet;
 import darkknight.jewelrycraft.client.gui.container.slots.SlotEarrings;
 import darkknight.jewelrycraft.client.gui.container.slots.SlotNecklace;
@@ -67,29 +68,14 @@ public class ContainerJewelryTab extends Container
         if (slot != null && slot.getHasStack()){
             ItemStack itemstack1 = slot.getStack();
             itemstack = itemstack1.copy();
-            // if (slotID < 18){
-            // if (!mergeItemStack(itemstack1, 18, 54, true)) return null;
-            // slot.onSlotChange(itemstack1, itemstack);
-            // }else if (itemstack1.getItem() instanceof ItemRing){
-            // if (!mergeItemStack(itemstack1, 0, 10, false)) return null;
-            // }else if (itemstack1.getItem() instanceof ItemBracelet){
-            // if (!mergeItemStack(itemstack1, 10, 14, false)) return null;
-            // }else if (itemstack1.getItem() instanceof ItemNecklace){
-            // if (!mergeItemStack(itemstack1, 14, 17, false)) return null;
-            // }else if (itemstack1.getItem() instanceof ItemEarrings){
-            // if (!mergeItemStack(itemstack1, 17, 18, false)) return null;
-            // }else{
-            // if (!mergeItemStack(itemstack1, 18, 54, true)) return null;
-            // slot.onSlotChange(itemstack1, itemstack);
-            // }
             if (slotID >= 18){
-                if (itemstack.getItem() instanceof ItemRing){
+                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){
+                }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 ){
+                }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){
+                }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{
@@ -104,8 +90,6 @@ public class ContainerJewelryTab extends Container
             else slot.onSlotChanged();
             if (itemstack.stackSize != itemstack.stackSize) slot.onPickupFromSlot(player, itemstack);
             else 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 3bdbb64..bab265b 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotBracelet.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.api.IJewelryItem;
 import darkknight.jewelrycraft.item.ItemBracelet;
 
 public class SlotBracelet extends Slot
@@ -27,7 +28,7 @@ public class SlotBracelet extends Slot
     @Override
     public boolean isItemValid(ItemStack stack)
     {
-        return stack.getItem() instanceof ItemBracelet;
+        return stack.getItem() instanceof ItemBracelet || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 1);
     }
     
     /**
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 de062bc..c968fc0 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotEarrings.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.api.IJewelryItem;
 import darkknight.jewelrycraft.item.ItemEarrings;
 
 public class SlotEarrings extends Slot
@@ -27,7 +28,7 @@ public class SlotEarrings extends Slot
     @Override
     public boolean isItemValid(ItemStack stack)
     {
-        return stack.getItem() instanceof ItemEarrings;
+        return stack.getItem() instanceof ItemEarrings || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 3);
     }
     
     /**
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 9a64079..d102ba8 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotNecklace.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.api.IJewelryItem;
 import darkknight.jewelrycraft.item.ItemNecklace;
 
 public class SlotNecklace extends Slot
@@ -27,7 +28,7 @@ public class SlotNecklace extends Slot
     @Override
     public boolean isItemValid(ItemStack stack)
     {
-        return stack.getItem() instanceof ItemNecklace;
+        return stack.getItem() instanceof ItemNecklace || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 2);
     }
     
     /**
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 a52cf6b..6a7e956 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/container/slots/SlotRing.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
+import darkknight.jewelrycraft.api.IJewelryItem;
 import darkknight.jewelrycraft.item.ItemRing;
 
 public class SlotRing extends Slot
@@ -27,7 +28,7 @@ public class SlotRing extends Slot
     @Override
     public boolean isItemValid(ItemStack stack)
     {
-        return stack.getItem() instanceof ItemRing;
+        return stack.getItem() instanceof ItemRing || (stack.getItem() instanceof IJewelryItem && ((IJewelryItem)stack.getItem()).type() == 0);
     }
     
     /**