From d698840e1f7c5b9e9d9e744d469099586ff0500e Mon Sep 17 00:00:00 2001 From: creator3 Date: Mon, 16 Dec 2019 11:47:47 -0500 Subject: [PATCH] Use the actual tool item in calls to getDrops() --- .../Objects/SlimefunItem/items/ExplosivePickaxe.java | 5 +---- .../Objects/SlimefunItem/items/ExplosiveShovel.java | 5 +---- .../Objects/SlimefunItem/items/HerculesPickaxe.java | 5 +---- .../Slimefun/Objects/SlimefunItem/items/LumberAxe.java | 5 +---- .../Objects/SlimefunItem/items/PickaxeOfVeinMining.java | 4 +--- .../Objects/SlimefunItem/items/SmeltersPickaxe.java | 7 +++---- 6 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosivePickaxe.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosivePickaxe.java index fd2a7ae28..214b5f9a4 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosivePickaxe.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosivePickaxe.java @@ -27,9 +27,6 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class ExplosivePickaxe extends SimpleSlimefunItem implements NotPlaceable, DamageableItem { - // Determines the drops an ExplosivePickaxe will get - private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE); - private String[] blacklist; private boolean damageOnUse; @@ -80,7 +77,7 @@ public class ExplosivePickaxe extends SimpleSlimefunItem impl b.breakNaturally(); } else { - for (ItemStack drop: b.getDrops(EFFECTIVE_PICKAXE)) { + for (ItemStack drop : b.getDrops(getItem())) { b.getWorld().dropItemNaturally(b.getLocation(), (b.getType().toString().endsWith("_ORE") && b.getType() != Material.IRON_ORE && b.getType() != Material.GOLD_ORE) ? new CustomItem(drop, fortune): drop); } b.setType(Material.AIR); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosiveShovel.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosiveShovel.java index bc2bc4ff4..acfc28b3c 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosiveShovel.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/ExplosiveShovel.java @@ -19,9 +19,6 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class ExplosiveShovel extends SimpleSlimefunItem implements NotPlaceable, DamageableItem { - - // Determines the drops an ExplosiveShovel will get - private static final ItemStack EFFECTIVE_SHOVEL = new ItemStack(Material.DIAMOND_SHOVEL); private boolean damageOnUse; @@ -55,7 +52,7 @@ public class ExplosiveShovel extends SimpleSlimefunItem imple b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType()); - for (ItemStack drop: b.getDrops(EFFECTIVE_SHOVEL)) { + for (ItemStack drop : b.getDrops(getItem())) { if (drop != null) { b.getWorld().dropItemNaturally(b.getLocation(), drop); } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/HerculesPickaxe.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/HerculesPickaxe.java index b50e15eb6..25cc5526f 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/HerculesPickaxe.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/HerculesPickaxe.java @@ -13,9 +13,6 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class HerculesPickaxe extends SimpleSlimefunItem { - // Determines the drops a HerculesPickaxe will get - private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE); - public HerculesPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } @@ -36,7 +33,7 @@ public class HerculesPickaxe extends SimpleSlimefunItem { drops.add(new CustomItem(SlimefunItems.GOLD_DUST, 2)); } else { - for (ItemStack drop: e.getBlock().getDrops(EFFECTIVE_PICKAXE)) { + for (ItemStack drop : e.getBlock().getDrops(getItem())) { drops.add(new CustomItem(drop, drop.getAmount() * 2)); } } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java index 7874d0400..3caedc1b9 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java @@ -20,9 +20,6 @@ import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class LumberAxe extends SimpleSlimefunItem implements NotPlaceable { - // Determines the drops a LumberAxe will get - private static final ItemStack EFFECTIVE_AXE = new ItemStack(Material.DIAMOND_AXE); - public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } @@ -47,7 +44,7 @@ public class LumberAxe extends SimpleSlimefunItem implements if (SlimefunPlugin.getProtectionManager().hasPermission(e.getPlayer(), b, ProtectableAction.BREAK_BLOCK)) { b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType()); - for (ItemStack drop: b.getDrops(EFFECTIVE_AXE)) { + for (ItemStack drop : b.getDrops(getItem())) { b.getWorld().dropItemNaturally(b.getLocation(), drop); } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfVeinMining.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfVeinMining.java index 22e59a4ad..acce5e190 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfVeinMining.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfVeinMining.java @@ -19,8 +19,6 @@ import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class PickaxeOfVeinMining extends SimpleSlimefunItem { - // Determines the drops a PickaxeOfVeinMining will get - private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE); public PickaxeOfVeinMining(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); @@ -42,7 +40,7 @@ public class PickaxeOfVeinMining extends SimpleSlimefunItem { if (SlimefunPlugin.getProtectionManager().hasPermission(e.getPlayer(), b.getLocation(), ProtectableAction.BREAK_BLOCK)) { b.getWorld().playEffect(b.getLocation(), Effect.STEP_SOUND, b.getType()); - for (ItemStack drop: b.getDrops(EFFECTIVE_PICKAXE)) { + for (ItemStack drop : b.getDrops(getItem())) { b.getWorld().dropItemNaturally(b.getLocation(), drop.getType().isBlock() ? drop: new CustomItem(drop, fortune)); } diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SmeltersPickaxe.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SmeltersPickaxe.java index 1b888d66f..ae9717fca 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SmeltersPickaxe.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SmeltersPickaxe.java @@ -18,8 +18,7 @@ import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class SmeltersPickaxe extends SimpleSlimefunItem { - // Determines the drops a SmeltersPickaxe will get - private static final ItemStack EFFECTIVE_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE); + public SmeltersPickaxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } @@ -36,8 +35,8 @@ public class SmeltersPickaxe extends SimpleSlimefunItem { if (BlockStorage.hasBlockInfo(e.getBlock())) return true; if (e.getBlock().getType() == Material.PLAYER_HEAD) return true; - Collection blockDrops = e.getBlock().getDrops(EFFECTIVE_PICKAXE); - for (ItemStack drop: blockDrops) { + Collection blockDrops = e.getBlock().getDrops(getItem()); + for (ItemStack drop : blockDrops) { if (drop != null) { ItemStack output = drop;