feat: spawner auto discovery, fixed upgrade shop config

Author: Misat11

plugin/common/src/main/java/org/screamingsandals/bedwars/inventories/ShopInventory.java

@@ -28,6 +28,7 @@
 import org.screamingsandals.bedwars.api.PurchaseType;
 import org.screamingsandals.bedwars.api.config.GameConfigurationContainer;
 import org.screamingsandals.bedwars.api.events.OpenShopEvent;
+import org.screamingsandals.bedwars.api.game.ItemSpawner;
 import org.screamingsandals.bedwars.api.game.StoreManager;
 import org.screamingsandals.bedwars.api.player.BWPlayer;
 import org.screamingsandals.bedwars.commands.DumpCommand;
@@ -679,10 +680,42 @@ private void handleUpgrade(@NotNull OnTradeEvent event) {
                         String customName = spawnerNameNode.getString();
                         upgrades = upgradeStorage.findItemSpawnerUpgrades(game, customName);
                     } else if (!spawnerTypeNode.empty()) {
-                        String mapSpawnerType = spawnerTypeNode.getString();
-                        ItemSpawnerType spawnerType = game.getGameVariant().getItemSpawnerType(mapSpawnerType);
+                        List<ItemSpawnerType> types = new ArrayList<>();
+                        if (spawnerTypeNode.isList()) {
+                            for (var child : spawnerTypeNode.childrenList()) {
+                                String mapSpawnerType = child.getString();
+                                ItemSpawnerType spawnerType = game.getGameVariant().getItemSpawnerType(mapSpawnerType);
+                                types.add(spawnerType);
+
+                                upgrades.addAll(upgradeStorage.findItemSpawnerUpgrades(game, team, spawnerType));
+                            }
+                        } else {
+                            String mapSpawnerType = spawnerTypeNode.getString();
+                            ItemSpawnerType spawnerType = game.getGameVariant().getItemSpawnerType(mapSpawnerType);
+                            types.add(spawnerType);
+
+                            upgrades = upgradeStorage.findItemSpawnerUpgrades(game, team, spawnerType);
+                        }
+
+                        if (upgrades.isEmpty() && entity.node("auto-discover-spawners-if-not-linked").getBoolean()) {
+                            for (var spawnerType : types) {
+                                double closestDistance = Double.MAX_VALUE;
+                                ItemSpawner closestSpawner = null;
+                                for (var spawner : game.getItemSpawners()) {
+                                    if (spawner.getItemSpawnerType().toSpawnerType(game) == spawnerType) {
+                                        double distance = team.getRandomSpawn().getDistanceSquared(spawner.getLocation());
+                                        if (distance < closestDistance) {
+                                            closestDistance = distance;
+                                            closestSpawner = spawner;
+                                        }
 
-                        upgrades = upgradeStorage.findItemSpawnerUpgrades(game, team, spawnerType);
+                                    }
+                                }
+                                if (closestSpawner != null) {
+                                    upgrades.add(closestSpawner);
+                                }
+                            }
+                        }
                     } else if (!teamUpgradeNode.empty()) {
                         boolean upgradeAllSpawnersInTeam = teamUpgradeNode.getBoolean();
 

plugin/common/src/main/resources/shop/certain-popular-server/upgrade-shop.yml

@@ -17,66 +17,70 @@
 # along with Screaming BedWars. If not, see <https://www.gnu.org/licenses/>.
 #
 
-# TODO: change properties to be more specific (maybe certain_popular_server prefix??)
 data:
   - stack: "IRON_CHESTPLATE;1;Protection;Click here to get more resistance to damage!"
     column: 2
     price: 4 of diamond
     properties:
-      upgrade:
-        entities:
-          - type: team
-            upgrade-name: protection
+      name: upgrade
+      entities:
+        - type: team
+          upgrade-name: protection
 
   - stack: "IRON_SWORD;1;Sharpness;Kill players quicker!."
     column: 1
     price: 4 of diamond
     properties:
-      upgrade:
-        entities:
-          - type: team
-            upgrade-name: sharpness
+      name: upgrade
+      entities:
+        - type: team
+          upgrade-name: sharpness
 
   - stack: "GOLDEN_PICKAXE;1;Efficiency;Break Blocks quicker!."
     price: 4 of diamond
     column: 3
     properties:
-      upgrade:
-        entities:
-          - type: team
-            upgrade-name: efficiency
+      name: upgrade
+      entities:
+        - type: team
+          upgrade-name: efficiency
 
   - price: 4 of iron
+    properties:
+      name: upgrade
+      entities:
+        - type: spawner
+          add-levels: 0.2
+          max-level: 2
+          spawner-type:
+            - iron
+            - gold
+          auto-discover-spawners-if-not-linked: true
     stack:
       type: FURNACE
       amount: 1
-      display-name: "Forge Upgrade, Unconfigured"
-      # TODO: configure
+      display-name: "Forge Upgrade"
 
   - stack: "BEACON;1;§bHeal Pool;§7Triggers a pool around the base that heals you!"
     column: 5
     row: 1
     properties:
-      upgrade:
-        entities:
-          - type: team
-            upgrade-name: healpool
+      name: upgrade
+      entities:
+        - type: team
+          upgrade-name: healpool
     price: 8 of diamond
 
-  - stack: "DRAGON_EGG;1;Ender Dragon;Get A Bonus Dragon when Dragons get summoned!"
-    column: 6
-    row: 1
-
   - stack: "LEATHER;1;TRAPS;TRAP YOUR ENEMY"
     column: 7
     items:
       - price: 2 of diamond
         skip: 1
         properties:
-          upgrade:
-            entities:
-              - type: team
-                upgrade-name: blindtrap
+          name: upgrade
+          entities:
+            - type: team
+              upgrade-name: blindtrap
         stack:
           type: STRING
           display-name: "§bBlindess trap"
@@ -87,10 +91,10 @@ data:
       - price: 2 of diamond
         skip: 1
         properties:
-          upgrade:
-            entities:
-              - type: team
-                upgrade-name: minertrap
+          name: upgrade
+          entities:
+            - type: team
+              upgrade-name: minertrap
         stack:
           type: STRING
           display-name: "§bMining Fatigue trap"