From 08bb99ec682a536069a5b442408d956a31404a01 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Wed, 13 Dec 2023 21:58:57 +0800 Subject: [PATCH] new placeholder {sold-item-amount} --- .../customfishing/CustomFishingPluginImpl.java | 1 - .../customfishing/mechanic/market/MarketGUI.java | 16 ++++++++++++++++ .../mechanic/market/MarketManagerImpl.java | 2 ++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java b/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java index f5338e95..77e47800 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/CustomFishingPluginImpl.java @@ -55,7 +55,6 @@ import net.momirealms.customfishing.version.VersionManagerImpl; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketGUI.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketGUI.java index 593c5eed..36e0eb3b 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketGUI.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketGUI.java @@ -268,4 +268,20 @@ public class MarketGUI { public EarningData getEarningData() { return earningData; } + + public int getSoldAmount() { + int amount = 0; + MarketGUIElement itemElement = getElement(manager.getItemSlot()); + if (itemElement == null) { + return amount; + } + for (int slot : itemElement.getSlots()) { + ItemStack itemStack = inventory.getItem(slot); + double money = manager.getItemPrice(itemStack); + if (money > 0 && itemStack != null) { + amount += itemStack.getAmount(); + } + } + return amount; + } } diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketManagerImpl.java index aa28e882..903c6eac 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/market/MarketManagerImpl.java @@ -291,10 +291,12 @@ public class MarketManagerImpl implements MarketManager, Listener { if (element.getSymbol() == functionSlot) { double worth = gui.getTotalWorth(); + int amount = gui.getSoldAmount(); double earningLimit = getEarningLimit(player); Condition condition = new Condition(player, new HashMap<>(Map.of( "{money}", String.format("%.2f", worth) ,"{rest}", String.format("%.2f", (earningLimit - data.earnings)) + ,"{sold-item-amount}", String.valueOf(amount) ))); if (worth > 0) { if (earningLimit != -1 && (earningLimit - data.earnings) < worth) {