From d53246d5472598599f0ecb8e032fa42e5a8d6acf Mon Sep 17 00:00:00 2001 From: jhqwqmc Date: Sun, 14 Sep 2025 01:33:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor(user):=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=92=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/plugin/network/PacketConsumers.java | 12 ++++++------ .../bukkit/plugin/user/BukkitServerPlayer.java | 8 ++++---- .../craftengine/core/plugin/network/NetWorkUser.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java index c0b9d54a6..b8671f959 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/network/PacketConsumers.java @@ -1240,17 +1240,17 @@ public class PacketConsumers { try { BukkitServerPlayer player = (BukkitServerPlayer) user; String name = (String) NetworkReflections.methodHandle$ServerboundHelloPacket$nameGetter.invokeExact(packet); - player.setNameUnverified(name); + player.setUnverifiedName(name); if (VersionHelper.isOrAbove1_20_2()) { UUID uuid = (UUID) NetworkReflections.methodHandle$ServerboundHelloPacket$uuidGetter.invokeExact(packet); - player.setUUIDUnverified(uuid); + player.setUnverifiedUUID(uuid); } else { @SuppressWarnings("unchecked") Optional uuid = (Optional) NetworkReflections.methodHandle$ServerboundHelloPacket$uuidGetter.invokeExact(packet); if (uuid.isPresent()) { - player.setUUIDUnverified(uuid.get()); + player.setUnverifiedUUID(uuid.get()); } else { - player.setUUIDUnverified(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8))); + player.setUnverifiedUUID(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8))); } } } catch (Throwable e) { @@ -2561,8 +2561,8 @@ public class PacketConsumers { public static final TriConsumer LOGIN_FINISHED = (user, event, packet) -> { try { GameProfile gameProfile = FastNMS.INSTANCE.field$ClientboundLoginFinishedPacket$gameProfile(packet); - user.setNameVerified(gameProfile.getName()); - user.setUUIDVerified(gameProfile.getId()); + user.setVerifiedName(gameProfile.getName()); + user.setVerifiedUUID(gameProfile.getId()); } catch (Exception e) { CraftEngine.instance().logger().warn("Failed to handle ClientboundLoginFinishedPacket", e); } diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java index 195f65514..33f60a832 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/user/BukkitServerPlayer.java @@ -330,13 +330,13 @@ public class BukkitServerPlayer extends Player { } @Override - public void setNameUnverified(String name) { + public void setUnverifiedName(String name) { if (this.isNameVerified) return; this.name = name; } @Override - public void setNameVerified(String name) { + public void setVerifiedName(String name) { if (this.isNameVerified) return; this.name = name; this.isNameVerified = true; @@ -353,13 +353,13 @@ public class BukkitServerPlayer extends Player { } @Override - public void setUUIDUnverified(UUID uuid) { + public void setUnverifiedUUID(UUID uuid) { if (this.isUUIDVerified) return; this.uuid = uuid; } @Override - public void setUUIDVerified(UUID uuid) { + public void setVerifiedUUID(UUID uuid) { if (this.isUUIDVerified) return; this.uuid = uuid; this.isUUIDVerified = true; diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java index 051744d66..baa955b1a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/NetWorkUser.java @@ -33,17 +33,17 @@ public interface NetWorkUser { boolean isNameVerified(); - void setNameUnverified(String name); + void setUnverifiedName(String name); - void setNameVerified(String name); + void setVerifiedName(String name); UUID uuid(); boolean isUUIDVerified(); - void setUUIDUnverified(UUID uuid); + void setUnverifiedUUID(UUID uuid); - void setUUIDVerified(UUID uuid); + void setVerifiedUUID(UUID uuid); void sendPacket(Object packet, boolean immediately);