Merge branch '1.7.10' of https://github.com/sor1n/Modjam-Mod.git into 1.7.10

Conflicts:
	build.gradle

18 files changed, 202 insertions, 63 deletions

diff --git a/build.gradle b/build.gradle
index c9f6adb..087188c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ apply plugin: 'curseforge'
 

 project.ext {

 	massive = "1"

-    major = "1"

-    minor = "3"

+    major = "1"
+    minor = "4"
     mcVersion = "1.7.10"

 	ee3Version = "0.3.505"

 	alpacaVersion = "1.2"

diff --git a/src/.classpath b/src/.classpath
index 8bb2410..ea2f0aa 100644
--- a/src/.classpath
+++ b/src/.classpath
@@ -6,5 +6,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/Minecraft"/>

 	<classpathentry kind="lib" path="H:/Jewelrycraft/1.7.10/libs/EquivalentExchange3-1.7.10-0.3.505.jar"/>

 	<classpathentry kind="lib" path="H:/Jewelrycraft/1.7.10/libs/NotEnoughItems-1.7.10-1.0.4.95-universal.jar"/>

+	<classpathentry kind="lib" path="H:/Jewelrycraft/1.7.10/libs/Waila-1.5.10_1.7.10.jar"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/src/.settings/org.eclipse.core.resources.prefs b/src/.settings/org.eclipse.core.resources.prefs
index 372d901..cd3347e 100644
--- a/src/.settings/org.eclipse.core.resources.prefs
+++ b/src/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1

 encoding//main/resources/assets/jewelrycraft2/lang/en_US.lang=UTF-8

+encoding//main/resources/assets/jewelrycraft2/lang/zh_CN.lang=UTF-8

diff --git a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
index 908aaf6..2328c0b 100644
--- a/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/src/main/java/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -7,10 +7,8 @@ package darkknight.jewelrycraft;
 

 import java.io.File;

 import java.io.IOException;

-

 import org.apache.logging.log4j.Level;

 import org.apache.logging.log4j.Logger;

-

 import cpw.mods.fml.common.Mod;

 import cpw.mods.fml.common.Mod.EventHandler;

 import cpw.mods.fml.common.Mod.Instance;

@@ -21,18 +19,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;

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

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

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

 import darkknight.jewelrycraft.achievements.AchievementsList;

 import darkknight.jewelrycraft.block.BlockList;

-import darkknight.jewelrycraft.client.gui.GuiTab;

-import darkknight.jewelrycraft.client.gui.GuiTabBlocks;

-import darkknight.jewelrycraft.client.gui.GuiTabGemsAndIngots;

-import darkknight.jewelrycraft.client.gui.GuiTabIntroduction;

-import darkknight.jewelrycraft.client.gui.GuiTabItems;

-import darkknight.jewelrycraft.client.gui.GuiTabModifiers;

-import darkknight.jewelrycraft.client.gui.GuiTabOresToIngots;

-import darkknight.jewelrycraft.client.gui.GuiTabRitual;

 import darkknight.jewelrycraft.commands.JewelrycraftCommands;

 import darkknight.jewelrycraft.config.ConfigHandler;

 import darkknight.jewelrycraft.curses.CurseList;

@@ -44,12 +32,17 @@ import darkknight.jewelrycraft.potions.PotionList;
 import darkknight.jewelrycraft.proxy.CommonProxy;

 import darkknight.jewelrycraft.recipes.CraftingRecipes;

 import darkknight.jewelrycraft.thirdparty.ThirdPartyManager;

+import darkknight.jewelrycraft.util.JewelryNBT;

 import darkknight.jewelrycraft.util.Variables;

 import darkknight.jewelrycraft.worldGen.ChestGeneration;

 import darkknight.jewelrycraft.worldGen.village.VillageHandler;

 import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.init.Items;

 import net.minecraft.item.Item;

+import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

+import net.minecraftforge.fluids.FluidContainerRegistry;

+import net.minecraftforge.fluids.FluidStack;

 

 @Mod (modid = Variables.MODID, name = Variables.MODNAME, version = Variables.VERSION, guiFactory = Variables.CONFIG_GUI, acceptedMinecraftVersions = "[1.7.10,1.8)")

 public class JewelrycraftMod

@@ -116,7 +109,8 @@ public class JewelrycraftMod
         logger.log(Level.INFO, "Registering Potions");

         PotionList.init(e);

         logger.log(Level.INFO, "Loading Third Party Mods");

-        ThirdPartyManager.instance().init();

+        ThirdPartyManager.instance().init();      

+        FMLInterModComms.sendMessage("Waila", "register", "darkknight.jewelrycraft.thirdparty.WailaHandler.registration");      

     }

     

     @EventHandler

diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockList.java b/src/main/java/darkknight/jewelrycraft/block/BlockList.java
index 032797c..9d3a54b 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockList.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockList.java
@@ -44,6 +44,7 @@ public class BlockList
         moltenMetalFluid = new Fluid("metal.molten").setLuminosity(15).setDensity(3000).setTemperature(2000).setViscosity(6000);

         if (!FluidRegistry.registerFluid(moltenMetalFluid)) moltenMetalFluid = FluidRegistry.getFluid("metal.molten");

         moltenMetal = new BlockMoltenMetal(moltenMetalFluid, Material.lava);

+        moltenMetalFluid.setBlock(moltenMetal);

         crystal = new BlockCrystal().setHardness(2.0F).setResistance(5.0F).setStepSound(Block.soundTypeGlass).setBlockTextureName(Variables.MODID + ":blockCrystal").setBlockName(Variables.MODID + ".blockCrystal").setCreativeTab(JewelrycraftMod.jewelrycraft);

         

         GameRegistry.registerBlock(shadowOre, "shadowOre");

diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
index cd24deb..3c9b680 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -64,7 +64,7 @@ public class BlockSmelter extends BlockContainer {
 				int quant = (int) (te.quantity * 10);

 				ItemStack metalBucket = new ItemStack(ItemList.bucket);

 				JewelryNBT.addMetal(metalBucket, te.moltenMetal.copy());

-				if (quant == 9){

+				if (quant == 9) {

 					dropItem(world, i, j, k, new ItemStack(Blocks.cobblestone, 6));

 					dropItem(world, i, j, k, new ItemStack(Items.lava_bucket));

 					dropItem(world, i, j, k, metalBucket);

@@ -73,7 +73,7 @@ public class BlockSmelter extends BlockContainer {
 			world.removeTileEntity(i, j, k);

 		}

 	}

-	

+

 	@Override

 	public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) {

 		TileEntitySmelter te = (TileEntitySmelter) world.getTileEntity(i, j, k);

diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
index 9c5d7be..a083f57 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java
@@ -87,7 +87,7 @@ public class GuiJewelryModifier extends GuiContainer {
 		if (this.searchField.textboxKeyTyped(character, key)) {

 			int items = 0;

 			for (ItemStack item : JewelrycraftUtil.objects)

-				if (item != null && searchField.getText() != "" && item.getItem() != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++;

+				if (item != null && searchField != null && searchField.getText() != "" && item.getItem() != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++;

 			maxPages = items / 48 + 1;

 			page = 1;

 			this.pages.setText(page + "/" + maxPages);

diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java
index 12239e5..290c8ae 100644
--- a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java
@@ -30,6 +30,9 @@ public class ConfigHandler
     public static int GEM_CHEST_MAX;

     public static int FURNACE_MIN_INGOT_STACK;

     public static int FURNACE_MAX_INGOT_STACK;

+ 

+    public static int MAX_BLACK_HEARTS_PICKUP;

+    public static int MAX_BLUE_HEARTS_PICKUP;

 

     public static boolean CRYSTAL_GLOW;

     public static boolean CRYSTAL_PARTICLES;

@@ -86,6 +89,8 @@ public class ConfigHandler
         CRYSTAL_PARTICLES = config.getBoolean("Crystal Particles", categories[2], true, "If false, then crystal will no longer spawn particles");

         HEARTS_DESPAWN = config.getBoolean("Hearts Despawn", categories[2], true, "If false, then Hearts and Half-hearts will no longer despawn");

         JEWELRY_INFO = config.getBoolean("Jewelry Info", categories[2], true, "If false, then extra info won't be show when hovering over a jewelery.");

+        MAX_BLACK_HEARTS_PICKUP = config.getInt("Max Black Hearts Pickup", categories[2], Integer.MAX_VALUE, 0, Integer.MAX_VALUE, "Determines how many black hearts can a player pick up.");

+        MAX_BLUE_HEARTS_PICKUP = config.getInt("Max Blue Hearts Pickup", categories[2], Integer.MAX_VALUE, 0, Integer.MAX_VALUE, "Determines how many blue hearts can a player pick up.");

         

         ENABLE_WORLD_GEN = config.getBoolean("World Generation", categories[3], true, "If false, nothing will generate (this includes ore)");

         ORE_GEN = config.getBoolean("Ore Generation", categories[3], true, "If false, ores won't generate");

diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
index 7f547bb..84d1ee4 100644
--- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java
@@ -53,8 +53,6 @@ public class EntityHeart extends EntityLiving {
 		super.collideWithEntity(entity);

 		if (!this.worldObj.isRemote && entity instanceof EntityHeart && getType().equals(((EntityHeart) entity).getType())) {

 			setQuantity(getQuantity() + ((EntityHeart) entity).getQuantity());

-			getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity() + ((EntityHeart) entity).getQuantity());

-			this.heal(getQuantity());

 			entity.setDead();

 		}

 	}

@@ -76,10 +74,10 @@ public class EntityHeart extends EntityLiving {
 				} else if (getType().equals("White") && playerInfo.getFloat("WhiteHeart") > 0.1F) {

 					playerInfo.setFloat(getType() + "Heart", 0F);

 					player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);

-	                player.setHealth(player.getHealth() + 2f);

+	                		player.setHealth(player.getHealth() + 2f);

 					JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player);

 					this.setDead();

-				} else if (!getType().equals("Red")) {

+				} else if (!getType().equals("Red") && ((getType().equals("Black") && playerInfo.getFloat("BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP) || (getType().equals("Blue") && playerInfo.getFloat("BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP))) {

 					if(playerInfo.hasKey(getType() + "Heart")) playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity());

 					else playerInfo.setFloat(getType() + "Heart", getQuantity());					

 					JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player);

diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index d6f60ae..c3b35a9 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -227,7 +227,7 @@ public class EntityEventHandler {
 			else if (playerInfo.getFloat("BlackHeart") > 0) {

 				AxisAlignedBB axisalignedbb = player.boundingBox.expand(3.0D, 0.0D, 3.0D);

 				List enemies = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, axisalignedbb);

-				if (enemies != null && !enemies.isEmpty()) {

+				if (enemies != null && !enemies.isEmpty() && event.source != DamageSourceList.blackHeart) {

 					Iterator iterator = enemies.iterator();

 					while (iterator.hasNext()) {

 						Entity enemy = (Entity) iterator.next();

@@ -374,4 +374,4 @@ public class EntityEventHandler {
 		}

 		if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo());

 	}

-}
\ No newline at end of file
+}

diff --git a/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
new file mode 100644
index 0000000..e570da6
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/events/TextureEvent.java
@@ -0,0 +1,19 @@
+package darkknight.jewelrycraft.events;
+
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import darkknight.jewelrycraft.block.BlockList;
+import net.minecraftforge.client.event.TextureStitchEvent;
+
+public class TextureEvent
+{
+    @SubscribeEvent
+    @SideOnly(Side.CLIENT)
+    public void textureFix(TextureStitchEvent.Post e)
+    {
+        if (e.map.getTextureType() == 0)
+            BlockList.moltenMetalFluid.setIcons(BlockList.moltenMetal.getBlockTextureFromSide(0));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java
index e7dbb33..1f6dab1 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemTest.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemTest.java
@@ -1,29 +1,33 @@
 package darkknight.jewelrycraft.item;

 

 import java.util.List;

-import net.minecraft.block.Block;

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

+import darkknight.jewelrycraft.JewelrycraftMod;

+import darkknight.jewelrycraft.achievements.AchievementsList;

+import darkknight.jewelrycraft.api.Curse;

+import darkknight.jewelrycraft.item.ItemSpawnEgg.EggData;

+import darkknight.jewelrycraft.util.Variables;

+import net.minecraft.block.material.Material;

 import net.minecraft.client.renderer.texture.IIconRegister;

 import net.minecraft.creativetab.CreativeTabs;

 import net.minecraft.entity.player.EntityPlayer;

-import net.minecraft.init.Blocks;

-import net.minecraft.init.Items;

 import net.minecraft.item.Item;

-import net.minecraft.item.ItemFood;

 import net.minecraft.item.ItemStack;

-import net.minecraft.util.EnumChatFormatting;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

 import net.minecraft.util.IIcon;

 import net.minecraft.util.MathHelper;

-import net.minecraft.util.StatCollector;

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

-import darkknight.jewelrycraft.api.Curse;

-import darkknight.jewelrycraft.util.JewelryNBT;

-import darkknight.jewelrycraft.util.Variables;

+import net.minecraft.util.MovingObjectPosition;

+import net.minecraft.util.MovingObjectPosition.MovingObjectType;

+import net.minecraft.world.World;

 

 public class ItemTest extends Item

 {

     @SideOnly (Side.CLIENT)

     private IIcon[] icons;

+    private NBTTagCompound nbt = new NBTTagCompound();

+    private TileEntity test = new TileEntity();

     

     public ItemTest()

     {

@@ -51,4 +55,27 @@ public class ItemTest extends Item
         for(int i = 0; i < Curse.getCurseList().size(); ++i)

         	icons[i] = par1IconRegister.registerIcon(Variables.MODID + ":" + "testItem_" + i);

     }

+    

+    @Override

+    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)

+    {

+		MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, true);

+		if (mop != null && mop.typeOfHit == MovingObjectType.BLOCK) {

+			int x = mop.blockX, y = mop.blockY, z = mop.blockZ;

+			TileEntity tile = world.getTileEntity(x, y, z);

+	        if(tile != null)

+	        	if(!player.isSneaking()) tile.writeToNBT(nbt);

+	        	else{

+	        		NBTTagCompound block = new NBTTagCompound();

+	        		tile.writeToNBT(block);

+		        	nbt.setString("id", block.getString("id"));

+		        	nbt.setInteger("x", tile.xCoord);

+		        	nbt.setInteger("y", tile.yCoord);

+		        	nbt.setInteger("z", tile.zCoord);

+		        	tile.readFromNBT(nbt);

+		            world.func_147479_m(x, y, z);

+	        	}

+		}

+        return stack;

+    }

 }

diff --git a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
index 0923817..88807a7 100644
--- a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
+++ b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
@@ -1,12 +1,6 @@
 package darkknight.jewelrycraft.proxy;

 

-import net.minecraft.client.Minecraft;

-import net.minecraft.item.Item;

-import net.minecraftforge.client.MinecraftForgeClient;

-import net.minecraftforge.common.MinecraftForge;

-

 import org.apache.logging.log4j.Level;

-

 import cpw.mods.fml.client.registry.ClientRegistry;

 import cpw.mods.fml.client.registry.RenderingRegistry;

 import cpw.mods.fml.common.FMLCommonHandler;

@@ -24,6 +18,7 @@ import darkknight.jewelrycraft.entities.renders.HeartRender;
 import darkknight.jewelrycraft.events.KeyBindings;

 import darkknight.jewelrycraft.events.PlayerRenderHandler;

 import darkknight.jewelrycraft.events.ScreenHandler;

+import darkknight.jewelrycraft.events.TextureEvent;

 import darkknight.jewelrycraft.item.ItemList;

 import darkknight.jewelrycraft.item.render.ItemRender;

 import darkknight.jewelrycraft.model.ModelDisplayer;

@@ -53,6 +48,10 @@ import darkknight.jewelrycraft.tileentity.renders.TileEntityShadowHandRender;
 import darkknight.jewelrycraft.tileentity.renders.TileEntitySmelterRender;

 import darkknight.jewelrycraft.util.JewelrycraftUtil;

 import darkknight.jewelrycraft.util.Variables;

+import net.minecraft.client.Minecraft;

+import net.minecraft.item.Item;

+import net.minecraftforge.client.MinecraftForgeClient;

+import net.minecraftforge.common.MinecraftForge;

 

 public class ClientProxy extends CommonProxy

 {

@@ -118,6 +117,7 @@ public class ClientProxy extends CommonProxy
     public void init()

     {

         FMLCommonHandler.instance().bus().register(new KeyBindings());

+        MinecraftForge.EVENT_BUS.register(new TextureEvent());

     }

     

     @Override

diff --git a/src/main/java/darkknight/jewelrycraft/thirdparty/WailaHandler.java b/src/main/java/darkknight/jewelrycraft/thirdparty/WailaHandler.java
new file mode 100644
index 0000000..d86f00a
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/thirdparty/WailaHandler.java
@@ -0,0 +1,59 @@
+package darkknight.jewelrycraft.thirdparty;
+
+import java.util.List;
+
+import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.tileentity.TileEntityMoltenMetal;
+import darkknight.jewelrycraft.util.JewelryNBT;
+import mcp.mobius.waila.api.IWailaConfigHandler;
+import mcp.mobius.waila.api.IWailaDataAccessor;
+import mcp.mobius.waila.api.IWailaDataProvider;
+import mcp.mobius.waila.api.IWailaRegistrar;
+import mcp.mobius.waila.api.SpecialChars;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class WailaHandler implements IWailaDataProvider{
+
+	@Override
+	public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
+		TileEntityMoltenMetal te = (TileEntityMoltenMetal)accessor.getTileEntity();
+		ItemStack is = new ItemStack(ItemList.metal);
+		JewelryNBT.addMetal(is, te.getMetal());
+		return is;
+	}
+
+	@Override
+	public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		TileEntityMoltenMetal te = (TileEntityMoltenMetal)accessor.getTileEntity();
+		String metalName =  SpecialChars.WHITE + "Molten " + te.getMetal().getDisplayName();
+		currenttip.remove(0);
+		currenttip.add(0, metalName);
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	@Override
+	public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,	IWailaConfigHandler config) {
+		return currenttip;
+	}
+
+	public static void registration(IWailaRegistrar registrar){
+		registrar.registerStackProvider(new WailaHandler(), TileEntityMoltenMetal.class);
+		registrar.registerHeadProvider(new WailaHandler(), TileEntityMoltenMetal.class);
+	}
+
+	@Override
+	public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound nbt, World world, int x, int y, int z) 
+	{
+		return null;
+	}
+	
+}
diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index 0279b58..4342907 100644
--- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -121,7 +121,7 @@ public class JewelrycraftUtil {
 				items.removeAll(items);

 			}

 			catch (Exception e) {

-				JewelrycraftMod.logger.info("Error, tried to add subtypes of item " + ((Item) item).getUnlocalizedName() + "\nItem is not added in the list.");

+				JewelrycraftMod.logger.info("Error, tried to add color of the item " + ((Item) item).getUnlocalizedName() + " but it failed.");

 			}

 		}

 	}

diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java
index 15d4d9e..4ced1ea 100644
--- a/src/main/java/darkknight/jewelrycraft/util/Variables.java
+++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java
@@ -8,7 +8,7 @@ public class Variables
     

     public static final String MODID = "jewelrycraft2";

     public static final String MODNAME = "Jewelrycraft 2";

-    public static final String VERSION = "1.1.3";

+    public static final String VERSION = "1.1.4";

     public static final String PACKET_CHANNEL = "jewelrycraft2";

     

     public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory";

diff --git a/src/main/resources/assets/jewelrycraft2/TODO.txt b/src/main/resources/assets/jewelrycraft2/TODO.txt
deleted file mode 100644
index e69de29..0000000
--- a/src/main/resources/assets/jewelrycraft2/TODO.txt
+++ /dev/null
diff --git a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang
index f5695f6..ae56c16 100644
--- a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang
+++ b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang
@@ -16,25 +16,11 @@ item.jewelrycraft2.bracelet.name=手镯
 item.jewelrycraft2.earrings.name=耳环
 item.jewelrycraft2.guide.name=珠宝工艺2手册
 item.jewelrycraft2.bucket.name=熔融
+item.jewelrycraft2.test.name=Chuck TestTa
 
-item.jewelrycraft2.crystal.0.name=黑色水晶
-item.jewelrycraft2.crystal.1.name=红色水晶
-item.jewelrycraft2.crystal.2.name=绿色水晶
-item.jewelrycraft2.crystal.3.name=棕色水晶
-item.jewelrycraft2.crystal.4.name=蓝色水晶
-item.jewelrycraft2.crystal.5.name=紫色水晶
-item.jewelrycraft2.crystal.6.name=青色水晶
-item.jewelrycraft2.crystal.7.name=浅灰色水晶
-item.jewelrycraft2.crystal.8.name=灰色水晶
-item.jewelrycraft2.crystal.9.name=粉色水晶
-item.jewelrycraft2.crystal.10.name=黄绿色水晶
-item.jewelrycraft2.crystal.11.name=黄色水晶
-item.jewelrycraft2.crystal.12.name=淡蓝色水晶
-item.jewelrycraft2.crystal.13.name=品红色水晶
-item.jewelrycraft2.crystal.14.name=橙色水晶
-item.jewelrycraft2.crystal.15.name=白色水晶
 item.jewelrycraft2.jewelryModifier.name=珠宝强化石(创造)
 item.jewelrycraft2.goldObject.name=闪金物品
+item.jewelrycraft2.structureGen.name=Structure Generator
 
 item.jewelrycraft2.goldObject.info.standard=闪闪发光,但并没有什么用处 :(
 item.jewelrycraft2.goldObject.info.food=它是用金子制作的! 你想怎么吃它?
@@ -42,6 +28,7 @@ item.jewelrycraft2.thievingGloves.info.extra=按 <SHIFT> 查看更多信息.
 item.jewelrycraft2.thievingGloves.info.1=潜行时手持护手
 item.jewelrycraft2.thievingGloves.info.2=对准村民右键来
 item.jewelrycraft2.thievingGloves.info.3=偷窃其物品
+item.jewelrycraft2.monsterPlacer.name=生成 %s
 
 tile.jewelrycraft2.oreShadow.name=暗影矿石
 tile.jewelrycraft2.blockShadow.name=暗影方块
@@ -57,6 +44,23 @@ tile.jewelrycraft2.shadowEye.name=诅咒之眼
 tile.jewelrycraft2.handPedestal.name=石手基座
 tile.jewelrycraft2.midasTouchBlock.name=黄金生物
 
+tile.jewelrycraft2.blockCrystal.0.name=黑色水晶
+tile.jewelrycraft2.blockCrystal.1.name=红色水晶
+tile.jewelrycraft2.blockCrystal.2.name=绿色水晶
+tile.jewelrycraft2.blockCrystal.3.name=棕色水晶
+tile.jewelrycraft2.blockCrystal.4.name=蓝色水晶
+tile.jewelrycraft2.blockCrystal.5.name=紫色水晶
+tile.jewelrycraft2.blockCrystal.6.name=青色水晶
+tile.jewelrycraft2.blockCrystal.7.name=浅灰色水晶
+tile.jewelrycraft2.blockCrystal.8.name=灰色水晶
+tile.jewelrycraft2.blockCrystal.9.name=粉色水晶
+tile.jewelrycraft2.blockCrystal.10.name=黄绿色水晶
+tile.jewelrycraft2.blockCrystal.11.name=黄色水晶
+tile.jewelrycraft2.blockCrystal.12.name=淡蓝色水晶
+tile.jewelrycraft2.blockCrystal.13.name=品红色水晶
+tile.jewelrycraft2.blockCrystal.14.name=橙色水晶
+tile.jewelrycraft2.blockCrystal.15.name=白色水晶
+
 itemGroup.jewelrycraft2=珠宝工艺2
 itemGroup.Liquids=珠宝工艺|液体
 
@@ -104,23 +108,43 @@ chatmessage.jewelrycraft2.endereye.1=你感觉到一些
 chatmessage.jewelrycraft2.endereye.2=在你周围.
 chatmessage.jewelrycraft2.feather=项链能够保护你不受到伤害!
 
+chatmessage.jewelrycraft2.heartKilled.Red=GG!你刚刚击杀了价值很高的生物! MURDERER! 当你走上去时红心会治疗你 >:c
+chatmessage.jewelrycraft2.heartKilled.White=GG!你刚刚击杀了价值很高的生物! MURDERER! 如果你收集到两颗半心你会得到一颗心的额外生命 >:c
+chatmessage.jewelrycraft2.heartKilled.Blue=GG!你刚刚击杀了价值很高的生物! MURDERER! 蓝心将会保护红心, 走上前即可, 不要杀了他们 >:c
+chatmessage.jewelrycraft2.heartKilled.Black=GG!你刚刚击杀了价值很高的生物! MURDERER! 黑心同蓝心一样, 但它们会对攻击者造成伤害 >:c 
+
 curse.jewelrycraft2.blind.description=你眼前的光亮正在渐渐的消退
 curse.jewelrycraft2.flamingsoul.description=就我一个人感觉到越来越热了么?
 curse.jewelrycraft2.greed.description=你可能以后才会需要它
-curse.jewelrycraft2.humblebundle.description=买一送一
+curse.jewelrycraft2.humblebundle.description=两份的价格和一份一样
 curse.jewelrycraft2.infamy.description=你都干了些什么?!
 curse.jewelrycraft2.midastouch.description=小心事与愿违...
-curse.jewelrycraft2.pentagram.description=黑暗领主喜欢用神秘的方式来表示他对你的喜爱.
-curse.jewelrycraft2.rabbitspaw.description=这是黑暗领主赐予你的礼物.不要弄丢了.
+curse.jewelrycraft2.pentagram.description=黑暗领主喜欢用神秘的方式来表示他对你的喜爱
+curse.jewelrycraft2.rabbitspaw.description=这是黑暗领主赐予你的礼物.不要弄丢了
 curse.jewelrycraft2.rottenheart.description=你的内心正在慢慢地腐烂
 curse.jewelrycraft2.vampirehunger.description=你极度的渴望鲜血
+curse.jewelrycraft2.deathsTouch.description=死亡的来临势不可挡
+
+curse.jewelrycraft2.blind=致盲
+curse.jewelrycraft2.flamingsoul=灵魂灼烧
+curse.jewelrycraft2.greed=贪婪之心
+curse.jewelrycraft2.humblebundle=买一送一
+curse.jewelrycraft2.infamy=声名狼藉
+curse.jewelrycraft2.midastouch=点石成金
+curse.jewelrycraft2.pentagram=五芒星
+curse.jewelrycraft2.rabbitspaw=兔脚
+curse.jewelrycraft2.rottenheart=腐朽之心
+curse.jewelrycraft2.vampirehunger=嗜血成性
+curse.jewelrycraft2.deathsTouch=死亡之触
+
+curse.jewelrycraft2.activated=你受到了诅咒, 按住C键查看激活的诅咒.
 
 death.attack.weak=%1$s 被珠宝削弱最终导致死亡
 death.attack.shadows=%1$s 被暗影吞噬了
 death.attack.blackHeart=%1$s 被 %2$s's 的诅咒杀死了
 
 entity.jewelrycraft2.Heart.name=心
-entity.jewelrycraft2.Half-Heart.name=半心
+entity.jewelrycraft2.HalfHeart.name=半心
 
 jewelrycraft2.potion.stun=眩晕
 
@@ -146,3 +170,13 @@ guide.jewelrycraft2.tab.items=物品
 guide.jewelrycraft2.tab.modifiers=强化材料
 guide.jewelrycraft2.tab.oretoingot=矿物与对应金属锭
 guide.jewelrycraft2.tab.ritual=仪式相关
+guide.jewelrycraft2.tab.curses=诅咒
+
+bucket.unknown=一桶未知液体
+
+achievement.jewelrycraft.openGuide=一个全新的世界
+achievement.jewelrycraft.openGuide.desc=打开珠宝工艺2指南
+achievement.jewelrycraft.pentagram=拒绝诱惑
+achievement.jewelrycraft.pentagram.desc=§4挑战:§7 当五芒星诅咒激活时, 一天之内不偷取生物生命. §a奖励:§7 在五芒星诅咒激活时, 你将能够从生物处永久偷取一颗心.
+
+challenge.failed=挑战失败: