From c722443dc29ca6e90cbe03cc7d9e9d7991eb50e0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Feb 2017 23:34:37 -0600 Subject: [PATCH] More tool cleaning --- .../item/equipment/tool/ToolCommons.java | 37 ++++++++++--------- .../tool/elementium/ItemElementiumPick.java | 9 +---- .../tool/terrasteel/ItemTerraAxe.java | 2 +- .../common/item/relic/ItemLokiRing.java | 2 +- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index b3160bfbb..ca63522ed 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -53,52 +53,55 @@ public final class ToolCommons { stack.damageItem(dmg, entity); } - public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos centerPos, Vec3i startDelta, Vec3i endDelta, Block block, List materialsListing, boolean silk, int fortune, boolean dispose) { - float blockHardness = block == null ? 1F : block.getBlockHardness(world.getBlockState(centerPos), world, centerPos); - + public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos centerPos, + Vec3i startDelta, Vec3i endDelta, Block filterBlock, List materialsListing, + boolean silk, int fortune, boolean dispose) { for (BlockPos iterPos : BlockPos.getAllInBox(centerPos.add(startDelta), centerPos.add(endDelta))) { if (iterPos.equals(centerPos)) // skip original block space to avoid crash, vanilla code in the tool class will handle it continue; - removeBlockWithDrops(player, stack, world, iterPos, centerPos, block, materialsListing, silk, fortune, blockHardness, dispose); + removeBlockWithDrops(player, stack, world, iterPos, centerPos, filterBlock, materialsListing, silk, fortune, dispose); } } - public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, Block block, List materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose) { - removeBlockWithDrops(player, stack, world, pos, bPos, block, materialsListing, silk, fortune, blockHardness, dispose, true); + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, + Block filterBlock, List materialsListing, + boolean silk, int fortune, boolean dispose) { + removeBlockWithDrops(player, stack, world, pos, bPos, filterBlock, materialsListing, silk, fortune, dispose, true); } - public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, Block block, List materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose, boolean particles) { + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, + Block filterBlock, List materialsListing, + boolean silk, int fortune, boolean dispose, boolean particles) { if(!world.isBlockLoaded(pos)) return; IBlockState state = world.getBlockState(pos); - Block blk = state.getBlock(); + Block block = state.getBlock(); - if(block != null && blk != block) + if(filterBlock != null && block != filterBlock) return; Material mat = world.getBlockState(pos).getMaterial(); - if(!world.isRemote && blk != null && !blk.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0) { - if(!blk.canHarvestBlock(player.world, pos, player) || !materialsListing.contains(mat)) { + if(!world.isRemote && !block.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0) { + if(!block.canHarvestBlock(player.world, pos, player) || !materialsListing.contains(mat)) { return; } if(!player.capabilities.isCreativeMode) { TileEntity tile = world.getTileEntity(pos); IBlockState localState = world.getBlockState(pos); - blk.onBlockHarvested(world, pos, localState, player); - if(blk.removedByPlayer(state, world, pos, player, true)) { - blk.onBlockDestroyedByPlayer(world, pos, state); + if(block.removedByPlayer(state, world, pos, player, true)) { + block.onBlockDestroyedByPlayer(world, pos, state); - if(!dispose || !ItemElementiumPick.isDisposable(blk)) - blk.harvestBlock(world, player, pos, state, tile, stack); + if(!dispose || !ItemElementiumPick.isDisposable(block)) + block.harvestBlock(world, player, pos, state, tile, stack); } damageItem(stack, 1, player, 80); } else world.setBlockToAir(pos); - if(particles && !world.isRemote && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) + if(particles && ConfigHandler.blockBreakParticles && ConfigHandler.blockBreakParticlesTool) world.playEvent(2001, pos, Block.getStateId(state)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index c8e28c650..2fa8abd38 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -24,13 +24,8 @@ public class ItemElementiumPick extends ItemManasteelPick { if(event.getHarvester() != null) { ItemStack stack = event.getHarvester().getHeldItemMainhand(); if(!stack.isEmpty() && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { - for(int i = 0; i < event.getDrops().size(); i++) { - ItemStack drop = event.getDrops().get(i); - if(drop != null) { - if(isDisposable(drop) || isSemiDisposable(drop) && !event.getHarvester().isSneaking()) - event.getDrops().remove(i); - } - } + event.getDrops().removeIf(s -> !s.isEmpty() && (isDisposable(s) + || isSemiDisposable(s) && !event.getHarvester().isSneaking())); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 31bd70562..b73861882 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -297,7 +297,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker null, ToolCommons.materialsAxe, EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, truncator) > 0, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, truncator), - 0F, false, treatLeavesSpecial); + false, treatLeavesSpecial); remainingSwaps--; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 673213ef1..3cac0a8ee 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -151,7 +151,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat for (BlockPos coords : cursors) { IBlockState state = world.getBlockState(coords); breaker.breakOtherBlock(player, stack, coords, coords, side); - ToolCommons.removeBlockWithDrops(player, stack, player.world, coords, pos, state.getBlock(), Collections.singletonList(state.getMaterial()), silk, fortune, state.getBlockHardness(world, coords), dispose); + ToolCommons.removeBlockWithDrops(player, stack, player.world, coords, pos, state.getBlock(), Collections.singletonList(state.getMaterial()), silk, fortune, dispose); } }