feat: code

paper/src/main/java/online/mineroo/paper/MinerooCoreBootstrap.java

@@ -4,6 +4,7 @@ import io.papermc.paper.plugin.bootstrap.BootstrapContext;
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap;
 import io.papermc.paper.registry.data.dialog.ActionButton;
 import io.papermc.paper.registry.data.dialog.DialogBase;
+import io.papermc.paper.registry.data.dialog.action.DialogAction;
 import io.papermc.paper.registry.data.dialog.body.DialogBody;
 import io.papermc.paper.registry.data.dialog.input.DialogInput;
 import io.papermc.paper.registry.data.dialog.type.DialogType;
@@ -16,16 +17,25 @@ import online.mineroo.common.MessageManager;
 public class MinerooCoreBootstrap implements PluginBootstrap {
   @Override
   public void bootstrap(BootstrapContext context) {
+    // TODO: language auto check from config
     MessageManager messageManager = new MessageManager();
 
-    ActionButton confirmButton =
-        ActionButton.create(messageManager.get("dialog.bind.player.confirm"), null, 100, null);
+    ActionButton confirmButton = ActionButton.create(
+        messageManager.get("dialog.bind.player.confirm"),
+        null,
+        100,
+        DialogAction.customClick(Key.key("mineroo:bind_user/confirm"), null)
+    );
 
-    ActionButton cancelButton =
-        ActionButton.create(messageManager.get("dialog.bind.player.cancel"), null, 100, null);
+    ActionButton cancelButton = ActionButton.create(
+        messageManager.get("dialog.bind.player.cancel"),
+        null,
+        100,
+        DialogAction.customClick(Key.key("mineroo:bind_user/cancel"), null)
+    );
 
     DialogInput usernameInput =
-        DialogInput.text("username", messageManager.get("dialog.bind.player.email")).build();
+        DialogInput.text("user_email", messageManager.get("dialog.bind.player.email")).build();
 
     DialogBase dialogBase =
         DialogBase.builder(messageManager.get("dialog.bind.player.title"))
@@ -40,7 +50,7 @@ public class MinerooCoreBootstrap implements PluginBootstrap {
     context.getLifecycleManager().registerEventHandler(RegistryEvents.DIALOG.compose().newHandler(
         event
         -> event.registry().register(
-            DialogKeys.create(Key.key("papermc:bind_mineroo_user")),
+            DialogKeys.create(Key.key("mineroo:bind_user")),
             builder -> builder.base(dialogBase).type(confirmationType)
         )
     ));

paper/src/main/java/online/mineroo/paper/listeners/BindListener.java

@@ -1,16 +1,13 @@
 package online.mineroo.paper.listeners;
 
+import java.util.concurrent.atomic.AtomicReference;
+import net.kyori.adventure.text.Component;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerListPingEvent;
 
-import net.kyori.adventure.text.Component;
-
-import java.util.concurrent.atomic.AtomicReference;
-
 public class BindListener implements Listener {
-
   private final AtomicReference<String> verificationToken = new AtomicReference<>(null);
 
   public void setVerificationToken(String token) {

paper/src/main/java/online/mineroo/paper/listeners/PlayerBindListener.java

@@ -1,175 +1,167 @@
+
 package online.mineroo.paper.listeners;
 
-import java.util.HashSet;
-import java.util.Set;
+import com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent;
+import io.papermc.paper.connection.PlayerConfigurationConnection;
+import io.papermc.paper.connection.PlayerGameConnection;
+import io.papermc.paper.dialog.Dialog;
+import io.papermc.paper.dialog.DialogResponseView;
+import io.papermc.paper.event.connection.configuration.AsyncPlayerConnectionConfigureEvent;
+import io.papermc.paper.event.player.PlayerCustomClickEvent;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
+import java.util.Map;
 import java.util.UUID;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.jspecify.annotations.NullMarked;
-
-import online.mineroo.common.BindRequest.PlayerBindStatus;
-import online.mineroo.common.MessageManager;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import online.mineroo.common.BindRequest;
+import online.mineroo.common.BindRequest.PlayerBindStatusEnum;
 import online.mineroo.paper.Config;
 import online.mineroo.paper.MinerooCore;
-import online.mineroo.paper.utils.PlayerBindDialog;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.jspecify.annotations.NullMarked;
+import org.slf4j.Logger;
 
 @NullMarked
 public class PlayerBindListener implements Listener {
-
   private final MinerooCore plugin;
 
-  private Set<UUID> pendingBindPlayers = new HashSet<>();
+  private final Map<UUID, CompletableFuture<Boolean>> awaitingResponse = new ConcurrentHashMap<>();
 
   public PlayerBindListener(MinerooCore plugin) {
     this.plugin = plugin;
   }
 
   @EventHandler
-  public void onPlayerJoin(PlayerJoinEvent event) {
-
-    MessageManager messageManager = this.plugin.getMessageManager();
+  public void onPlayerConfigure(AsyncPlayerConnectionConfigureEvent event) {
     Config config = this.plugin.getConfigObject();
 
-    Player player = event.getPlayer();
-
-    boolean isForceBind = config.getPlayer().getPlayerBind().isRequired();
-
-    if (isForceBind) {
-      lockPlayer(player);
-    }
-
-    this.plugin.getBindRequest().checkPlayerBindStatus(player.getUniqueId(), null)
-        .thenAccept(response -> {
-
-          // 4. 切回主线程 (Bukkit API 必须在主线程调用)
-          // 这一步非常重要，否则报错 "Asynchronous player tracker update"
-          this.plugin.getServer().getScheduler().runTask(this.plugin, () -> {
-
-            // 检查玩家是否还在同一个服务器 (防止请求期间玩家退出了)
-            if (!player.isOnline())
-              return;
-
-            PlayerBindStatus status = response.getStatus();
-
-            if (status == PlayerBindStatus.BOUND) {
-              if (isForceBind) {
-                unlockPlayer(player);
-              }
-
-            } else {
-              if (status == PlayerBindStatus.ERROR) {
-                this.plugin.getLogger()
-                    .warning("Bind check failed for " + player.getName() + ": " + response.getMessage());
-              }
-
-              PlayerBindDialog dialog = new PlayerBindDialog();
-              player.showDialog(dialog.getDialog(messageManager));
-            }
-          });
-        });
-
-  }
-
-  @EventHandler(priority = EventPriority.LOWEST)
-  public void onPlayerMove(PlayerMoveEvent event) {
-    Player player = event.getPlayer();
-
-    if (!pendingBindPlayers.contains(player.getUniqueId())) {
+    if (!config.getPlayer().getPlayerBind().isRequired()) {
       return;
     }
 
-    Location from = event.getFrom();
-    Location to = event.getTo();
+    UUID uuid = event.getConnection().getProfile().getId();
+    if (uuid == null)
+      return;
 
-    if (from.getX() == to.getX() && from.getY() == to.getY() && from.getZ() == to.getZ()) {
+    try {
+      var response = this.plugin.getBindRequest()
+                         .checkPlayerBindStatus(uuid, event.getConnection().getProfile().getName())
+                         .join();
+
+      PlayerBindStatusEnum status = response.getStatus();
+
+      if (status == PlayerBindStatusEnum.BOUND) {
+        return;
+      } else if (status == PlayerBindStatusEnum.NOT_BOUND) {
+        Dialog dialog = RegistryAccess.registryAccess()
+                            .getRegistry(RegistryKey.DIALOG)
+                            .get(Key.key("mineroo:bind_user"));
+        if (dialog == null) {
+          return;
+        }
+
+        PlayerConfigurationConnection connection = event.getConnection();
+
+        UUID uniqueId = connection.getProfile().getId();
+
+        if (uniqueId == null) {
+          return;
+        }
+
+        CompletableFuture<Boolean> dialogResponse = new CompletableFuture<>();
+        dialogResponse.completeOnTimeout(false, 1, TimeUnit.MINUTES);
+        awaitingResponse.put(uniqueId, dialogResponse);
+
+        Audience audience = connection.getAudience();
+        audience.showDialog(dialog);
+
+        if (!dialogResponse.join()) {
+          audience.closeDialog();
+          connection.disconnect(Component.text("You hate Paper-chan :(", NamedTextColor.RED));
+        }
+        awaitingResponse.remove(uniqueId);
+
+      } else {
+        event.getConnection().disconnect(
+            Component.text("服务器内部错误，请稍后重试", NamedTextColor.RED)
+        );
+        return;
+      }
+
+    } catch (Exception e) {
+      this.plugin.getLogger().severe("Failed to check bind status for " + uuid);
+      e.printStackTrace();
+      event.getConnection().disconnect(
+          Component.text("服务器内部错误，请稍后重试", NamedTextColor.RED)
+      );
+    }
+  }
+
+  @EventHandler
+  void onHandleDialog(PlayerCustomClickEvent event) {
+    Logger logger = plugin.getSLF4JLogger();
+
+    logger.info("12313213131231");
+
+    // Handle custom click only for configuration connection.
+    if (!(event.getCommonConnection()
+              instanceof PlayerConfigurationConnection configurationConnection)) {
       return;
     }
 
-    Location newLocation = from.clone();
-    newLocation.setYaw(to.getYaw());
-    newLocation.setPitch(to.getPitch());
-    event.setTo(newLocation);
-  }
+    UUID uniqueId = configurationConnection.getProfile().getId();
 
-  @EventHandler
-  public void onInteract(PlayerInteractEvent event) {
-    if (isLocked(event.getPlayer()))
-      event.setCancelled(true);
-  }
+    if (uniqueId == null) {
+      return;
+    }
 
-  @EventHandler
-  public void onDrop(PlayerDropItemEvent event) {
-    if (isLocked(event.getPlayer()))
-      event.setCancelled(true);
-  }
+    Key key = event.getIdentifier();
 
-  @EventHandler
-  public void onInventoryClick(InventoryClickEvent event) {
-    if (event.getWhoClicked() instanceof Player player && isLocked(player)) {
-      event.setCancelled(true);
+    if (key.equals(Key.key("mineroo:bind_user/confirm"))) {
+      DialogResponseView view = event.getDialogResponseView();
+      if (view == null) {
+        return;
+      }
+
+      String user_email = view.getText("user_email");
+
+      if (event.getCommonConnection() instanceof PlayerConfigurationConnection conn) {
+        BindRequest bindRequest = plugin.getBindRequest();
+      }
+
+      setConnectionJoinResult(uniqueId, true);
+
+    } else if (key.equals(Key.key("mineroo:bind_user/cancel"))) {
+      // If it is the same as the agree one, set the result to true.
+
+      setConnectionJoinResult(uniqueId, false);
     }
   }
 
   @EventHandler
-  public void onDamage(EntityDamageEvent event) {
-    if (event.getEntity() instanceof Player player && isLocked(player)) {
-      event.setCancelled(true);
-    }
+  void onConnectionClose(PlayerConnectionCloseEvent event) {
+    awaitingResponse.remove(event.getPlayerUniqueId());
   }
 
-  @EventHandler
-  public void onBlockBreak(BlockBreakEvent event) {
-    if (isLocked(event.getPlayer()))
-      event.setCancelled(true);
-  }
+  /**
 
-  @EventHandler
-  public void onBlockPlace(BlockPlaceEvent event) {
-    if (isLocked(event.getPlayer()))
-      event.setCancelled(true);
-  }
+   * Simple utility method for setting a connection's dialog response result.
 
-  @EventHandler
-  public void onChat(io.papermc.paper.event.player.AsyncChatEvent event) {
-    if (isLocked(event.getPlayer()))
-      event.setCancelled(true);
-  }
+   */
 
-  private boolean isLocked(Player player) {
-    return pendingBindPlayers.contains(player.getUniqueId());
-  }
+  private void setConnectionJoinResult(UUID uniqueId, boolean value) {
+    CompletableFuture<Boolean> future = awaitingResponse.get(uniqueId);
 
-  private void lockPlayer(Player player) {
-    pendingBindPlayers.add(player.getUniqueId());
-
-    player.setWalkSpeed(0f);
-    player.setFlySpeed(0f);
-
-    // player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP,
-    // Integer.MAX_VALUE, 200, false, false));
-    player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, Integer.MAX_VALUE, 1, false, false));
-  }
-
-  public void unlockPlayer(Player player) {
-    if (pendingBindPlayers.remove(player.getUniqueId())) {
-      player.setWalkSpeed(0.2f);
-      player.setFlySpeed(0.1f);
-      // player.removePotionEffect(PotionEffectType.JUMP);
-      player.removePotionEffect(PotionEffectType.BLINDNESS);
+    if (future != null) {
+      future.complete(value);
     }
   }
 }

paper/src/main/java/online/mineroo/paper/utils/PlayerBindDialog.java

@@ -1,34 +0,0 @@
-package online.mineroo.paper.utils;
-
-import java.util.List;
-
-import io.papermc.paper.dialog.Dialog;
-import io.papermc.paper.registry.data.dialog.ActionButton;
-import io.papermc.paper.registry.data.dialog.DialogBase;
-import io.papermc.paper.registry.data.dialog.body.DialogBody;
-import io.papermc.paper.registry.data.dialog.input.DialogInput;
-import io.papermc.paper.registry.data.dialog.type.DialogType;
-import online.mineroo.common.MessageManager;
-
-public class PlayerBindDialog {
-  public Dialog getDialog(MessageManager messageManager) {
-
-    Dialog dialog = Dialog.create(builder -> builder.empty()
-        .base(DialogBase.builder(messageManager.get("dialog.bind.player.title"))
-            .body(List.of(DialogBody.plainMessage(messageManager.get("dialog.bind.player.content"))))
-            .inputs(
-                List.of(
-                    // username
-                    DialogInput.text("username", messageManager.get("dialog.bind.player.email")).build()
-                // ...
-                ))
-            .build())
-        .type(DialogType.confirmation(
-            ActionButton.create(messageManager.get("dialog.bind.player.confirm"), null, 100, null),
-            ActionButton.create(messageManager.get("dialog.bind.player.cancel"), null, 100, null)
-        // ...
-        )));
-
-    return dialog;
-  }
-}

paper/src/main/resources/paper-plugin.yml

@@ -0,0 +1,6 @@
+name: MinerooCore
+version: "1.0"
+main: "online.mineroo.paper.MinerooCore"
+description: Paper Test Plugin
+api-version: "1.21.10"
+bootstrapper: "online.mineroo.paper.MinerooCoreBootstrap"