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

Conflicts:
	build.gradle

1 files changed, 38 insertions, 11 deletions

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;

+    }

 }