From b3275e5f8e2870e3813218a43ec92700d8987bf5 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 17 Dec 2017 00:50:14 -0500 Subject: [PATCH] pusing current code --- .../blocks/Crucibles/NBTCrucible.java | 22 +++++++------ .../primal/forgecraft/items/ItemCrucible.java | 31 ++----------------- 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java index 77cc34b4..6cb69f08 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Crucibles/NBTCrucible.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; +import nmd.primal.core.common.helper.NBTHelper; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.core.common.helper.WorldHelper; import nmd.primal.forgecraft.ModInfo; @@ -51,6 +52,12 @@ public class NBTCrucible extends Block implements ITileEntityProvider { //crucibleIngredients.apply(new ItemStack(Blocks.IRON_ORE, 1)); } + @Override + public ItemStack getItem(World world, BlockPos pos, IBlockState state) + { + return NBTHelper.getStackBlockNBT(world, pos, state, super.getItem(world, pos, state)); + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { @@ -60,13 +67,8 @@ public class NBTCrucible extends Block implements ITileEntityProvider { ItemStack pItem1 = new ItemStack(pItem.getItem(), 1); if(pItem.isEmpty()){ if(!player.isSneaking()) { - ItemStack tempStack = new ItemStack(ModItems.itemcrucible, 1); - tempStack.setTagCompound(new NBTTagCompound()); - NBTTagCompound recipe = new NBTTagCompound(); - recipe.setTag("Items", recipe); - ItemStackHelper.saveAllItems(recipe, tile.ingList); - //tempStack.writeToNBT(tempNBT); - PlayerHelper.spawnItemOnPlayer(world, player, tempStack); + + PlayerHelper.playerTakeItem(world, pos, EnumFacing.DOWN, player, this.getItem(world, pos, state)); world.setBlockToAir(pos); } } @@ -98,10 +100,10 @@ public class NBTCrucible extends Block implements ITileEntityProvider { return false; } - @Override + /*@Override public void breakBlock(World world, BlockPos pos, IBlockState state) { - if (!world.isRemote) { + /*if (!world.isRemote) { TileNBTCrucible tile = (TileNBTCrucible) world.getTileEntity(pos); for (int i = 0; i < tile.ingList.size(); i++) { if (!tile.ingList.get(i).isEmpty()) { @@ -111,7 +113,7 @@ public class NBTCrucible extends Block implements ITileEntityProvider { } } world.removeTileEntity(pos); - } + }*/ /*@Override public void onBlockDestroyedByPlayer(World world, BlockPos pos, IBlockState state) diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java index 6429638a..4c4af328 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/ItemCrucible.java @@ -33,32 +33,7 @@ public class ItemCrucible extends Item { this.setNoRepair(); } - @Override - public void onCreated(ItemStack item, World world, EntityPlayer playerIn) { - - if(!world.isRemote) { - if (!item.hasTagCompound()) { - item.setTagCompound(new NBTTagCompound()); - NBTTagCompound recipe = new NBTTagCompound(); - recipe.setTag("Items", recipe); - //item.getTagCompound().setTag("recipe", recipe); - } - } - - } - - @Override - public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) { - if(!world.isRemote) { - if (!item.hasTagCompound()) { - item.setTagCompound(new NBTTagCompound()); - NBTTagCompound recipe = new NBTTagCompound(); - recipe.setTag("Items", recipe); - } - } - } - - @Override + /*@Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack item, @Nullable World world, List tooltip, ITooltipFlag flagIn) { @@ -84,9 +59,9 @@ public class ItemCrucible extends Item { if (getLapisLevel(item) > 0) { tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); } - tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() );*/ + tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() ); } } - } + }*/ }