pusing current code

This commit is contained in:
Mohammad-Ali Minaie
2017-12-17 00:50:14 -05:00
parent 8a4d0cf70c
commit b3275e5f8e
2 changed files with 15 additions and 38 deletions

View File

@@ -22,6 +22,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI; 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.PlayerHelper;
import nmd.primal.core.common.helper.WorldHelper; import nmd.primal.core.common.helper.WorldHelper;
import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.ModInfo;
@@ -51,6 +52,12 @@ public class NBTCrucible extends Block implements ITileEntityProvider {
//crucibleIngredients.apply(new ItemStack(Blocks.IRON_ORE, 1)); //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 @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { 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); ItemStack pItem1 = new ItemStack(pItem.getItem(), 1);
if(pItem.isEmpty()){ if(pItem.isEmpty()){
if(!player.isSneaking()) { if(!player.isSneaking()) {
ItemStack tempStack = new ItemStack(ModItems.itemcrucible, 1);
tempStack.setTagCompound(new NBTTagCompound()); PlayerHelper.playerTakeItem(world, pos, EnumFacing.DOWN, player, this.getItem(world, pos, state));
NBTTagCompound recipe = new NBTTagCompound();
recipe.setTag("Items", recipe);
ItemStackHelper.saveAllItems(recipe, tile.ingList);
//tempStack.writeToNBT(tempNBT);
PlayerHelper.spawnItemOnPlayer(world, player, tempStack);
world.setBlockToAir(pos); world.setBlockToAir(pos);
} }
} }
@@ -98,10 +100,10 @@ public class NBTCrucible extends Block implements ITileEntityProvider {
return false; return false;
} }
@Override /*@Override
public void breakBlock(World world, BlockPos pos, IBlockState state) public void breakBlock(World world, BlockPos pos, IBlockState state)
{ {
if (!world.isRemote) { /*if (!world.isRemote) {
TileNBTCrucible tile = (TileNBTCrucible) world.getTileEntity(pos); TileNBTCrucible tile = (TileNBTCrucible) world.getTileEntity(pos);
for (int i = 0; i < tile.ingList.size(); i++) { for (int i = 0; i < tile.ingList.size(); i++) {
if (!tile.ingList.get(i).isEmpty()) { if (!tile.ingList.get(i).isEmpty()) {
@@ -111,7 +113,7 @@ public class NBTCrucible extends Block implements ITileEntityProvider {
} }
} }
world.removeTileEntity(pos); world.removeTileEntity(pos);
} }*/
/*@Override /*@Override
public void onBlockDestroyedByPlayer(World world, BlockPos pos, IBlockState state) public void onBlockDestroyedByPlayer(World world, BlockPos pos, IBlockState state)

View File

@@ -33,32 +33,7 @@ public class ItemCrucible extends Item {
this.setNoRepair(); this.setNoRepair();
} }
@Override /*@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
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void addInformation(ItemStack item, @Nullable World world, List<String> tooltip, ITooltipFlag flagIn) public void addInformation(ItemStack item, @Nullable World world, List<String> tooltip, ITooltipFlag flagIn)
{ {
@@ -84,9 +59,9 @@ public class ItemCrucible extends Item {
if (getLapisLevel(item) > 0) { if (getLapisLevel(item) > 0) {
tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) ); tooltip.add(ChatFormatting.BLUE + "Lapis Level: " + getLapisLevel(item) );
} }
tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() );*/ tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() );
} }
} }
} }*/
} }