- 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

1 files changed, 59 insertions, 60 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java
index a5ae240..82af0de 100644
--- a/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/BlockEventHandler.java
@@ -1,60 +1,59 @@
-/**
- * 
- */
-package darkknight.jewelrycraft.events;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemPickaxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.api.Curse;
-import darkknight.jewelrycraft.block.BlockMidasTouch;
-import darkknight.jewelrycraft.tileentity.TileEntityMidasTouch;
-import darkknight.jewelrycraft.util.PlayerUtils;
-import darkknight.jewelrycraft.util.Variables;
-
-/**
- * @author Sorin
- */
-public class BlockEventHandler
-{
-    @SubscribeEvent
-    public void onBlockDestroyed(BlockEvent.BreakEvent event)
-    {
-        if (event.getPlayer() != null){
-            ItemStack item = event.getPlayer().inventory.getCurrentItem();
-            if (event.block instanceof BlockMidasTouch && item != null && item.getItem().getHarvestLevel(item, "pickaxe") >= event.block.getHarvestLevel(event.blockMetadata)){
-                TileEntityMidasTouch te = (TileEntityMidasTouch)event.world.getTileEntity(event.x, event.y, event.z);
-                if (te.target != null) dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, new ItemStack(Items.gold_nugget, (int)(te.target.width * te.target.height * 100), 0));
-            }
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(event.getPlayer(), Variables.MODID);
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0) curse.onBlockDestroyed(event.getPlayer(), event);
-        }
-    }
-    
-    @SubscribeEvent
-    public void onBlockItemsDrop(BlockEvent.HarvestDropsEvent event)
-    {
-        EntityPlayer player = event.harvester;
-        if (player != null){
-            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
-            for(Curse curse: Curse.getCurseList())
-                if (playerInfo.getInteger(curse.getName()) > 0) curse.onBlockItemsDrop(player, event);
-        }
-    }
-    
-    public void dropItem(World world, double x, double y, double z, ItemStack stack)
-    {
-        EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack);
-        entityitem.motionX = 0;
-        entityitem.motionZ = 0;
-        entityitem.motionY = 0.11000000298023224D;
-        world.spawnEntityInWorld(entityitem);
-    }
-}
+/**

+ * 

+ */

+package darkknight.jewelrycraft.events;

+

+import cpw.mods.fml.common.eventhandler.SubscribeEvent;

+import darkknight.jewelrycraft.api.Curse;

+import darkknight.jewelrycraft.block.BlockMidasTouch;

+import darkknight.jewelrycraft.tileentity.TileEntityMidasTouch;

+import darkknight.jewelrycraft.util.PlayerUtils;

+import darkknight.jewelrycraft.util.Variables;

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

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

+import net.minecraft.init.Items;

+import net.minecraft.item.ItemStack;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.world.World;

+import net.minecraftforge.event.world.BlockEvent;

+

+/**

+ * @author Sorin

+ */

+public class BlockEventHandler

+{

+    @SubscribeEvent

+    public void onBlockDestroyed(BlockEvent.BreakEvent event)

+    {

+        if (event.getPlayer() != null){

+            ItemStack item = event.getPlayer().inventory.getCurrentItem();

+            if (event.block instanceof BlockMidasTouch && item != null && item.getItem().getHarvestLevel(item, "pickaxe") >= event.block.getHarvestLevel(event.blockMetadata)){

+                TileEntityMidasTouch te = (TileEntityMidasTouch)event.world.getTileEntity(event.x, event.y, event.z);

+                if (te.target != null) dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, new ItemStack(Items.gold_nugget, (int)(te.target.width * te.target.height * 100), 0));

+            }

+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(event.getPlayer(), Variables.MODID);

+            for(Curse curse: Curse.getCurseList())

+                if (playerInfo.getInteger(curse.getName()) > 0) curse.onBlockDestroyed(event.getPlayer(), event);

+        }

+    }

+    

+    @SubscribeEvent

+    public void onBlockItemsDrop(BlockEvent.HarvestDropsEvent event)

+    {

+        EntityPlayer player = event.harvester;

+        if (player != null){

+            NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

+            for(Curse curse: Curse.getCurseList())

+                if (playerInfo.getInteger(curse.getName()) > 0) curse.onBlockItemsDrop(player, event);

+        }

+    }

+    

+    public void dropItem(World world, double x, double y, double z, ItemStack stack)

+    {

+        EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack);

+        entityitem.motionX = 0;

+        entityitem.motionZ = 0;

+        entityitem.motionY = 0.11000000298023224D;

+        world.spawnEntityInWorld(entityitem);

+    }

+}