- Working on a GUI showing what curses you get with a description on them

- Added a search bar in the Liquids Tab for easier searching
- Fixed an issue with golden objects giving errors due to missing default texture
- Improved the Infamy Mask to have less parts, thus causing less lag
- Improved ingots and ore detection
- Fixed certain ores when smelted outputting a different ingot
- Necklaces and Rings now render as well
- Updated the guide at the Guide item to have the proper link to the mod as well as mention the right people who helped with it
- Added a list of the ores that work in the guide
- Added a new tab to the guide regarding the ores and the ingots they create
- Changed the stun effect caused by rings with feathers as modifiers to be a potion effect instead

5 files changed, 62 insertions, 2 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
index f5c7848..4c2b425 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
@@ -192,7 +192,7 @@ public abstract class ItemBaseJewelry extends Item
     {
         if (stack.hasTagCompound() && par4){
             ItemStack ingot = JewelryNBT.ingot(stack);
-            if (ingot != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) list.add("Ingot: " + EnumChatFormatting.YELLOW + ingot.getDisplayName());
+            if (ingot != null && Item.getIdFromItem(JewelryNBT.ingot(stack).getItem()) > 0) list.add("Metal: " + EnumChatFormatting.YELLOW + ingot.getDisplayName().replace("Ingot", " "));
             ItemStack gem = JewelryNBT.gem(stack);
             if (gem != null) list.add("Gem: " + EnumChatFormatting.BLUE + gem.getDisplayName());
             ArrayList<ItemStack> modifier = JewelryNBT.modifier(stack);
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
index dae54e7..6d20408 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemGoldObj.java
@@ -52,7 +52,7 @@ public class ItemGoldObj extends Item
     {
         ItemStack item = JewelryNBT.item(stack);
         if (item != null) return item.getIconIndex();
-        return new ItemStack(Blocks.end_portal).getIconIndex();
+        return new ItemStack(Items.golden_apple).getIconIndex();
     }
     
     public String getItemStackDisplayName(ItemStack stack)
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java
index 5c54002..3bd4afe 100644
--- a/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/MaskRender.java
@@ -25,6 +25,8 @@ public class MaskRender extends TileEntitySpecialRenderer
     {
         GL11.glPushMatrix();
         Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+        GL11.glTranslatef(0.1615F, 0F, 0.03F);
+        GL11.glScalef(1.0F, 1.0F, 0.5F);
         mask.render(entity, 0F, 0F, 0F, 0F, 0F, 0.02F);
         GL11.glPopMatrix();
     }
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java
new file mode 100644
index 0000000..e773a14
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/item/render/NecklaceRender.java
@@ -0,0 +1,29 @@
+package darkknight.jewelrycraft.item.render;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+import darkknight.jewelrycraft.model.ModelNeckalce;
+import darkknight.jewelrycraft.util.Variables;
+
+public class NecklaceRender extends TileEntitySpecialRenderer
+{
+    public ModelNeckalce neckalce = new ModelNeckalce();
+    ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Necklace.png");
+    
+    @Override
+    public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
+    {
+    }
+    
+    public void doRender(Entity entity, double x, double y, double z, float f, float g)
+    {
+        GL11.glPushMatrix();
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+        if ((float)z != -1) neckalce.render(entity, 0F, 0F, 0F, (float)z, f, 1.0F);
+        GL11.glPopMatrix();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java
new file mode 100644
index 0000000..084f716
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/item/render/RingRender.java
@@ -0,0 +1,29 @@
+package darkknight.jewelrycraft.item.render;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.entity.Entity;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+import darkknight.jewelrycraft.model.ModelRing;
+import darkknight.jewelrycraft.util.Variables;
+
+public class RingRender extends TileEntitySpecialRenderer
+{
+    public ModelRing ring = new ModelRing();
+    ResourceLocation texture = new ResourceLocation(Variables.MODID, "textures/entities/Ring.png");
+    
+    @Override
+    public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
+    {
+    }
+    
+    public void doRender(Entity entity, double x, double y, double z, float f, float g)
+    {
+        GL11.glPushMatrix();
+        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+        if ((float)z != -1) ring.render(entity, 0F, 0F, 0F, (float)z, f, 1.0F);
+        GL11.glPopMatrix();
+    }
+}
\ No newline at end of file