Dev/feature - Future Update

.editorconfig

@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 ij_continuation_indent_size = 4
 [*.yml]
 indent_size = 2
+[*.java]
+ij_java_class_count_to_use_import_on_demand = 999999
+ij_java_names_count_to_use_import_on_demand = 999999

build.gradle.kts

@@ -5,9 +5,9 @@ plugins {
 // Version of HungerGames
 val projectVersion = "5.0.0-beta1"
 // Where this builds on the server
-val serverLocation = "1-21-4"
+val serverLocation = "1-21-5"
 // Minecraft version to build against
-val minecraftVersion = "1.21.4"
+val minecraftVersion = "1.21.5"
 
 java.sourceCompatibility = JavaVersion.VERSION_21
 
@@ -41,7 +41,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:${minecraftVersion}-R0.1-SNAPSHOT")
 
     // Command Api
-    implementation("dev.jorel:commandapi-bukkit-shade:9.7.0")
+    implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:10.0.1")
 
     // bStats
     implementation("org.bstats:bstats-bukkit:3.1.0")
@@ -53,7 +53,7 @@ dependencies {
     compileOnly("me.clip:placeholderapi:2.11.6")
 
     // NBT-API
-    implementation("de.tr7zw:item-nbt-api:2.14.2-SNAPSHOT") {
+    implementation("de.tr7zw:item-nbt-api:2.15.0") {
         isTransitive = false
     }
 
@@ -77,7 +77,7 @@ tasks {
     }
     processResources {
         val prop = ("version" to projectVersion)
-        filesMatching("plugin.yml") {
+        filesMatching("paper-plugin.yml") {
             expand(prop)
         }
     }
@@ -91,16 +91,16 @@ tasks {
         exclude("com/shanebeestudios/hg/plugin/commands")
         exclude("com/shanebeestudios/hg/plugin/listeners")
         (options as StandardJavadocDocletOptions).links(
-            "https://jd.papermc.io/paper/1.21.1/",
+            "https://jd.papermc.io/paper/1.21.5/",
             "https://jd.advntr.dev/api/4.17.0/",
             "https://tr7zw.github.io/Item-NBT-API/v2-api/"
         )
 
     }
     shadowJar {
-        relocate("fr.mrmicky.fastboard", "com.shanebeestudios.hg.api.fastboard")
-        relocate("dev.jorel.commandapi", "com.shanebeestudios.hg.api.commandapi")
-        relocate("de.tr7zw.changeme.nbtapi", "com.shanebeestudios.hg.api.nbt")
+        relocate("fr.mrmicky.fastboard", "com.shanebeestudios.hg.shaded-api.fastboard")
+        relocate("dev.jorel.commandapi", "com.shanebeestudios.hg.shaded-api.commandapi")
+        relocate("de.tr7zw.changeme.nbtapi", "com.shanebeestudios.hg.shaded-api.nbt")
         relocate("org.bstats", "com.shanebeestudios.hg.api.metrics")
         archiveFileName = "HungerGames-${projectVersion}.jar"
     }

src/main/java/com/shanebeestudios/hg/api/command/CustomArg.java

@@ -1,22 +1,30 @@
 package com.shanebeestudios.hg.api.command;
 
+import com.shanebeestudios.hg.api.data.PlayerData;
 import com.shanebeestudios.hg.api.game.Game;
+import com.shanebeestudios.hg.api.game.GameTeam;
+import com.shanebeestudios.hg.api.util.Util;
+import com.shanebeestudios.hg.plugin.HungerGames;
+import com.shanebeestudios.hg.plugin.configs.Language;
 import com.shanebeestudios.hg.plugin.managers.GameManager;
-import dev.jorel.commandapi.CommandAPI;
+import com.shanebeestudios.hg.plugin.managers.PlayerManager;
 import dev.jorel.commandapi.arguments.Argument;
 import dev.jorel.commandapi.arguments.ArgumentSuggestions;
 import dev.jorel.commandapi.arguments.CustomArgument;
+import dev.jorel.commandapi.arguments.EntitySelectorArgument;
 import dev.jorel.commandapi.arguments.StringArgument;
-import dev.jorel.commandapi.exceptions.WrapperCommandSyntaxException;
-import dev.jorel.commandapi.executors.ExecutionInfo;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.ApiStatus;
 
+import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.CompletableFuture;
 
 public abstract class CustomArg {
 
+    private static Language LANG;
     private static GameManager GAME_MANAGER;
+    private static PlayerManager PLAYER_MANAGER;
 
     /**
      * Initialize GameManager constant
@@ -25,20 +33,10 @@ public abstract class CustomArg {
      * @param gameManager GameManager instance
      */
     @ApiStatus.Internal
-    public static void init(GameManager gameManager) {
+    public static void init(HungerGames plugin, GameManager gameManager) {
+        LANG = plugin.getLang();
         GAME_MANAGER = gameManager;
-    }
-
-    /**
-     * @hidden
-     */
-    public static Game getGame(ExecutionInfo<?, ?> info) throws WrapperCommandSyntaxException {
-        Game game = info.args().getByClass("game", Game.class);
-        if (game == null) {
-            String raw = info.args().getRaw("game");
-            throw CommandAPI.failWithString("invalid game '" + raw + "'");
-        }
-        return game;
+        PLAYER_MANAGER = plugin.getPlayerManager();
     }
 
     /**
@@ -47,10 +45,87 @@ public static Game getGame(ExecutionInfo<?, ?> info) throws WrapperCommandSyntax
     public static final CustomArg GAME = new CustomArg() {
         @Override
         public Argument<?> get(String name) {
-            return new CustomArgument<>(new StringArgument(name), info ->
-                GAME_MANAGER.getGame(info.input().toLowerCase(Locale.ROOT)))
-                .includeSuggestions(ArgumentSuggestions.stringCollectionAsync(info ->
-                    CompletableFuture.supplyAsync(GAME_MANAGER::getGameNames)));
+            return new CustomArgument<>(new StringArgument(name), info -> {
+                String gameName = info.input().toLowerCase(Locale.ROOT);
+                Game game = GAME_MANAGER.getGame(gameName);
+                if (game == null) {
+                    String msg = LANG.command_base_invalid_game.replace("<arena>", gameName);
+                    Util.throwCustomArgException(msg);
+                }
+                return game;
+            }).includeSuggestions(ArgumentSuggestions.stringCollectionAsync(info ->
+                CompletableFuture.supplyAsync(GAME_MANAGER::getGameNames)));
+        }
+    };
+
+    public static final CustomArg GAME_PLAYER_FOR_TEAM = new CustomArg() {
+        @Override
+        public Argument<?> get(String name) {
+            return new CustomArgument<>(new EntitySelectorArgument.OnePlayer(name), info -> {
+                Player player = info.currentInput();
+                if (PLAYER_MANAGER.getGame(player) == null) {
+                    String msg = LANG.command_team_player_not_available.replace("<player>", player.getName());
+                    Util.throwCustomArgException(msg);
+                }
+                return player;
+            }).replaceSuggestions(ArgumentSuggestions.stringCollectionAsync(info -> {
+                if (!(info.sender() instanceof Player player)) return null;
+
+                // No player data = no game
+                PlayerData playerData = PLAYER_MANAGER.getPlayerData(player);
+                if (playerData == null) return null;
+
+                // Not in game = no team
+                Game game = playerData.getGame();
+                if (game == null) return null;
+
+                // No team = no invite
+                GameTeam gameTeam = game.getGameScoreboard().getGameTeam(player);
+                if (gameTeam == null) return null;
+
+                // Only leader can invite players
+                if (gameTeam.getLeader() != player) return null;
+
+                List<String> names = game.getGamePlayerData().getPlayers().stream()
+                    .filter(p -> !gameTeam.isOnTeam(p) && !gameTeam.isPending(p))
+                    .map(Player::getName)
+                    .toList();
+                return CompletableFuture.supplyAsync(() -> names);
+            }));
+        }
+    };
+
+    public static final CustomArg GAME_PLAYER_ON_TEAM = new CustomArg() {
+        @Override
+        public Argument<?> get(String name) {
+            return new CustomArgument<>(new EntitySelectorArgument.OnePlayer(name), info -> {
+                Player player = info.currentInput();
+                if (PLAYER_MANAGER.getGame(player) == null) {
+                    String msg = LANG.command_team_player_not_available.replace("<player>", player.getName());
+                    Util.throwCustomArgException(msg);
+                }
+                return player;
+            }).replaceSuggestions(ArgumentSuggestions.stringCollectionAsync(info -> {
+                if (!(info.sender() instanceof Player player)) return null;
+
+                // No player data = no game
+                PlayerData playerData = PLAYER_MANAGER.getPlayerData(player);
+                if (playerData == null) return null;
+
+                // Not in game = no team
+                Game game = playerData.getGame();
+                if (game == null) return null;
+
+                // No team = no team members
+                GameTeam gameTeam = game.getGameScoreboard().getGameTeam(player);
+                if (gameTeam == null) return null;
+
+                List<String> names = gameTeam.getPlayers().stream()
+                    .filter(teamMember -> teamMember != player)
+                    .map(Player::getName)
+                    .toList();
+                return CompletableFuture.supplyAsync(() -> names);
+            }));
         }
     };
 

src/main/java/com/shanebeestudios/hg/api/data/KitData.java

@@ -4,12 +4,14 @@
 import com.shanebeestudios.hg.api.util.Util;
 import com.shanebeestudios.hg.plugin.HungerGames;
 import com.shanebeestudios.hg.plugin.configs.Language;
+import com.shanebeestudios.hg.plugin.managers.PlayerManager;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.StringJoiner;
 
 /**
@@ -18,38 +20,53 @@
 @SuppressWarnings("unused")
 public class KitData {
 
+    private final PlayerManager playerManager = HungerGames.getPlugin().getPlayerManager();
     private final Language lang = HungerGames.getPlugin().getLang();
-    private final HashMap<String, KitEntry> kitEntries = new HashMap<>();
+    private final Map<String, KitEntry> kitEntries = new HashMap<>();
+    private final Map<Player, KitEntry> preselectedKits = new HashMap<>();
 
     public boolean hasKitPermission(Player player, String kitName) {
         KitEntry kitEntry = this.kitEntries.get(kitName);
         return kitEntry == null || kitEntry.hasKitPermission(player);
     }
 
     /**
-     * Give a player the default kit
+     * Give a player a preselected or default kit
+     * <p>If the player selected a kit in the KitGui before the game
+     * started, they will get this.
+     * Otherwise, if there is a default kit set up they will get that.</p>
      *
      * @param player Player to give kit to
      */
-    public void giveDefaultKit(Player player) {
-        if (this.kitEntries.containsKey("default")) {
-            setKit(player, "default");
+    public void givePreselectedOrDefaultKit(Player player) {
+        if (this.preselectedKits.containsKey(player)) {
+            KitEntry kitEntry = this.preselectedKits.get(player);
+            this.preselectedKits.remove(player);
+            kitEntry.setInventoryContent(player);
+        } else if (this.kitEntries.containsKey("default")) {
+            setKit(player, this.kitEntries.get("default"));
             Util.sendPrefixedMessage(player, this.lang.kits_give_default);
         }
     }
 
     /**
      * Set a kit for a player
      *
-     * @param player  The player to set the kit for
-     * @param kitName The name of the kit to set
+     * @param player   The player to set the kit for
+     * @param kitEntry The kit to set
      */
-    public void setKit(Player player, String kitName) {
-        if (!this.kitEntries.containsKey(kitName)) {
-            Util.sendMessage(player, "<red>" + kitName + this.lang.kits_doesnt_exist);
-            Util.sendMessage(player, "Available Kits:" + getKitListString(player));
+    public void setKit(Player player, KitEntry kitEntry) {
+        PlayerData playerData = this.playerManager.getPlayerData(player);
+        // This shouldn't happen, but just in case
+        if (playerData == null) return;
+
+        if (playerData.hasGameStared()) {
+            kitEntry.setInventoryContent(player);
+            this.preselectedKits.remove(player);
         } else {
-            this.kitEntries.get(kitName).setInventoryContent(player);
+            this.preselectedKits.put(player, kitEntry);
+            Util.sendPrefixedMessage(player, this.lang.kits_kit_gui_pre_select
+                .replace("<kit>", kitEntry.getName()));
         }
     }
 
@@ -132,4 +149,8 @@ public void clearKits() {
         this.kitEntries.clear();
     }
 
+    public void clearPreselectedKits() {
+        this.preselectedKits.clear();
+    }
+
 }

src/main/java/com/shanebeestudios/hg/api/data/KitEntry.java

@@ -1,7 +1,7 @@
 package com.shanebeestudios.hg.api.data;
 
-import com.shanebeestudios.hg.api.util.Util;
 import com.shanebeestudios.hg.api.game.Game;
+import com.shanebeestudios.hg.api.util.Util;
 import com.shanebeestudios.hg.plugin.permission.Permissions;
 import com.shanebeestudios.hg.plugin.permission.Permissions.Permission;
 import org.bukkit.entity.Player;