- 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

5 files changed, 178 insertions, 181 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java
index 34e8364..b7ab07d 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java
@@ -1,11 +1,11 @@
 package darkknight.jewelrycraft.network;

 

-import io.netty.buffer.ByteBuf;

-import net.minecraft.entity.player.EntityPlayer;

 import cpw.mods.fml.common.network.simpleimpl.IMessage;

 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;

 import cpw.mods.fml.common.network.simpleimpl.MessageContext;

 import darkknight.jewelrycraft.JewelrycraftMod;

+import io.netty.buffer.ByteBuf;

+import net.minecraft.entity.player.EntityPlayer;

 

 public class PacketKeyPressEvent implements IMessage, IMessageHandler<PacketKeyPressEvent, IMessage>

 {

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java
index 0e48968..f8df419 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java
@@ -1,43 +1,43 @@
-package darkknight.jewelrycraft.network;
-
-import io.netty.buffer.ByteBuf;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import darkknight.jewelrycraft.util.PlayerUtils;
-import darkknight.jewelrycraft.util.Variables;
-
-public class PacketRequestPlayerInfo implements IMessage, IMessageHandler<PacketRequestPlayerInfo, IMessage>
-{
-    
-    /**
-     * 
-     */
-    public PacketRequestPlayerInfo()
-    {}
-    
-    /**
-     * @param message
-     * @param ctx
-     * @return
-     */
-    @Override
-    public IMessage onMessage(PacketRequestPlayerInfo message, MessageContext ctx)
-    {
-        return new PacketSendClientPlayerInfo(PlayerUtils.getModPlayerPersistTag(ctx.getServerHandler().playerEntity, Variables.MODID));
-    }
-    
-    /**
-     * @param buf
-     */
-    @Override
-    public void fromBytes(ByteBuf buf)
-    {}
-    
-    /**
-     * @param buf
-     */
-    @Override
-    public void toBytes(ByteBuf buf)
-    {}
-}
+package darkknight.jewelrycraft.network;

+

+import cpw.mods.fml.common.network.simpleimpl.IMessage;

+import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;

+import cpw.mods.fml.common.network.simpleimpl.MessageContext;

+import darkknight.jewelrycraft.util.PlayerUtils;

+import darkknight.jewelrycraft.util.Variables;

+import io.netty.buffer.ByteBuf;

+

+public class PacketRequestPlayerInfo implements IMessage, IMessageHandler<PacketRequestPlayerInfo, IMessage>

+{

+    

+    /**

+     * 

+     */

+    public PacketRequestPlayerInfo()

+    {}

+    

+    /**

+     * @param message

+     * @param ctx

+     * @return

+     */

+    @Override

+    public IMessage onMessage(PacketRequestPlayerInfo message, MessageContext ctx)

+    {

+        return new PacketSendClientPlayerInfo(PlayerUtils.getModPlayerPersistTag(ctx.getServerHandler().playerEntity, Variables.MODID));

+    }

+    

+    /**

+     * @param buf

+     */

+    @Override

+    public void fromBytes(ByteBuf buf)

+    {}

+    

+    /**

+     * @param buf

+     */

+    @Override

+    public void toBytes(ByteBuf buf)

+    {}

+}

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java
index 79b92f2..d06bfc0 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java
@@ -1,64 +1,62 @@
-/**
- * 
- */
-package darkknight.jewelrycraft.network;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import io.netty.buffer.ByteBuf;
-import cpw.mods.fml.common.network.ByteBufUtils;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import darkknight.jewelrycraft.client.gui.container.ContainerJewelryModifier;
-import darkknight.jewelrycraft.client.gui.container.ContainerJewelryTab;
-
-/**
- * @author Sorin
- *
- */
-public class PacketRequestSetSlot implements IMessage, IMessageHandler<PacketRequestSetSlot, IMessage>
-{
-    ItemStack stack;
-    
-    public PacketRequestSetSlot()
-    {}
-    
-    public PacketRequestSetSlot(ItemStack stack)
-    {
-        this.stack = stack;
-    }
-
-    /**
-     * @param message
-     * @param ctx
-     * @return
-     */
-    @Override
-    public IMessage onMessage(PacketRequestSetSlot message, MessageContext ctx)
-    {
-        if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerJewelryModifier)
-        {
-            ((ContainerJewelryModifier)ctx.getServerHandler().playerEntity.openContainer).modInv.setInventorySlotContents(36, message.stack);
-        }
-        return null;
-    }
-
-    /**
-     * @param buf
-     */
-    @Override
-    public void fromBytes(ByteBuf buf)
-    {
-        stack = ByteBufUtils.readItemStack(buf);
-    }
-
-    /**
-     * @param buf
-     */
-    @Override
-    public void toBytes(ByteBuf buf)
-    {
-        ByteBufUtils.writeItemStack(buf, stack);
-    }
-}
+/**

+ * 

+ */

+package darkknight.jewelrycraft.network;

+

+import cpw.mods.fml.common.network.ByteBufUtils;

+import cpw.mods.fml.common.network.simpleimpl.IMessage;

+import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;

+import cpw.mods.fml.common.network.simpleimpl.MessageContext;

+import darkknight.jewelrycraft.client.gui.container.ContainerJewelryModifier;

+import io.netty.buffer.ByteBuf;

+import net.minecraft.item.ItemStack;

+

+/**

+ * @author Sorin

+ *

+ */

+public class PacketRequestSetSlot implements IMessage, IMessageHandler<PacketRequestSetSlot, IMessage>

+{

+    ItemStack stack;

+    

+    public PacketRequestSetSlot()

+    {}

+    

+    public PacketRequestSetSlot(ItemStack stack)

+    {

+        this.stack = stack;

+    }

+

+    /**

+     * @param message

+     * @param ctx

+     * @return

+     */

+    @Override

+    public IMessage onMessage(PacketRequestSetSlot message, MessageContext ctx)

+    {

+        if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerJewelryModifier)

+        {

+            ((ContainerJewelryModifier)ctx.getServerHandler().playerEntity.openContainer).modInv.setInventorySlotContents(36, message.stack);

+        }

+        return null;

+    }

+

+    /**

+     * @param buf

+     */

+    @Override

+    public void fromBytes(ByteBuf buf)

+    {

+        stack = ByteBufUtils.readItemStack(buf);

+    }

+

+    /**

+     * @param buf

+     */

+    @Override

+    public void toBytes(ByteBuf buf)

+    {

+        ByteBufUtils.writeItemStack(buf, stack);

+    }

+}

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java
index 5c391cd..c8bf0aa 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java
@@ -1,12 +1,12 @@
 package darkknight.jewelrycraft.network;

 

-import io.netty.buffer.ByteBuf;

-import net.minecraft.nbt.NBTTagCompound;

 import cpw.mods.fml.common.network.ByteBufUtils;

 import cpw.mods.fml.common.network.simpleimpl.IMessage;

 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;

 import cpw.mods.fml.common.network.simpleimpl.MessageContext;

 import darkknight.jewelrycraft.events.ScreenHandler;

+import io.netty.buffer.ByteBuf;

+import net.minecraft.nbt.NBTTagCompound;

 

 public class PacketSendClientPlayerInfo implements IMessage, IMessageHandler<PacketSendClientPlayerInfo, IMessage>

 {

diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
index c87bf81..bcf58ea 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
@@ -1,70 +1,69 @@
-/**
- * 
- */
-package darkknight.jewelrycraft.network;
-
-import io.netty.buffer.ByteBuf;
-import java.util.Iterator;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import cpw.mods.fml.common.network.ByteBufUtils;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import darkknight.jewelrycraft.events.PlayerRenderHandler;
-import darkknight.jewelrycraft.util.PlayerUtils;
-import darkknight.jewelrycraft.util.Variables;
-
-/**
- * @author Sorin
- *
- */
-public class PacketSendServerPlayersInfo implements IMessage, IMessageHandler<PacketSendServerPlayersInfo, IMessage>
-{
-    public PacketSendServerPlayersInfo() 
-    {
-        
-    }
-    
-    /**
-     * @param message
-     * @param ctx
-     * @return
-     */
-    @Override
-    public IMessage onMessage(PacketSendServerPlayersInfo message, MessageContext ctx)
-    {
-        return null;
-    }
-
-    /**
-     * @param buf
-     */
-    @Override
-    public void fromBytes(ByteBuf buf)
-    {
-        NBTTagCompound temp = ByteBufUtils.readTag(buf);
-        if (temp != null)
-            PlayerRenderHandler.playersInfo = temp;
-        else
-            PlayerRenderHandler.playersInfo = new NBTTagCompound();
-    }
-
-    /**
-     * @param buf
-     */
-    @Override
-    public void toBytes(ByteBuf buf)
-    {
-        Iterator<EntityPlayer> players = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator();
-        String infamyPlayers = "";
-        NBTTagCompound nbt = new NBTTagCompound();
-        while (players.hasNext())
-        {
-            EntityPlayer current = players.next();
-            nbt.setTag(current.getDisplayName(), PlayerUtils.getModPlayerPersistTag(current, Variables.MODID));
-        }
-        ByteBufUtils.writeTag(buf, nbt);
-    }
-}
+/**

+ * 

+ */

+package darkknight.jewelrycraft.network;

+

+import java.util.Iterator;

+import cpw.mods.fml.common.network.ByteBufUtils;

+import cpw.mods.fml.common.network.simpleimpl.IMessage;

+import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;

+import cpw.mods.fml.common.network.simpleimpl.MessageContext;

+import darkknight.jewelrycraft.events.PlayerRenderHandler;

+import darkknight.jewelrycraft.util.PlayerUtils;

+import darkknight.jewelrycraft.util.Variables;

+import io.netty.buffer.ByteBuf;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.server.MinecraftServer;

+

+/**

+ * @author Sorin

+ *

+ */

+public class PacketSendServerPlayersInfo implements IMessage, IMessageHandler<PacketSendServerPlayersInfo, IMessage>

+{

+    public PacketSendServerPlayersInfo() 

+    {

+        

+    }

+    

+    /**

+     * @param message

+     * @param ctx

+     * @return

+     */

+    @Override

+    public IMessage onMessage(PacketSendServerPlayersInfo message, MessageContext ctx)

+    {

+        return null;

+    }

+

+    /**

+     * @param buf

+     */

+    @Override

+    public void fromBytes(ByteBuf buf)

+    {

+        NBTTagCompound temp = ByteBufUtils.readTag(buf);

+        if (temp != null)

+            PlayerRenderHandler.playersInfo = temp;

+        else

+            PlayerRenderHandler.playersInfo = new NBTTagCompound();

+    }

+

+    /**

+     * @param buf

+     */

+    @Override

+    public void toBytes(ByteBuf buf)

+    {

+        Iterator<EntityPlayer> players = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator();

+        NBTTagCompound nbt = new NBTTagCompound();

+        while (players.hasNext())

+        {

+            EntityPlayer current = players.next();

+            nbt.setTag(current.getDisplayName(), PlayerUtils.getModPlayerPersistTag(current, Variables.MODID));

+        }

+        ByteBufUtils.writeTag(buf, nbt);

+    }

+}