From dc825ad776f9fe9f763267874f6fa70c4870fc46 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 15 Oct 2025 04:01:15 +0100 Subject: v5 --- src/main/java/net/uomc/mineshaft/PickaxeCommand.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/main/java/net/uomc/mineshaft/PickaxeCommand.java') diff --git a/src/main/java/net/uomc/mineshaft/PickaxeCommand.java b/src/main/java/net/uomc/mineshaft/PickaxeCommand.java index 6ca3e08..31ac11c 100644 --- a/src/main/java/net/uomc/mineshaft/PickaxeCommand.java +++ b/src/main/java/net/uomc/mineshaft/PickaxeCommand.java @@ -52,6 +52,7 @@ public class PickaxeCommand extends DetailedCommand { String nextPick = bot.getPickaxes().getNextPickaxeName(e.getMember()); String pickImage = bot.getPickaxes().getPickaxeImage(e.getMember()); int fortune = bot.getPickaxes().getPickaxeFortune(e.getMember()); + int efficiency = bot.getPickaxes().getPickaxeEfficiency(e.getMember()); Member target = PeelingUtils.getSingleMentionFromArgs(e); String p1 = target.equals(e.getMember()) ? "You currently have" : String.format("%s currently has", e.getMember().getEffectiveName()); @@ -65,11 +66,7 @@ public class PickaxeCommand extends DetailedCommand { upgradeString = ""; } - String enchants = String.format("\n*%s pickaxe has no enchantments*", p2); - if (fortune > 0) { - enchants = String.format("\n%s pickaxe is enchanted with **Fortune %s**", p2, - Pickaxes.getRomanNumber(fortune)); - } + String enchants = String.format("\n%s ", p2) + bot.getEnchantCommand().getPickaxeEnchantmentsString(fortune, efficiency); EmbedBuilder em = new EmbedBuilder(); em.setTitle(p2); @@ -87,23 +84,19 @@ public class PickaxeCommand extends DetailedCommand { switch ((int) level) { case 0: cost.put(MineshaftItem.COPPER, 16l); - //cost.put(MineshaftItem.XP, 5000l); break; case 1: cost.put(MineshaftItem.IRON, 32l); - //cost.put(MineshaftItem.XP, 10000l); break; case 2: - cost.put(MineshaftItem.GOLD, 48l); - //cost.put(MineshaftItem.XP, 64000l); + cost.put(MineshaftItem.GOLD, 64l); break; case 3: - cost.put(MineshaftItem.DIAMOND, 64l); - //cost.put(MineshaftItem.XP, 128000l); + cost.put(MineshaftItem.DIAMOND, 32l); break; case 4: - cost.put(MineshaftItem.DIAMOND, 9999999999999999l); + cost.put(MineshaftItem.NETHERITE, 128l); break; } -- cgit v1.2.3