- Fixed all of the bugs mentioned on github

- Added new config options
- Rabbits paw now increases the chance of spawning hearts, rather than
itself spawning some
- Hearts now have a much lower chance to spawn by default
- You can no longer increase your health past 20 hearts (aka double the
default health)
- The guide now also shows the total number of pages on each tab
- A new luck stat has been added to the Curse API
- Cleaned up the code a bit (removed unused methods, imports etc)
- The displayer's info now has a purple solid color background; the text
also has a much closer shadow and now shrinks in height as well as in
width when too big
- I have modified the potion list to use Mithion's code, credits have
been given

7 files changed, 76 insertions, 80 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java
index 3162061..fa56a5b 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ItemStackModelRenderer.java
@@ -1,71 +1,71 @@
-package darkknight.jewelrycraft.model;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-/**
- * @author Paul Fulham (pau101)
- */
-public class ItemStackModelRenderer extends ModelRenderer
-{
-    private RenderItem renderItem;
-    private TextureManager textureManager;
-    private ResourceLocation resetResourceLocation;
-    private EntityItem entityItem;
-    private Minecraft mc;
-    
-    /**
-     * @param modelBase
-     * @param resetResourceLocation
-     */
-    public ItemStackModelRenderer(ModelBase modelBase, ResourceLocation resetResourceLocation)
-    {
-        super(modelBase);
-        renderItem = (RenderItem)RenderManager.instance.entityRenderMap.get(EntityItem.class);
-        textureManager = (mc = Minecraft.getMinecraft()).getTextureManager();
-        this.resetResourceLocation = resetResourceLocation;
-    }
-    
-    /**
-     * @param itemStack
-     */
-    public void setItemStack(ItemStack itemStack)
-    {
-        if (itemStack == null || itemStack.getItem() == null) entityItem = null;
-        else{
-            entityItem = new EntityItem(null, 0, 0, 0, itemStack);
-            entityItem.hoverStart = 0;
-        }
-    }
-    
-    /**
-     * @param scale
-     */
-    @Override
-    public void render(float scale)
-    {
-        if (!isHidden && showModel && entityItem != null){
-            if (textureManager == null) textureManager = mc.getTextureManager();
-            GL11.glPushMatrix();
-            GL11.glTranslatef(offsetX, offsetY, offsetZ);
-            GL11.glTranslatef(rotationPointX * scale, rotationPointY * scale, rotationPointZ * scale);
-            GL11.glRotatef(rotateAngleZ * (180 / (float)Math.PI), 0, 0, 1);
-            GL11.glRotatef(rotateAngleY * (180 / (float)Math.PI), 0, 1, 0);
-            GL11.glRotatef(rotateAngleX * (180 / (float)Math.PI), 1, 0, 0);
-            boolean fancyGraphics = mc.gameSettings.fancyGraphics;
-            mc.gameSettings.fancyGraphics = true;
-            renderItem.doRender(entityItem, 0, 0, 0, 0, 0);
-            mc.gameSettings.fancyGraphics = fancyGraphics;
-            GL11.glPopMatrix();
-            textureManager.bindTexture(resetResourceLocation);
-        }
-    }
+package darkknight.jewelrycraft.model;

+

+import org.lwjgl.opengl.GL11;

+import net.minecraft.client.Minecraft;

+import net.minecraft.client.model.ModelBase;

+import net.minecraft.client.model.ModelRenderer;

+import net.minecraft.client.renderer.entity.RenderItem;

+import net.minecraft.client.renderer.entity.RenderManager;

+import net.minecraft.client.renderer.texture.TextureManager;

+import net.minecraft.entity.item.EntityItem;

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.ResourceLocation;

+

+/**

+ * @author Paul Fulham (pau101)

+ */

+public class ItemStackModelRenderer extends ModelRenderer

+{

+    private RenderItem renderItem;

+    private TextureManager textureManager;

+    private ResourceLocation resetResourceLocation;

+    private EntityItem entityItem;

+    private Minecraft mc;

+    

+    /**

+     * @param modelBase

+     * @param resetResourceLocation

+     */

+    public ItemStackModelRenderer(ModelBase modelBase, ResourceLocation resetResourceLocation)

+    {

+        super(modelBase);

+        renderItem = (RenderItem)RenderManager.instance.entityRenderMap.get(EntityItem.class);

+        textureManager = (mc = Minecraft.getMinecraft()).getTextureManager();

+        this.resetResourceLocation = resetResourceLocation;

+    }

+    

+    /**

+     * @param itemStack

+     */

+    public void setItemStack(ItemStack itemStack)

+    {

+        if (itemStack == null || itemStack.getItem() == null) entityItem = null;

+        else{

+            entityItem = new EntityItem(null, 0, 0, 0, itemStack);

+            entityItem.hoverStart = 0;

+        }

+    }

+    

+    /**

+     * @param scale

+     */

+    @Override

+    public void render(float scale)

+    {

+        if (!isHidden && showModel && entityItem != null){

+            if (textureManager == null) textureManager = mc.getTextureManager();

+            GL11.glPushMatrix();

+            GL11.glTranslatef(offsetX, offsetY, offsetZ);

+            GL11.glTranslatef(rotationPointX * scale, rotationPointY * scale, rotationPointZ * scale);

+            GL11.glRotatef(rotateAngleZ * (180 / (float)Math.PI), 0, 0, 1);

+            GL11.glRotatef(rotateAngleY * (180 / (float)Math.PI), 0, 1, 0);

+            GL11.glRotatef(rotateAngleX * (180 / (float)Math.PI), 1, 0, 0);

+            boolean fancyGraphics = mc.gameSettings.fancyGraphics;

+            mc.gameSettings.fancyGraphics = true;

+            renderItem.doRender(entityItem, 0, 0, 0, 0, 0);

+            mc.gameSettings.fancyGraphics = fancyGraphics;

+            GL11.glPopMatrix();

+            textureManager.bindTexture(resetResourceLocation);

+        }

+    }

 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java
index 0323c1d..6326569 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelBracelet.java
@@ -1,11 +1,9 @@
 package darkknight.jewelrycraft.model;
 
-import java.awt.Color;
+import org.lwjgl.opengl.GL11;
 import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import org.lwjgl.opengl.GL11;
 
 /**
  * ModelBiped - Either Mojang or a mod author Created using Tabula 4.1.1
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java
index 065b87b..c26d76e 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelDisplayer.java
@@ -1,9 +1,9 @@
 package darkknight.jewelrycraft.model;
 
+import org.lwjgl.opengl.GL11;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import org.lwjgl.opengl.GL11;
 
 public class ModelDisplayer extends ModelBase
 {
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java
index 312bd17..0fc16b0 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelHandPedestal.java
@@ -1,5 +1,7 @@
 package darkknight.jewelrycraft.model;
 
+import com.pau101.util.CubicBezier;
+import darkknight.jewelrycraft.tileentity.TileEntityHandPedestal;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.item.Item;
@@ -7,8 +9,6 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import com.pau101.util.CubicBezier;
-import darkknight.jewelrycraft.tileentity.TileEntityHandPedestal;
 
 /**
  * @author Paul Fulham (pau101)
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java
index ed754ef..7fec995 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelNeckalce.java
@@ -1,9 +1,9 @@
 package darkknight.jewelrycraft.model;
 
+import org.lwjgl.opengl.GL11;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import org.lwjgl.opengl.GL11;
 
 /**
  * ModelNeckalce - OnyxDarkKnight Created using Tabula 4.1.1
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java
index babb171..d15c095 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ModelRing.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelRing.java
@@ -1,9 +1,9 @@
 package darkknight.jewelrycraft.model;
 
+import org.lwjgl.opengl.GL11;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import org.lwjgl.opengl.GL11;
 
 /**
  * ModelRing - OnyxDarkKnight Created using Tabula 4.1.1
diff --git a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java
index 1962aa8..e0067cd 100644
--- a/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java
+++ b/src/main/java/darkknight/jewelrycraft/model/ModelShadowEye.java
@@ -6,11 +6,9 @@
 package darkknight.jewelrycraft.model;
 
 import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Vec3;
 
 public class ModelShadowEye extends ModelBase {
 	// fields