Merge 26.2 with 26.1.2

.github/workflows/build.yml

@@ -2,7 +2,6 @@ name: Build and Test
 
 on:
   push:
-  pull_request:
 
 permissions:
   contents: read

src/main/java/dev/xdpxi/swiftmc/Main.java

@@ -214,6 +214,9 @@ static void server() throws Exception {
         MinecraftServer.getCommandManager().register(new Teleport());
         MinecraftServer.getCommandManager().register(new Op());
         MinecraftServer.getCommandManager().register(new Deop());
+        MinecraftServer.getCommandManager().register(new Kick());
+        MinecraftServer.getCommandManager().register(new Ban());
+        MinecraftServer.getCommandManager().register(new Unban());
         Log.info("Commands registered.");
 
         // Minestom PVP Events

src/main/java/dev/xdpxi/swiftmc/commands/Ban.java

@@ -0,0 +1,60 @@
+package dev.xdpxi.swiftmc.commands;
+
+import dev.xdpxi.swiftmc.player.PlayerDataManager;
+import dev.xdpxi.swiftmc.utils.Log;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.command.ConsoleSender;
+import net.minestom.server.command.builder.Command;
+import net.minestom.server.command.builder.arguments.ArgumentType;
+import net.minestom.server.command.builder.suggestion.SuggestionEntry;
+import net.minestom.server.entity.Player;
+
+public class Ban extends Command {
+
+    public Ban() {
+        super("ban");
+
+        var nameArg = ArgumentType.Word("player")
+                .setSuggestionCallback((sender, context, suggestion) -> {
+                    for (Player online : MinecraftServer.getConnectionManager().getOnlinePlayers()) {
+                        suggestion.addEntry(new SuggestionEntry(online.getUsername()));
+                    }
+                });
+        var reasonArg = ArgumentType.StringArray("reason");
+
+        setCondition((sender, cmd) ->
+                sender instanceof ConsoleSender || (sender instanceof Player p && p.getPermissionLevel() >= 4)
+        );
+
+        setDefaultExecutor((sender, context) ->
+                sender.sendMessage(Component.text("Usage: /ban <player> [reason]", NamedTextColor.RED))
+        );
+
+        // /ban <player>
+        addSyntax((sender, context) -> {
+            String target = context.get(nameArg);
+            executeBan(sender, target, null);
+        }, nameArg);
+
+        // /ban <player> <reason>
+        addSyntax((sender, context) -> {
+            String target = context.get(nameArg);
+            String reason = String.join(" ", context.get(reasonArg));
+            executeBan(sender, target, reason);
+        }, nameArg, reasonArg);
+    }
+
+    private static void executeBan(net.minestom.server.command.CommandSender sender, String target, String reason) {
+        PlayerDataManager.setBan(target, true, reason).thenAccept(found -> {
+            if (found) {
+                sender.sendMessage(Component.text("Banned " + target + ".", NamedTextColor.GREEN));
+                Log.info((sender instanceof Player p ? p.getUsername() : "Console") + " banned " + target
+                        + (reason != null && !reason.isBlank() ? ": " + reason : ""));
+            } else {
+                sender.sendMessage(Component.text("Player '" + target + "' has never joined the server.", NamedTextColor.RED));
+            }
+        });
+    }
+}

src/main/java/dev/xdpxi/swiftmc/commands/Kick.java

@@ -0,0 +1,63 @@
+package dev.xdpxi.swiftmc.commands;
+
+import dev.xdpxi.swiftmc.utils.Log;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.minestom.server.MinecraftServer;
+import net.minestom.server.command.ConsoleSender;
+import net.minestom.server.command.builder.Command;
+import net.minestom.server.command.builder.arguments.ArgumentType;
+import net.minestom.server.command.builder.suggestion.SuggestionEntry;
+import net.minestom.server.entity.Player;
+
+public class Kick extends Command {
+
+    public Kick() {
+        super("kick");
+
+        var nameArg = ArgumentType.Word("player")
+                .setSuggestionCallback((sender, context, suggestion) -> {
+                    for (Player online : MinecraftServer.getConnectionManager().getOnlinePlayers()) {
+                        suggestion.addEntry(new SuggestionEntry(online.getUsername()));
+                    }
+                });
+        var reasonArg = ArgumentType.StringArray("reason");
+
+        setCondition((sender, cmd) ->
+                sender instanceof ConsoleSender || (sender instanceof Player p && p.getPermissionLevel() >= 2)
+        );
+
+        setDefaultExecutor((sender, context) ->
+                sender.sendMessage(Component.text("Usage: /kick <player> [reason]", NamedTextColor.RED))
+        );
+
+        // /kick <player>
+        addSyntax((sender, context) -> {
+            String target = context.get(nameArg);
+            kickPlayer(sender, target, null);
+        }, nameArg);
+
+        // /kick <player> <reason>
+        addSyntax((sender, context) -> {
+            String target = context.get(nameArg);
+            String reason = String.join(" ", context.get(reasonArg));
+            kickPlayer(sender, target, reason);
+        }, nameArg, reasonArg);
+    }
+
+    private static void kickPlayer(net.minestom.server.command.CommandSender sender, String target, String reason) {
+        for (Player online : MinecraftServer.getConnectionManager().getOnlinePlayers()) {
+            if (online.getUsername().equalsIgnoreCase(target)) {
+                String msg = reason != null && !reason.isBlank()
+                        ? "Kicked by an operator: " + reason
+                        : "Kicked by an operator.";
+                online.kick(Component.text(msg, NamedTextColor.RED));
+                sender.sendMessage(Component.text("Kicked " + online.getUsername() + ".", NamedTextColor.GREEN));
+                Log.info((sender instanceof Player p ? p.getUsername() : "Console") + " kicked " + online.getUsername()
+                        + (reason != null && !reason.isBlank() ? ": " + reason : ""));
+                return;
+            }
+        }
+        sender.sendMessage(Component.text("Player '" + target + "' is not online.", NamedTextColor.RED));
+    }
+}

src/main/java/dev/xdpxi/swiftmc/commands/Unban.java

@@ -0,0 +1,39 @@
+package dev.xdpxi.swiftmc.commands;
+
+import dev.xdpxi.swiftmc.player.PlayerDataManager;
+import dev.xdpxi.swiftmc.utils.Log;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.minestom.server.command.ConsoleSender;
+import net.minestom.server.command.builder.Command;
+import net.minestom.server.command.builder.arguments.ArgumentType;
+import net.minestom.server.entity.Player;
+
+public class Unban extends Command {
+
+    public Unban() {
+        super("unban", "pardon");
+
+        var nameArg = ArgumentType.Word("player");
+
+        setCondition((sender, cmd) ->
+                sender instanceof ConsoleSender || (sender instanceof Player p && p.getPermissionLevel() >= 4)
+        );
+
+        setDefaultExecutor((sender, context) ->
+                sender.sendMessage(Component.text("Usage: /unban <player>", NamedTextColor.RED))
+        );
+
+        addSyntax((sender, context) -> {
+            String target = context.get(nameArg);
+            PlayerDataManager.setBan(target, false, "").thenAccept(found -> {
+                if (found) {
+                    sender.sendMessage(Component.text("Unbanned " + target + ".", NamedTextColor.GREEN));
+                    Log.info((sender instanceof Player p ? p.getUsername() : "Console") + " unbanned " + target);
+                } else {
+                    sender.sendMessage(Component.text("Player '" + target + "' has never joined the server.", NamedTextColor.RED));
+                }
+            });
+        }, nameArg);
+    }
+}

src/main/java/dev/xdpxi/swiftmc/events/AsyncPlayerConfigurationEvent.java

@@ -1,24 +1,37 @@
 package dev.xdpxi.swiftmc.events;
 
+import dev.xdpxi.swiftmc.player.PlayerData;
+import dev.xdpxi.swiftmc.player.PlayerDataManager;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.GlobalEventHandler;
 import net.minestom.server.instance.InstanceContainer;
 import org.jspecify.annotations.NonNull;
 
 public class AsyncPlayerConfigurationEvent {
 
     public static void addListener(
             @NonNull GlobalEventHandler globalEventHandler,
             InstanceContainer instanceContainer
     ) {
         globalEventHandler.addListener(
-                net.minestom.server.event.player
-                        .AsyncPlayerConfigurationEvent.class,
+                net.minestom.server.event.player.AsyncPlayerConfigurationEvent.class,
                 event -> {
                     final Player player = event.getPlayer();
-                    event.setSpawningInstance(instanceContainer);
                     player.setRespawnPoint(new Pos(0, 64, 0));
+
+                    PlayerData data = PlayerDataManager.loadDataByUuid(player.getUuid()).join();
+                    if (data != null && data.banned) {
+                        String msg = data.banReason != null && !data.banReason.isBlank()
+                                ? "You are banned: " + data.banReason
+                                : "You are banned from this server.";
+                        player.kick(Component.text(msg, NamedTextColor.RED));
+                        return;
+                    }
+
+                    event.setSpawningInstance(instanceContainer);
                 }
         );
     }

src/main/java/dev/xdpxi/swiftmc/player/PlayerData.java

@@ -18,6 +18,8 @@ public class PlayerData {
     public float yaw, pitch;
     public GameMode gameMode;
     public boolean op = false;
+    public boolean banned = false;
+    public String banReason = "";
 
     public PlayerData() {
     }

src/main/java/dev/xdpxi/swiftmc/player/PlayerDataManager.java

@@ -85,6 +85,43 @@ public static void loadPlayer(@NonNull Player player) {
         }, IO_EXECUTOR);
     }
 
+    @Contract("_, _, _ -> new")
+    public static @NonNull CompletableFuture<Boolean> setBan(String username, boolean banned, String reason) {
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                if (!Files.exists(PLAYER_FOLDER)) return false;
+                for (Path file : Files.newDirectoryStream(PLAYER_FOLDER, "*.json")) {
+                    String json = Files.readString(file);
+                    PlayerData data = GSON.fromJson(json, PlayerData.class);
+                    if (data != null && username.equalsIgnoreCase(data.username)) {
+                        data.banned = banned;
+                        data.banReason = reason == null ? "" : reason;
+                        Files.writeString(file, GSON.toJson(data));
+                        if (banned) {
+                            for (Player online : MinecraftServer.getConnectionManager().getOnlinePlayers()) {
+                                if (online.getUsername().equalsIgnoreCase(username)) {
+                                    String msg = reason != null && !reason.isBlank()
+                                            ? "You have been banned: " + reason
+                                            : "You have been banned from this server.";
+                                    online.kick(msg);
+                                    break;
+                                }
+                            }
+                        }
+                        return true;
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            return false;
+        }, IO_EXECUTOR);
+    }
+
+    public static @NonNull CompletableFuture<PlayerData> loadDataByUuid(@NonNull UUID uuid) {
+        return loadDataAsync(uuid);
+    }
+
     @Contract("_, _ -> new")
     public static @NonNull CompletableFuture<Boolean> setOp(String username, boolean op) {
         return CompletableFuture.supplyAsync(() -> {