Release 1.6.0 with TPA replication

2026-06-25 23:40:30 +08:00
parent b57c7d4843
commit 2479192ad3
27 changed files with 2344 additions and 223 deletions
@@ -40,6 +40,12 @@ public final class CommandRegistry {
        register("seen", "essentialsc.command.seen", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.SeenCommand", "info");
        register("feed", "essentialsc.command.feed", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.FeedCommand");
        register("repair", "essentialsc.command.repair", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.RepairCommand", "rep");
+        register("tpa", "essentialsc.command.tpa", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaCommand");
+        register("tpahere", "essentialsc.command.tpahere", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaHereCommand");
+        register("tpaall", "essentialsc.command.tpaall", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpaAllCommand");
+        register("tpaccept", "essentialsc.command.tpaccept", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpAcceptCommand", "tpyes");
+        register("tpdeny", "essentialsc.command.tpdeny", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpDenyCommand", "tpdecline", "tpno");
+        register("tpignore", "essentialsc.command.tpignore", ModuleManager.PLAYER, "cn.infstar.essentialsC.commands.TpIgnoreCommand");
        register("tpsbar", "essentialsc.command.tpsbar", ModuleManager.TPSBAR, "cn.infstar.essentialsC.commands.TpsBarCommand");
        register("mobdrops", "essentialsc.mobdrops.enderman", ModuleManager.MOB_DROPS, "cn.infstar.essentialsC.commands.MobDropCommand");
        register("maintenance", "essentialsc.command.maintenance", ModuleManager.MAINTENANCE, "cn.infstar.essentialsC.commands.MaintenanceCommand", "maint");
@@ -2,6 +2,7 @@ package cn.infstar.essentialsC.commands;

 import cn.infstar.essentialsC.EssentialsC;
 import cn.infstar.essentialsC.LangManager;
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -177,6 +178,30 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
            otherCommands.append(lang.getString("help.commands.seen")).append("\n");
            hasOtherCommands = true;
        }
+        if (CommandRegistry.isAvailable("tpa") && player.hasPermission("essentialsc.command.tpa")) {
+            otherCommands.append(lang.getString("help.commands.tpa")).append("\n");
+            hasOtherCommands = true;
+        }
+        if (CommandRegistry.isAvailable("tpahere") && player.hasPermission("essentialsc.command.tpahere")) {
+            otherCommands.append(lang.getString("help.commands.tpahere")).append("\n");
+            hasOtherCommands = true;
+        }
+        if (CommandRegistry.isAvailable("tpaall") && player.hasPermission("essentialsc.command.tpaall")) {
+            otherCommands.append(lang.getString("help.commands.tpaall")).append("\n");
+            hasOtherCommands = true;
+        }
+        if (CommandRegistry.isAvailable("tpaccept") && player.hasPermission("essentialsc.command.tpaccept")) {
+            otherCommands.append(lang.getString("help.commands.tpaccept")).append("\n");
+            hasOtherCommands = true;
+        }
+        if (CommandRegistry.isAvailable("tpdeny") && player.hasPermission("essentialsc.command.tpdeny")) {
+            otherCommands.append(lang.getString("help.commands.tpdeny")).append("\n");
+            hasOtherCommands = true;
+        }
+        if (CommandRegistry.isAvailable("tpignore") && player.hasPermission("essentialsc.command.tpignore")) {
+            otherCommands.append(lang.getString("help.commands.tpignore")).append("\n");
+            hasOtherCommands = true;
+        }
        if (CommandRegistry.isAvailable("admin") && player.hasPermission("essentialsc.command.admin")) {
            otherCommands.append(lang.getString("help.commands.admin")).append("\n");
            hasOtherCommands = true;
@@ -259,6 +284,15 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
                {"feed", "essentialsc.command.feed"},
                {"repair", "essentialsc.command.repair"},
                {"rep", "essentialsc.command.repair"},
+                {"tpa", "essentialsc.command.tpa"},
+                {"tpahere", "essentialsc.command.tpahere"},
+                {"tpaall", "essentialsc.command.tpaall"},
+                {"tpaccept", "essentialsc.command.tpaccept"},
+                {"tpyes", "essentialsc.command.tpaccept"},
+                {"tpdeny", "essentialsc.command.tpdeny"},
+                {"tpdecline", "essentialsc.command.tpdeny"},
+                {"tpno", "essentialsc.command.tpdeny"},
+                {"tpignore", "essentialsc.command.tpignore"},
                {"tpsbar", "essentialsc.command.tpsbar"},
                {"maintenance", "essentialsc.command.maintenance"},
                {"maint", "essentialsc.command.maintenance"},
@@ -296,6 +330,21 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
                return players;
            }

+            Player completionPlayer = sender instanceof Player senderPlayer ? senderPlayer : null;
+            if ((subCmd.equals("tpa") || subCmd.equals("tpahere"))
+                && completionPlayer != null
+                && sender.hasPermission("essentialsc.command." + subCmd)) {
+                return completeOnlinePlayers(completionPlayer, args[1], false);
+            }
+
+            if ((subCmd.equals("tpaccept") || subCmd.equals("tpyes") || subCmd.equals("tpdeny")
+                || subCmd.equals("tpdecline") || subCmd.equals("tpno"))
+                && completionPlayer != null
+                && (sender.hasPermission("essentialsc.command.tpaccept") || sender.hasPermission("essentialsc.command.tpdeny"))) {
+                TeleportRequestManager manager = plugin.getTeleportRequestManager();
+                return manager == null ? List.of() : manager.getIncomingRequesterNames(completionPlayer, args[1]);
+            }
+
            if ((subCmd.equals("nightvision") || subCmd.equals("nv")) && sender.hasPermission("essentialsc.command.nightvision")) {
                return completeToggleArgs(args[1]);
            }
@@ -335,6 +384,18 @@ public class HelpCommand extends BaseCommand implements TabCompleter {
        return completions;
    }

+    private List<String> completeOnlinePlayers(Player sender, String partialInput, boolean includeSelf) {
+        List<String> completions = new ArrayList<>();
+        String partial = partialInput.toLowerCase();
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            if ((includeSelf || !player.getUniqueId().equals(sender.getUniqueId()))
+                && player.getName().toLowerCase().startsWith(partial)) {
+                completions.add(player.getName());
+            }
+        }
+        return completions;
+    }
+
    private List<String> completeMaintenanceArgs(String partialInput) {
        List<String> completions = new ArrayList<>();
        String partial = partialInput.toLowerCase();
@@ -0,0 +1,87 @@
+package cn.infstar.essentialsC.commands;
+
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public final class TpAcceptCommand extends BaseCommand implements TabCompleter {
+
+    public TpAcceptCommand() {
+        super("essentialsc.command.tpaccept");
+    }
+
+    @Override
+    protected boolean execute(Player player, String[] args) {
+        if (args.length > 1) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.usage-tpaccept"));
+            return true;
+        }
+
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
+            return true;
+        }
+        if (manager.isIgnoringRequests(player)) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
+            return true;
+        }
+
+        Optional<TeleportRequestManager.TeleportRequest> request = manager.findIncoming(
+            player,
+            args.length == 0 ? null : args[0]
+        );
+        if (request.isEmpty()) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.no-request"));
+            return true;
+        }
+
+        TeleportRequestManager.TeleportRequest accepted = request.get();
+        Map<String, String> placeholders = manager.placeholders(accepted);
+        TeleportRequestManager.TeleportResult result = manager.accept(player, accepted);
+        if (result.status() == TeleportRequestManager.TeleportResult.Status.EXPIRED) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.expired", placeholders));
+            return true;
+        }
+        if (result.status() == TeleportRequestManager.TeleportResult.Status.PLAYER_OFFLINE) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.player-offline", placeholders));
+            return true;
+        }
+        if (result.status() == TeleportRequestManager.TeleportResult.Status.ALREADY_WARMING_UP) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.already-warming-up", placeholders));
+            return true;
+        }
+        if (result.status() == TeleportRequestManager.TeleportResult.Status.ON_COOLDOWN) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.accept-cooldown",
+                Map.of("seconds", String.valueOf(result.cooldownSeconds()))));
+            return true;
+        }
+
+        player.sendMessage(getLang().getPrefixedString("tpa.messages.accepted-target", placeholders));
+        Player requester = Bukkit.getPlayer(accepted.requesterId());
+        if (requester != null && requester.isOnline()) {
+            requester.sendMessage(getLang().getPrefixedString("tpa.messages.accepted-sender", placeholders));
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length != 1 || !(sender instanceof Player player)) {
+            return List.of();
+        }
+
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            return List.of();
+        }
+        return manager.getIncomingRequesterNames(player, args[0]);
+    }
+}
@@ -0,0 +1,74 @@
+package cn.infstar.essentialsC.commands;
+
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public final class TpDenyCommand extends BaseCommand implements TabCompleter {
+
+    public TpDenyCommand() {
+        super("essentialsc.command.tpdeny");
+    }
+
+    @Override
+    protected boolean execute(Player player, String[] args) {
+        if (args.length > 1) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.usage-tpdeny"));
+            return true;
+        }
+
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
+            return true;
+        }
+        if (manager.isIgnoringRequests(player)) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
+            return true;
+        }
+
+        Optional<TeleportRequestManager.TeleportRequest> request = manager.findIncoming(
+            player,
+            args.length == 0 ? null : args[0]
+        );
+        if (request.isEmpty()) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.no-request"));
+            return true;
+        }
+
+        TeleportRequestManager.TeleportRequest denied = request.get();
+        TeleportRequestManager.TeleportResult result = manager.deny(player, denied);
+        if (result.status() == TeleportRequestManager.TeleportResult.Status.EXPIRED) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.expired", manager.placeholders(denied)));
+            return true;
+        }
+
+        Map<String, String> placeholders = manager.placeholders(denied);
+        player.sendMessage(getLang().getPrefixedString("tpa.messages.denied-target", placeholders));
+        Player requester = Bukkit.getPlayer(denied.requesterId());
+        if (requester != null && requester.isOnline()) {
+            requester.sendMessage(getLang().getPrefixedString("tpa.messages.denied-sender", placeholders));
+        }
+        return true;
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length != 1 || !(sender instanceof Player player)) {
+            return List.of();
+        }
+
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            return List.of();
+        }
+        return manager.getIncomingRequesterNames(player, args[0]);
+    }
+}
@@ -0,0 +1,26 @@
+package cn.infstar.essentialsC.commands;
+
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
+import org.bukkit.entity.Player;
+
+public final class TpIgnoreCommand extends BaseCommand {
+
+    public TpIgnoreCommand() {
+        super("essentialsc.command.tpignore");
+    }
+
+    @Override
+    protected boolean execute(Player player, String[] args) {
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
+            return true;
+        }
+
+        boolean ignoring = manager.toggleIgnoringRequests(player);
+        player.sendMessage(getLang().getPrefixedString(ignoring
+            ? "tpa.messages.ignore-enabled"
+            : "tpa.messages.ignore-disabled"));
+        return true;
+    }
+}
@@ -0,0 +1,45 @@
+package cn.infstar.essentialsC.commands;
+
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
+import org.bukkit.entity.Player;
+
+import java.util.Map;
+
+public final class TpaAllCommand extends BaseCommand {
+
+    public TpaAllCommand() {
+        super("essentialsc.command.tpaall");
+    }
+
+    @Override
+    protected boolean execute(Player player, String[] args) {
+        if (args.length != 0) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.usage-tpaall"));
+            return true;
+        }
+
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
+            return true;
+        }
+        if (manager.isIgnoringRequests(player)) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
+            return true;
+        }
+
+        int sent = manager.sendTeleportAllRequest(player, target -> !VanishCommand.isVanished(target));
+        if (sent < 0) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.send-cooldown",
+                Map.of("seconds", String.valueOf(manager.getSendCooldownSeconds(player)))));
+            return true;
+        }
+        if (sent <= 0) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.tpaall-no-targets"));
+            return true;
+        }
+
+        player.sendMessage(getLang().getPrefixedString("tpa.messages.tpaall-sent"));
+        return true;
+    }
+}
@@ -0,0 +1,123 @@
+package cn.infstar.essentialsC.commands;
+
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.event.HoverEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class TpaCommand extends BaseCommand implements TabCompleter {
+
+    public TpaCommand() {
+        super("essentialsc.command.tpa");
+    }
+
+    @Override
+    protected boolean execute(Player player, String[] args) {
+        return sendRequest(player, args, TeleportRequestManager.TeleportRequest.Type.TPA);
+    }
+
+    protected boolean sendRequest(Player player, String[] args, TeleportRequestManager.TeleportRequest.Type type) {
+        if (args.length != 1) {
+            player.sendMessage(getLang().getPrefixedString(type == TeleportRequestManager.TeleportRequest.Type.TPA
+                ? "tpa.messages.usage-tpa"
+                : "tpa.messages.usage-tpahere"));
+            return true;
+        }
+
+        TeleportRequestManager manager = plugin.getTeleportRequestManager();
+        if (manager == null) {
+            player.sendMessage(getLang().getPrefixedString("messages.module-disabled"));
+            return true;
+        }
+        if (manager.isIgnoringRequests(player)) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.ignoring-requests"));
+            return true;
+        }
+
+        Player target = Bukkit.getPlayerExact(args[0]);
+        if (target == null || !target.isOnline() || VanishCommand.isVanished(target)) {
+            player.sendMessage(getLang().getPrefixedString("messages.player-not-found", Map.of("player", args[0])));
+            return true;
+        }
+
+        if (target.getUniqueId().equals(player.getUniqueId())) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.self"));
+            return true;
+        }
+
+        TeleportRequestManager.CreateRequestResult createdRequest = manager.createRequest(player, target, type);
+        if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.DUPLICATE) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.duplicate-request", Map.of("target", target.getName())));
+            return true;
+        }
+        if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.ON_COOLDOWN) {
+            player.sendMessage(getLang().getPrefixedString("tpa.messages.send-cooldown",
+                Map.of("seconds", String.valueOf(createdRequest.cooldownSeconds()))));
+            return true;
+        }
+
+        TeleportRequestManager.TeleportRequest request = createdRequest.request();
+        Map<String, String> placeholders = manager.placeholders(request);
+        player.sendMessage(getLang().getPrefixedString(type == TeleportRequestManager.TeleportRequest.Type.TPA
+            ? "tpa.messages.sent-tpa"
+            : "tpa.messages.sent-tpahere", placeholders));
+        if (createdRequest.status() == TeleportRequestManager.CreateRequestStatus.IGNORED) {
+            return true;
+        }
+        target.sendMessage(getLang().getPrefixedString(type == TeleportRequestManager.TeleportRequest.Type.TPA
+            ? "tpa.messages.received-tpa"
+            : "tpa.messages.received-tpahere", placeholders));
+        manager.playRequestReceivedSound(target);
+        sendResponseHint(target, request, placeholders);
+        return true;
+    }
+
+    private void sendResponseHint(Player target, TeleportRequestManager.TeleportRequest request, Map<String, String> placeholders) {
+        String requesterName = request.requesterName();
+        String acceptCommand = "/tpaccept " + requesterName;
+        String denyCommand = "/tpdeny " + requesterName;
+
+        Component hint = LegacyComponentSerializer.legacySection()
+            .deserialize(getLang().getPrefixedString("tpa.messages.response-hint", placeholders));
+        Component accept = LegacyComponentSerializer.legacySection()
+            .deserialize(getLang().getString("tpa.messages.accept-button"))
+            .clickEvent(ClickEvent.runCommand(acceptCommand))
+            .hoverEvent(HoverEvent.showText(Component.text(acceptCommand, NamedTextColor.GREEN)));
+        Component deny = LegacyComponentSerializer.legacySection()
+            .deserialize(getLang().getString("tpa.messages.deny-button"))
+            .clickEvent(ClickEvent.runCommand(denyCommand))
+            .hoverEvent(HoverEvent.showText(Component.text(denyCommand, NamedTextColor.RED)));
+
+        target.sendMessage(hint.append(Component.space()).append(accept).append(Component.space()).append(deny));
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String label, String[] args) {
+        if (args.length != 1 || !(sender instanceof Player player)) {
+            return List.of();
+        }
+
+        String partial = args[0].toLowerCase();
+        List<String> completions = new ArrayList<>();
+        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
+            if (!onlinePlayer.getUniqueId().equals(player.getUniqueId())
+                && !VanishCommand.isVanished(onlinePlayer)
+                && onlinePlayer.getName().toLowerCase().startsWith(partial)) {
+                completions.add(onlinePlayer.getName());
+            }
+        }
+        return completions;
+    }
+}
@@ -0,0 +1,17 @@
+package cn.infstar.essentialsC.commands;
+
+import cn.infstar.essentialsC.teleport.TeleportRequestManager;
+import org.bukkit.entity.Player;
+
+public final class TpaHereCommand extends TpaCommand {
+
+    public TpaHereCommand() {
+        super();
+        this.permission = "essentialsc.command.tpahere";
+    }
+
+    @Override
+    protected boolean execute(Player player, String[] args) {
+        return sendRequest(player, args, TeleportRequestManager.TeleportRequest.Type.TPAHERE);
+    }
+}