- 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

4 files changed, 66 insertions, 66 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
index d1fbe87..cefd063 100644
--- a/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/ComponentJewelry.java
@@ -2,6 +2,16 @@ package darkknight.jewelrycraft.worldGen.village;
 

 import java.util.List;

 import java.util.Random;

+import darkknight.jewelrycraft.block.BlockList;

+import darkknight.jewelrycraft.config.ConfigHandler;

+import darkknight.jewelrycraft.item.ItemList;

+import darkknight.jewelrycraft.item.ItemMolds;

+import darkknight.jewelrycraft.tileentity.TileEntityDisplayer;

+import darkknight.jewelrycraft.tileentity.TileEntityMolder;

+import darkknight.jewelrycraft.tileentity.TileEntitySmelter;

+import darkknight.jewelrycraft.util.JewelryNBT;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

+import darkknight.jewelrycraft.util.Variables;

 import net.minecraft.block.Block;

 import net.minecraft.init.Blocks;

 import net.minecraft.init.Items;

@@ -15,16 +25,6 @@ import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;

 import net.minecraft.world.gen.structure.StructureVillagePieces;

 import net.minecraft.world.gen.structure.StructureVillagePieces.Start;

-import darkknight.jewelrycraft.block.BlockList;

-import darkknight.jewelrycraft.config.ConfigHandler;

-import darkknight.jewelrycraft.item.ItemList;

-import darkknight.jewelrycraft.item.ItemMolds;

-import darkknight.jewelrycraft.tileentity.TileEntityDisplayer;

-import darkknight.jewelrycraft.tileentity.TileEntityMolder;

-import darkknight.jewelrycraft.tileentity.TileEntitySmelter;

-import darkknight.jewelrycraft.util.JewelryNBT;

-import darkknight.jewelrycraft.util.JewelrycraftUtil;

-import darkknight.jewelrycraft.util.Variables;

 

 public class ComponentJewelry extends StructureVillagePieces.House1 {

 	private int	averageGroundLevel	= -1;

diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
index 3a31a8f..f9b5930 100644
--- a/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/JCTrades.java
@@ -1,6 +1,12 @@
 package darkknight.jewelrycraft.worldGen.village;

 

 import java.util.Random;

+import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;

+import darkknight.jewelrycraft.block.BlockList;

+import darkknight.jewelrycraft.item.ItemList;

+import darkknight.jewelrycraft.item.ItemMolds;

+import darkknight.jewelrycraft.util.JewelryNBT;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

 import net.minecraft.entity.passive.EntityVillager;

 import net.minecraft.init.Blocks;

 import net.minecraft.init.Items;

@@ -8,12 +14,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

 import net.minecraft.village.MerchantRecipe;

 import net.minecraft.village.MerchantRecipeList;

-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;

-import darkknight.jewelrycraft.block.BlockList;

-import darkknight.jewelrycraft.item.ItemList;

-import darkknight.jewelrycraft.item.ItemMolds;

-import darkknight.jewelrycraft.util.JewelryNBT;

-import darkknight.jewelrycraft.util.JewelrycraftUtil;

 

 public class JCTrades implements IVillageTradeHandler

 {

diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java
index 5ef855e..68b892e 100644
--- a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageHandler.java
@@ -4,11 +4,11 @@
 package darkknight.jewelrycraft.worldGen.village;

 

 import java.io.IOException;

-import net.minecraft.world.gen.structure.MapGenStructureIO;

 import cpw.mods.fml.common.event.FMLPreInitializationEvent;

 import cpw.mods.fml.common.registry.VillagerRegistry;

 import darkknight.jewelrycraft.JewelrycraftMod;

 import darkknight.jewelrycraft.util.Variables;

+import net.minecraft.world.gen.structure.MapGenStructureIO;

 

 public class VillageHandler

 {

diff --git a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java
index d860db7..dca3b6e 100644
--- a/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/worldGen/village/VillageJewelryHandler.java
@@ -1,50 +1,50 @@
-package darkknight.jewelrycraft.worldGen.village;
-
-import java.util.List;
-import java.util.Random;
-import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight;
-import net.minecraft.world.gen.structure.StructureVillagePieces.Start;
-import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler;
-import darkknight.jewelrycraft.config.ConfigHandler;
-
-public class VillageJewelryHandler implements IVillageCreationHandler
-{
-    
-    /**
-     * @param random
-     * @param i
-     * @return
-     */
-    @Override
-    public PieceWeight getVillagePieceWeight(Random random, int i)
-    {
-        return new PieceWeight(ComponentJewelry.class, ConfigHandler.JEWELER_WEIGHT, ConfigHandler.MAX_VILLAGE_JEWELERS);
-    }
-    
-    /**
-     * @return
-     */
-    @Override
-    public Class<?> getComponentClass()
-    {
-        return ComponentJewelry.class;
-    }
-    
-    /**
-     * @param villagePiece
-     * @param startPiece
-     * @param pieces
-     * @param random
-     * @param p1
-     * @param p2
-     * @param p3
-     * @param p4
-     * @param p5
-     * @return
-     */
-    @Override
-    public Object buildComponent(PieceWeight villagePiece, Start startPiece, @SuppressWarnings ("rawtypes") List pieces, Random random, int p1, int p2, int p3, int p4, int p5)
-    {
-        return ComponentJewelry.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5);
-    }
+package darkknight.jewelrycraft.worldGen.village;

+

+import java.util.List;

+import java.util.Random;

+import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler;

+import darkknight.jewelrycraft.config.ConfigHandler;

+import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight;

+import net.minecraft.world.gen.structure.StructureVillagePieces.Start;

+

+public class VillageJewelryHandler implements IVillageCreationHandler

+{

+    

+    /**

+     * @param random

+     * @param i

+     * @return

+     */

+    @Override

+    public PieceWeight getVillagePieceWeight(Random random, int i)

+    {

+        return new PieceWeight(ComponentJewelry.class, ConfigHandler.JEWELER_WEIGHT, ConfigHandler.MAX_VILLAGE_JEWELERS);

+    }

+    

+    /**

+     * @return

+     */

+    @Override

+    public Class<?> getComponentClass()

+    {

+        return ComponentJewelry.class;

+    }

+    

+    /**

+     * @param villagePiece

+     * @param startPiece

+     * @param pieces

+     * @param random

+     * @param p1

+     * @param p2

+     * @param p3

+     * @param p4

+     * @param p5

+     * @return

+     */

+    @Override

+    public Object buildComponent(PieceWeight villagePiece, Start startPiece, @SuppressWarnings ("rawtypes") List pieces, Random random, int p1, int p2, int p3, int p4, int p5)

+    {

+        return ComponentJewelry.buildComponent(startPiece, pieces, random, p1, p2, p3, p4, p5);

+    }

 }
\ No newline at end of file