Merge branch 'release/3.3.2'

Author: Maxlego08

.gitignore

@@ -49,3 +49,6 @@ target
 target-api
 *.java~
 *.kts~
+.claude
+CLAUDE.md
+gradle.properties

API/src/main/java/fr/maxlego08/shop/api/event/ShopAction.java

@@ -8,11 +8,13 @@ public class ShopAction {
     private final ItemStack itemStack;
     private final ItemButton itemButton;
     private double price;
+    private int totalAmount;
 
     public ShopAction(ItemStack itemStack, ItemButton itemButton, double price) {
         this.itemStack = itemStack;
         this.itemButton = itemButton;
         this.price = price;
+        this.totalAmount = itemStack.getAmount();
     }
 
     public ItemStack getItemStack() {
@@ -30,4 +32,16 @@ public double getPrice() {
     public void setPrice(double price) {
         this.price = price;
     }
+
+    public int getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(int totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public void addAmount(int amount) {
+        this.totalAmount += amount;
+    }
 }

API/src/main/java/fr/maxlego08/shop/api/limit/LimiterManager.java

@@ -9,6 +9,8 @@ public interface LimiterManager {
 
     Collection<Limit> getLimits();
 
+    Collection<Limit> getLimits(LimitType limitType);
+
     void create(Limit limit);
 
     Optional<Limit> getLimit(LimitType limitType, String material);

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "fr.maxlego08.shop"
-version = "3.3.1"
+version = "3.3.2"
 
 extra.set("targetFolder", file("target/"))
 extra.set("apiFolder", file("target-api/"))
@@ -47,6 +47,7 @@ allprojects {
 
     tasks.compileJava {
         options.encoding = "UTF-8"
+        options.release = 21
     }
 
     tasks.javadoc {
@@ -58,7 +59,7 @@ allprojects {
     dependencies {
         compileOnly("org.spigotmc:spigot-api:1.21.5-R0.1-SNAPSHOT")
         compileOnly("me.clip:placeholderapi:2.11.6")
-        compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.0")
+        compileOnly("fr.maxlego08.menu:zmenu-api:1.1.0.8")
 
     }
 }
@@ -88,10 +89,6 @@ tasks {
         dependsOn(shadowJar)
     }
 
-    compileJava {
-        options.release = 21
-    }
-
     processResources {
         from("resources")
         filesMatching("plugin.yml") {

changelog.md

@@ -4,6 +4,19 @@
 
 # Unreleased
 
+# 3.3.2
+
+- **Added**: Reset limit commands (#22)
+  - `/zshoplugin resetlimit` - Main reset commands menu
+  - `/zshoplugin resetlimit player <player> <material>` - Reset a player's limit for an item
+  - `/zshoplugin resetlimit server <material>` - Reset the server limit for an item
+  - `/zshoplugin resetlimit all` - Reset all limits
+- **Fixed**: `%buyPrice%` and `%sellPrice%` placeholders now display the total price in confirmation button lore (#18)
+- **Fixed**: Item overflow when selling
+- **Fixed**: Amount calculation when selling
+- **Fixed**: ItemStack size issue
+- **Updated**: zMenu to version 1.1.0.8
+
 # 3.3.1
 
 - Fix button load event

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/fr/maxlego08/shop/ZShopManager.java

@@ -392,21 +392,21 @@ public void sellAllContent(Player player, org.bukkit.inventory.Inventory invento
         List<Pair<ItemStack, ItemButton>> buttons = this.itemButtons.stream().map(button -> {
             ItemStack itemStack = button.getItemStack().build(player, false);
             return new Pair<>(itemStack, button);
-        }).collect(Collectors.toList());
+        }).toList();
 
         /* SCAN ITEMS */
         for (int slot = 0; slot != inventory.getContents().length; slot++) {
             ItemStack itemStack = inventory.getContents()[slot];
             if (itemStack == null) continue;
 
             Optional<ItemButton> optional = buttons.stream().filter(e -> e.first.isSimilar(itemStack)).map(e -> e.second).findFirst();
-            if (!optional.isPresent()) continue;
+            if (optional.isEmpty()) continue;
 
             ItemButton itemButton = optional.get();
             if (!itemButton.canSell()) continue;
 
             double price = itemButton.getSellPrice(player, itemStack.getAmount());
-            ShopAction shopAction = new ShopAction(itemStack, itemButton, price);
+            ShopAction shopAction = new ShopAction(itemStack.clone(), itemButton, price);
             shopActions.add(shopAction);
         }
 
@@ -424,6 +424,8 @@ public void sellAllContent(Player player, org.bukkit.inventory.Inventory invento
             ItemButton button = action.getItemButton();
             ItemStack itemStack = action.getItemStack();
 
+            int requestedAmount = itemStack.getAmount();
+            int actualSellAmount = requestedAmount; // Amount that will actually be sold
             int newServerLimitAmount = 0;
             int newPlayerLimitAmount = 0;
             String material = button.getItemStack().getMaterial();
@@ -435,20 +437,41 @@ public void sellAllContent(Player player, org.bukkit.inventory.Inventory invento
             /* SERVER LIMIT */
             if (optionalServer.isPresent()) {
                 Limit serverSellLimit = optionalServer.get();
-                newServerLimitAmount = serverSellLimit.getAmount() + itemStack.getAmount();
-                if (newServerLimitAmount > serverSellLimit.getLimit()) return;
+                int currentServerAmount = serverSellLimit.getAmount();
+                int maxCanSell = serverSellLimit.getLimit() - currentServerAmount;
+
+                if (maxCanSell <= 0) {
+                    action.setTotalAmount(0);
+                    return;
+                }
+                actualSellAmount = Math.min(actualSellAmount, maxCanSell);
+                newServerLimitAmount = currentServerAmount + actualSellAmount;
             }
             /* END SERVER LIMIT */
 
             /* PLAYER LIMIT */
             if (optionalPlayer.isPresent()) {
                 Limit playerSellLimit = optionalPlayer.get();
                 Optional<PlayerLimit> optional = limiterManager.getLimit(player);
-                newPlayerLimitAmount = optional.map(e -> e.getSellAmount(material)).orElse(0) + itemStack.getAmount();
-                if (newPlayerLimitAmount > playerSellLimit.getLimit()) return;
+                int currentPlayerAmount = optional.map(e -> e.getSellAmount(material)).orElse(0);
+                int maxCanSell = playerSellLimit.getLimit() - currentPlayerAmount;
+
+                if (maxCanSell <= 0) {
+                    action.setTotalAmount(0);
+                    return;
+                }
+                actualSellAmount = Math.min(actualSellAmount, maxCanSell);
+                newPlayerLimitAmount = currentPlayerAmount + actualSellAmount;
             }
             /* END PLAYER LIMIT */
 
+            if (actualSellAmount != requestedAmount) {
+                itemStack.setAmount(actualSellAmount);
+                double actualPrice = button.getSellPrice(player, actualSellAmount);
+                action.setPrice(actualPrice);
+            }
+            action.setTotalAmount(actualSellAmount);
+
             /* UPDATE LIMIT VALUES */
             if (optionalServer.isPresent()) optionalServer.get().setAmount(newServerLimitAmount);
             if (newPlayerLimitAmount > 0)
@@ -457,8 +480,7 @@ public void sellAllContent(Player player, org.bukkit.inventory.Inventory invento
 
             /* REMOVE ITEMS AND UPDATE MONEY */
             prices.put(button.getEconomy(), prices.getOrDefault(button.getEconomy(), 0.0) + action.getPrice());
-            // inventory.remove(itemStack);
-            InventoryUtils.removeItem(inventory, itemStack, itemStack.getAmount());
+            InventoryUtils.removeItem(inventory, itemStack, actualSellAmount);
         });
 
         if (prices.isEmpty()) {
@@ -469,23 +491,25 @@ public void sellAllContent(Player player, org.bukkit.inventory.Inventory invento
         List<ShopAction> fixedShopActions = new ArrayList<>();
 
         shopActions.forEach(action -> {
+            if (action.getTotalAmount() == 0) return;
+
             Optional<ShopAction> optional = fixedShopActions.stream().filter(e -> e.getItemStack().isSimilar(action.getItemStack())).findFirst();
             if (optional.isPresent()) {
                 ShopAction currentAction = optional.get();
                 currentAction.setPrice(currentAction.getPrice() + action.getPrice());
-                currentAction.getItemStack().setAmount(currentAction.getItemStack().getAmount() + action.getItemStack().getAmount());
+                currentAction.addAmount(action.getTotalAmount());
             } else fixedShopActions.add(action);
         });
 
         var translationManager = this.plugin.getTranslationManager();
 
-        String results = toList(fixedShopActions.stream().map(action -> getMessage(Message.SELL_ALL_INFO, "%amount%", action.getItemStack().getAmount(), "%item%", translationManager.translateItemStack(action.getItemStack()), "%price%", action.getItemButton().getEconomy().format(transformPrice(action.getPrice()), action.getPrice()))).collect(Collectors.toList()), Message.SELL_ALL_COLOR_SEPARATOR.msg(), Message.SELL_ALL_COLOR_INFO.msg());
+        String results = toList(fixedShopActions.stream().map(action -> getMessage(Message.SELL_ALL_INFO, "%amount%", action.getTotalAmount(), "%item%", translationManager.translateItemStack(action.getItemStack()), "%price%", action.getItemButton().getEconomy().format(transformPrice(action.getPrice()), action.getPrice()))).collect(Collectors.toList()), Message.SELL_ALL_COLOR_SEPARATOR.msg(), Message.SELL_ALL_COLOR_INFO.msg());
         if (results == null) {
             Logger.info("Error with results on sellall !");
             player.sendMessage("§cError with results on sellall !");
         }
 
-        String resultsReason = toList(fixedShopActions.stream().map(action -> getMessage(Config.depositAllLine, "%amount%", action.getItemStack().getAmount(), "%item%", translationManager.translateItemStack(action.getItemStack()), "%price%", action.getItemButton().getEconomy().format(transformPrice(action.getPrice()), action.getPrice()))).collect(Collectors.toList()), "", "");
+        String resultsReason = toList(fixedShopActions.stream().map(action -> getMessage(Config.depositAllLine, "%amount%", action.getTotalAmount(), "%item%", translationManager.translateItemStack(action.getItemStack()), "%price%", action.getItemButton().getEconomy().format(transformPrice(action.getPrice()), action.getPrice()))).collect(Collectors.toList()), "", "");
         prices.forEach((economy, price) -> economy.depositMoney(player, price, Config.depositAllReason.replace("%items%", resultsReason == null ? "" : resultsReason)));
 
         message(this.plugin, player, Message.SELL_ALL_MESSAGE, "%items%", results == null ? "ERROR" : results);
@@ -510,7 +534,7 @@ public void sellAllContent(Player player, org.bukkit.inventory.Inventory invento
     public void sellHand(Player player, int amount) {
 
         ItemStack itemInHand = player.getItemInHand(); // Use old method for 1.8 support
-        if (itemInHand == null || itemInHand.getType().equals(Material.AIR)) {
+        if (itemInHand.getType().equals(Material.AIR)) {
             message(this.plugin, player, Message.SELL_HAND_AIR);
             return;
         }

src/main/java/fr/maxlego08/shop/buttons/ConfirmationButton.java

@@ -6,17 +6,57 @@
 import fr.maxlego08.menu.api.utils.Placeholders;
 import fr.maxlego08.shop.ShopPlugin;
 import fr.maxlego08.shop.api.PlayerCache;
+import fr.maxlego08.shop.api.buttons.ItemButton;
 import fr.maxlego08.shop.api.buttons.ShowItemButton;
 import fr.maxlego08.shop.save.ConfirmAction;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.plugin.Plugin;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
-public class ConfirmationButton extends Button {
+public abstract class ConfirmationButton extends Button {
 
+    protected ShopPlugin plugin;
     private Inventory inventory;
 
+    public ConfirmationButton(Plugin plugin) {
+        this.plugin = (ShopPlugin) plugin;
+    }
+
+    @Override
+    public ItemStack getCustomItemStack(Player player, Placeholders placeholders) {
+        ItemStack itemStack = super.getCustomItemStack(player, placeholders);
+
+        PlayerCache playerCache = this.plugin.getShopManager().getCache(player);
+        ItemButton itemButton = playerCache.getItemButton();
+        if (itemButton == null) return itemStack;
+
+        int amount = playerCache.getAmount();
+        String sellPrice = itemButton.getSellPriceFormat(player, amount);
+        String buyPrice = itemButton.getBuyPriceFormat(player, amount);
+
+        ItemMeta itemMeta = itemStack.getItemMeta();
+        if (itemMeta != null && itemMeta.hasLore()) {
+            List<String> lore = itemMeta.getLore();
+            if (lore != null) {
+                List<String> newLore = lore.stream().map(line -> {
+                    line = line.replace("%sellPrice%", sellPrice);
+                    line = line.replace("%buyPrice%", buyPrice);
+                    return line;
+                }).collect(Collectors.toList());
+                itemMeta.setLore(newLore);
+                itemStack.setItemMeta(itemMeta);
+            }
+        }
+
+        return itemStack;
+    }
+
     protected void action(Player player, InventoryEngine inventory, ConfirmAction confirmAction, ShopPlugin plugin, PlayerCache cache) {
+        var placeholders = new Placeholders();
         switch (confirmAction) {
             case CLOSE:
                 player.closeInventory();
@@ -32,7 +72,7 @@ protected void action(Player player, InventoryEngine inventory, ConfirmAction co
                 break;
             case RESET_AMOUNT:
                 cache.setItemAmount(1);
-                inventory.getButtons().stream().filter(button -> button instanceof ShowItemButton).forEach(inventory::buildButton);
+                inventory.getButtons().stream().filter(button -> button instanceof ShowItemButton).forEach(b -> inventory.buildButton(b, placeholders));
                 break;
         }
     }
@@ -42,7 +82,7 @@ public void onInventoryOpen(Player player, InventoryEngine inventory, Placeholde
         super.onInventoryOpen(player, inventory, placeholders);
         List<Inventory> oldInventories = inventory.getOldInventories();
         if (!oldInventories.isEmpty()) {
-            this.inventory = oldInventories.get(oldInventories.size() - 1);
+            this.inventory = oldInventories.getLast();
         }
     }
 }

src/main/java/fr/maxlego08/shop/buttons/ZAddButton.java

@@ -9,6 +9,7 @@
 import fr.maxlego08.shop.placeholder.Placeholder;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class ZAddButton extends AddButton {
 
@@ -36,13 +37,13 @@ public int parseInt(Player player) {
     }
 
     @Override
-    public void onClick(Player player, InventoryClickEvent event, InventoryEngine inventory, int slot, Placeholders placeholders) {
+    public void onClick(@NotNull Player player, @NotNull InventoryClickEvent event, @NotNull InventoryEngine inventory, int slot, @NotNull Placeholders placeholders) {
         super.onClick(player, event, inventory, slot, placeholders);
 
         int amount = parseInt(player);
         PlayerCache cache = this.plugin.getShopManager().getCache(player);
         cache.setItemAmount(Math.min(cache.getAmount() + amount, cache.getItemButton().getMaxStack()));
 
-        inventory.getButtons().stream().filter(button -> button instanceof ShowItemButton).forEach(inventory::buildButton);
+        inventory.getButtons().stream().filter(button -> button instanceof ShowItemButton || button instanceof ConfirmationButton).forEach(b -> inventory.buildButton(b, placeholders));
     }
 }

src/main/java/fr/maxlego08/shop/buttons/ZBuyMore.java

@@ -7,6 +7,7 @@
 import fr.maxlego08.shop.api.buttons.ItemButton;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.jetbrains.annotations.NotNull;
 
 public class ZBuyMore extends BuyMore {
 
@@ -19,7 +20,7 @@ public ZBuyMore(ShopPlugin plugin, int stack) {
     }
 
     @Override
-    public void onClick(Player player, InventoryClickEvent event, InventoryEngine inventory, int slot, Placeholders placeholders) {
+    public void onClick(@NotNull Player player, @NotNull InventoryClickEvent event, @NotNull InventoryEngine inventory, int slot, @NotNull Placeholders placeholders) {
         super.onClick(player, event, inventory, slot, placeholders);
 
         ItemButton itemButton = this.plugin.getShopManager().getCache(player).getItemButton();