feat: ported new 0.2.32 features

cf18063 - feat: new placeholders %bedwars_all_games_players% and %bedwars_all_games_maxplayers% 59b6104 - feat: allow configuring currency-changer which returns more items than the player sells
ScreamingSandals · Feb 24, 2024 · e5379b6 · e5379b6
1 parent 5bd156c
commit e5379b6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/plugin/common/src/main/java/org/screamingsandals/bedwars/inventories/ShopInventory.java b/plugin/common/src/main/java/org/screamingsandals/bedwars/inventories/ShopInventory.java
@@ -448,12 +448,23 @@ private void handleBuy(OnTradeEvent event) {
                 return;
             }
 
+            var split = changeItemToName.trim().split(" ", 2);
+            if (split.length == 2) {
+                try {
+                    amount = Integer.parseInt(split[0]);
+                    changeItemToName = split[1].trim();
+                    if (changeItemToName.startsWith("of ")) {
+                        changeItemToName = changeItemToName.substring(3).trim();
+                    }
+                } catch (NumberFormatException ignored) {
+                }
+            }
             var changeItemType = game.getGameVariant().getItemSpawnerType(changeItemToName);
             if (changeItemType == null) {
                 return;
             }
 
-            newItem = changeItemType.getItem();
+            newItem = changeItemType.getItem(amount);
         }
 
         var originalMaxStackSize = newItem.getMaterial().maxStackSize();

diff --git a/...in/common/src/main/java/org/screamingsandals/bedwars/placeholderapi/BedwarsExpansion.java b/...in/common/src/main/java/org/screamingsandals/bedwars/placeholderapi/BedwarsExpansion.java
@@ -33,6 +33,8 @@
 import org.screamingsandals.lib.spectator.Component;
 import org.screamingsandals.lib.utils.annotations.Service;
 
+import java.util.Locale;
+
 @Service
 public class BedwarsExpansion extends PlaceholderExpansion {
 
@@ -81,6 +83,16 @@ public Component onRequest(@Nullable MultiPlatformOfflinePlayer player, @NotNull
             }
         }
 
+        if (identifier.startsWith("all_games_")) {
+            var operation = identifier.substring(10).toLowerCase(Locale.ROOT);
+            switch (operation) {
+                case "players":
+                    return Component.text(GameManagerImpl.getInstance().getGames().stream().mapToInt(GameImpl::countConnectedPlayers).sum());
+                case "maxplayers":
+                    return Component.text(GameManagerImpl.getInstance().getGames().stream().mapToInt(GameImpl::getMaxPlayers).sum());
+            }
+        }
+
         // other player stats
 
         if (identifier.startsWith("otherstats_")) {