diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index 203c8b30..ca1afb74 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -4,6 +4,7 @@ import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -251,6 +252,7 @@ public class Battleaxe extends HarvestTool final Block wood = world.getBlock(x, y, z); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); final int meta = world.getBlockMetadata(x, y, z); + final int fortune = EnchantmentHelper.getFortuneModifier(player); for (int yPos = y + 1; yPos < y + 9; yPos++) { Block block = world.getBlock(x, yPos, z); @@ -280,6 +282,11 @@ public class Battleaxe extends HarvestTool { block.onBlockDestroyedByPlayer(world, x, yPos, z, localMeta); } + + // Workaround for dropping experience + int exp = block.getExpDrop(world, localMeta, fortune); + block.dropXpOnBlockBreak(world, x, y, z, exp); + block.harvestBlock(world, player, x, yPos, z, localMeta); block.onBlockHarvested(world, x, yPos, z, localMeta, player); onBlockDestroyed(stack, world, block, x, yPos, z, player); diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 35a7961f..b3992cdf 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -3,6 +3,7 @@ package tconstruct.items.tools; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -184,6 +185,7 @@ public class Excavator extends HarvestTool break; } NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + int fortune = EnchantmentHelper.getFortuneModifier(player); for (int xPos = x - xRange; xPos <= x + xRange; xPos++) { for (int yPos = y - yRange; yPos <= y + yRange; yPos++) @@ -221,6 +223,11 @@ public class Excavator extends HarvestTool { block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); } + + // Workaround for dropping experience + int exp = block.getExpDrop(world, localMeta, fortune); + block.dropXpOnBlockBreak(world, xPos, yPos, zPos, exp); + block.harvestBlock(world, player, xPos, yPos, zPos, localMeta); block.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (blockHardness > 0f) diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index a7317f07..45a9b43d 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -6,6 +6,7 @@ import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -283,6 +284,7 @@ public class Hammer extends HarvestTool NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); int toolLevel = tags.getInteger("HarvestLevel"); + int fortune = EnchantmentHelper.getFortuneModifier(player); for (int xPos = x - xRange; xPos <= x + xRange; xPos++) { for (int yPos = y - yRange; yPos <= y + yRange; yPos++) @@ -321,6 +323,11 @@ public class Hammer extends HarvestTool { localBlock.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); } + + // Workaround for dropping experience + int exp = localBlock.getExpDrop(world, localMeta, fortune); + localBlock.dropXpOnBlockBreak(world, xPos, yPos, zPos, exp); + localBlock.harvestBlock(world, player, xPos, yPos, zPos, localMeta); localBlock.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (blockHardness > 0f) diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 92cc6b3d..0c7cfb95 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -3,6 +3,7 @@ package tconstruct.items.tools; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -198,6 +199,8 @@ public class LumberAxe extends HarvestTool void breakTree (World world, int x, int y, int z, ItemStack stack, NBTTagCompound tags, Block bID, int meta, EntityPlayer player) { Block block; + final int fortune = EnchantmentHelper.getFortuneModifier(player); + for (int xPos = x - 1; xPos <= x + 1; xPos++) { for (int yPos = y; yPos <= y + 1; yPos++) @@ -246,6 +249,11 @@ public class LumberAxe extends HarvestTool { block.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, meta); } + + // Workaround for dropping experience + int exp = localblock.getExpDrop(world, meta, fortune); + localblock.dropXpOnBlockBreak(world, xPos, yPos, zPos, exp); + block.harvestBlock(world, player, xPos, yPos, zPos, meta); block.onBlockHarvested(world, xPos, yPos, zPos, meta, player); onBlockDestroyed(stack, world, localblock, xPos, yPos, zPos, player); @@ -280,6 +288,8 @@ public class LumberAxe extends HarvestTool void destroyWood (World world, int x, int y, int z, ItemStack stack, NBTTagCompound tags, EntityPlayer player) { + final int fortune = EnchantmentHelper.getFortuneModifier(player); + for (int xPos = x - 1; xPos <= x + 1; xPos++) { for (int yPos = y - 1; yPos <= y + 1; yPos++) @@ -305,13 +315,17 @@ public class LumberAxe extends HarvestTool if (!cancelHarvest) { - WorldHelper.setBlockToAir(world, xPos, yPos, zPos); if (!player.capabilities.isCreativeMode) { // TODO harvestBlock + int exp = block.getExpDrop(world, meta, fortune); + block.dropXpOnBlockBreak(world, xPos, yPos, zPos, exp); + block.harvestBlock(world, player, xPos, yPos, zPos, meta); onBlockDestroyed(stack, world, block, xPos, yPos, zPos, player); } + WorldHelper.setBlockToAir(world, xPos, yPos, zPos); + world.func_147479_m(xPos, yPos, zPos); } } } diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 5294aae9..e7d95632 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -3,6 +3,7 @@ package tconstruct.library.tools; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -50,7 +51,14 @@ public abstract class DualHarvestTool extends HarvestTool else { if (!player.capabilities.isCreativeMode) + { + // Workaround for dropping experience + int fortune = EnchantmentHelper.getFortuneModifier(player); + int exp = block.getExpDrop(world, meta, fortune); + block.dropXpOnBlockBreak(world, x, y, z, exp); + onBlockDestroyed(stack, world, block, x, y, z, player); + } WorldHelper.setBlockToAir(world, x, y, z); if (!world.isRemote) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12)); diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 14a61f53..5246d0e0 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -3,6 +3,7 @@ package tconstruct.library.tools; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -84,6 +85,12 @@ public abstract class HarvestTool extends ToolCore { localBlock.onBlockDestroyedByPlayer(world, x, y, z, localMeta); } + + // Workaround for dropping experience + int fortune = EnchantmentHelper.getFortuneModifier(player); + int exp = localBlock.getExpDrop(world, localMeta, fortune); + localBlock.dropXpOnBlockBreak(world, x, y, z, exp); + localBlock.harvestBlock(world, player, x, y, z, localMeta); localBlock.onBlockHarvested(world, x, y, z, localMeta, player); if (blockHardness > 0f) @@ -288,4 +295,17 @@ public abstract class HarvestTool extends ToolCore return used; } + + @Override + public int getHarvestLevel (ItemStack stack, String toolClass) + { + if (!(stack.getItem() instanceof HarvestTool) || !getHarvestType().equals(toolClass)) + { + return -1; + } + + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + int harvestLvl = tags.getInteger("HarvestLevel"); + return harvestLvl; + } }