diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b65caf7..cf2011e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ * "Connected / Not connected" messages for cargo nodes are now sent via the actionbar * "/sf stats" can no longer be used if researching is disabled * "/sf research" can no longer be used if researching is disabled +* Removed the Hercules Pickaxe from Slimefun #### Fixes * Fixed #3597 @@ -58,6 +59,7 @@ * Fixed #3573 * Fixed "round-robin" mode for cargo networks being very unreliable * Fixed #3664 +* Fixed #3651 ## Release Candidate 32 (26 Jun 2022) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#32 diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/HerculesPickaxe.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/HerculesPickaxe.java deleted file mode 100644 index ddada272a..000000000 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/HerculesPickaxe.java +++ /dev/null @@ -1,71 +0,0 @@ -package io.github.thebusybiscuit.slimefun4.implementation.items.tools; - -import javax.annotation.Nonnull; -import javax.annotation.ParametersAreNonnullByDefault; - -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - -import io.github.bakedlibs.dough.items.CustomItemStack; -import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; -import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; -import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.core.handlers.ToolUseHandler; -import io.github.thebusybiscuit.slimefun4.implementation.Slimefun; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import io.github.thebusybiscuit.slimefun4.implementation.items.SimpleSlimefunItem; -import io.github.thebusybiscuit.slimefun4.utils.tags.SlimefunTag; - -@Deprecated -public class HerculesPickaxe extends SimpleSlimefunItem { - - @ParametersAreNonnullByDefault - public HerculesPickaxe(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { - super(itemGroup, item, recipeType, recipe); - } - - @Override - public @Nonnull ToolUseHandler getItemHandler() { - return (e, tool, fortune, drops) -> { - - sendDeprecationWarning(e.getPlayer()); - - Material mat = e.getBlock().getType(); - - if (SlimefunTag.ORES.isTagged(mat)) { - if (Slimefun.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_17)) { - switch (mat) { - case DEEPSLATE_IRON_ORE: - drops.add(new CustomItemStack(SlimefunItems.IRON_DUST, 2)); - break; - case DEEPSLATE_GOLD_ORE: - drops.add(new CustomItemStack(SlimefunItems.GOLD_DUST, 2)); - break; - case COPPER_ORE: - case DEEPSLATE_COPPER_ORE: - drops.add(new CustomItemStack(SlimefunItems.COPPER_DUST, 2)); - break; - default: - break; - } - } - - switch (mat) { - case IRON_ORE: - drops.add(new CustomItemStack(SlimefunItems.IRON_DUST, 2)); - break; - case GOLD_ORE: - drops.add(new CustomItemStack(SlimefunItems.GOLD_DUST, 2)); - break; - default: - for (ItemStack drop : e.getBlock().getDrops(tool)) { - drops.add(new CustomItemStack(drop, drop.getAmount() * 2)); - } - break; - } - } - }; - } - -} diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java index 53e82930b..c088052a5 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java @@ -195,7 +195,6 @@ import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ExplosivePi import io.github.thebusybiscuit.slimefun4.implementation.items.tools.ExplosiveShovel; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GoldPan; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.GrapplingHook; -import io.github.thebusybiscuit.slimefun4.implementation.items.tools.HerculesPickaxe; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.LumberAxe; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.NetherGoldPan; import io.github.thebusybiscuit.slimefun4.implementation.items.tools.PickaxeOfContainment; @@ -1031,10 +1030,6 @@ public final class SlimefunItemSetup { new PickaxeOfContainment(itemGroups.tools, SlimefunItems.PICKAXE_OF_CONTAINMENT, RecipeType.MAGIC_WORKBENCH, new ItemStack[] {SlimefunItems.FERROSILICON, SlimefunItems.FERROSILICON, SlimefunItems.FERROSILICON, null, SlimefunItems.GILDED_IRON, null, null, SlimefunItems.GILDED_IRON, null}) .register(plugin); - - new HerculesPickaxe(itemGroups.tools, SlimefunItems.HERCULES_PICKAXE, RecipeType.MAGIC_WORKBENCH, - new ItemStack[] {SlimefunItems.HARDENED_METAL_INGOT, SlimefunItems.HARDENED_METAL_INGOT, SlimefunItems.HARDENED_METAL_INGOT, null, SlimefunItems.FERROSILICON, null, null, SlimefunItems.FERROSILICON, null}) - .register(plugin); new TableSaw(itemGroups.basicMachines, SlimefunItems.TABLE_SAW).register(plugin);