feat: upgrade shop prefab

ScreamingSandals · Aug 24, 2024 · aad855d · aad855d
1 parent 6e1c5b2
commit aad855d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/plugin/common/src/main/java/org/screamingsandals/bedwars/commands/AdminCommand.java b/plugin/common/src/main/java/org/screamingsandals/bedwars/commands/AdminCommand.java
@@ -28,6 +28,7 @@
 import org.screamingsandals.lib.sender.CommandSender;
 import org.screamingsandals.lib.utils.annotations.Service;
 import org.screamingsandals.lib.utils.annotations.ServiceDependencies;
+import org.screamingsandals.lib.utils.annotations.methods.OnDisable;
 import org.screamingsandals.lib.utils.annotations.methods.Provider;
 
 import java.util.HashMap;
@@ -82,4 +83,9 @@ protected void construct(Command.Builder<CommandSender> commandSenderWrapperBuil
                         )
                 );
     }
+
+    @OnDisable
+    public void onDisable() {
+        gc.clear();
+    }
 }
diff --git a/plugin/common/src/main/java/org/screamingsandals/bedwars/commands/admin/PrefabCommand.java b/plugin/common/src/main/java/org/screamingsandals/bedwars/commands/admin/PrefabCommand.java
@@ -57,7 +57,7 @@ public void construct(CommandManager<CommandSender> manager, Command.Builder<Com
                                 return;
                             }
 
-                            prefab.place(sender.as(Player.class));
+                            prefab.place(game, sender.as(Player.class));
                         }))
         );
     }

diff --git a/plugin/common/src/main/java/org/screamingsandals/bedwars/variants/prefab/CommandPrefab.java b/plugin/common/src/main/java/org/screamingsandals/bedwars/variants/prefab/CommandPrefab.java
@@ -23,6 +23,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
+import org.screamingsandals.bedwars.api.game.Game;
 import org.screamingsandals.lib.player.Player;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -39,11 +40,12 @@ public class CommandPrefab implements Prefab {
     private @NotNull List<@NotNull String> commands;
 
     @Override
-    public void place(Player player) {
+    public void place(@NotNull Game game, @NotNull Player player) {
         commands.forEach(s -> {
             if (s.startsWith("/")) {
                 s = s.substring(1);
             }
+            s = s.replace("%game%", game.getName());
 
             player.tryToDispatchCommand(s);
         });

diff --git a/plugin/common/src/main/java/org/screamingsandals/bedwars/variants/prefab/Prefab.java b/plugin/common/src/main/java/org/screamingsandals/bedwars/variants/prefab/Prefab.java
@@ -20,12 +20,13 @@
 package org.screamingsandals.bedwars.variants.prefab;
 
 import org.jetbrains.annotations.NotNull;
+import org.screamingsandals.bedwars.api.game.Game;
 import org.screamingsandals.lib.player.Player;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
 
 public interface Prefab {
-    void place(Player player);
+    void place(@NotNull Game game, @NotNull Player player);
 
     interface Loader<T extends Prefab> {
         @NotNull Prefab load(@NotNull ConfigurationNode node) throws ConfigurateException;

diff --git a/plugin/common/src/main/resources/variants/certain-popular-server.yml b/plugin/common/src/main/resources/variants/certain-popular-server.yml
@@ -126,4 +126,11 @@ custom-spawner-types:
     color: GOLD
     name: Gold
 
-# TODO: prefabs (already done shops with skin, shop file etc.)
+# TODO: prefabs (already done shops with skin, shop file etc.)
+prefabs:
+  # Usage: /bw admin <arena> prefab upgradeShop
+  upgradeShop:
+    type: command
+    commands:
+      - /bw admin %game% store add
+      - /bw admin %game% store file set certain-popular-server/upgradeShop.yml