1.3.2

404Setup · 404Setup · commit 0483f630158e · 2025-06-12T11:08:35.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "one.tranic"
-version = "1.3.1"
+version = "1.3.2"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/one/tranic/t/base/TBase.java b/src/main/java/one/tranic/t/base/TBase.java
@@ -99,5 +99,6 @@ public static <T> CompletableFuture<T> runAsync(Supplier<T> supplier) {
 
     public static void close() {
         executor.shutdownNow();
+        INSTANCE.disable();
     }
 }
diff --git a/src/main/java/one/tranic/t/base/TInterface.java b/src/main/java/one/tranic/t/base/TInterface.java
@@ -11,39 +11,59 @@
 import java.util.Objects;
 import java.util.UUID;
 
-public interface TInterface {
+@SuppressWarnings("unused")
+public interface TInterface<S, P> {
+    /**
+     * Enables the functionality or state associated with this instance.
+     */
     void enable();
 
+    /**
+     * Disables the current instance of the interface or system.
+     */
     void disable();
 
+    /**
+     * Retrieves an array of supported platforms for the implementing service.
+     *
+     * @return an array of {@code Platform} objects representing the platforms supported by this service.
+     * The returned array is guaranteed to be non-null but may be empty if no platforms are supported.
+     */
     Platform[] getSupportedPlatforms();
 
-    SystemCommandSource<?, ?> getConsoleSource();
+    /**
+     * Retrieves the console command source for the system.
+     * The console source represents an abstract command execution entity
+     * used for operations not tied to any specific player or client.
+     *
+     * @return a {@code SystemCommandSource<S, P>} instance representing the console command source.
+     */
+    SystemCommandSource<S, P> getConsoleSource();
 
     /**
      * Retrieves a player instance based on their player name.
      *
      * @param name the name of the player to search for; must not be null
      * @return the {@code Player} instance corresponding to the given name, or {@code null} if no player is found
      */
-    @Nullable Player<?> getPlayer(@NotNull String name);
+    @Nullable Player<P> getPlayer(@NotNull String name);
 
     /**
      * Retrieves a player using their unique identifier (UUID).
      *
      * @param uuid the UUID of the player to be retrieved; must not be null
-     * @return a {@code Player<?>} instance if a player with the given UUID exists;
+     * @return a {@code Player<P>} instance if a player with the given UUID exists;
      * otherwise, {@code null}
      */
-    @Nullable Player<?> getPlayer(@NotNull UUID uuid);
+    @Nullable Player<P> getPlayer(@NotNull UUID uuid);
 
     /**
      * Retrieves a list of all online players currently connected to the server.
      *
-     * @return a {@code List} of {@code Player<?>} representing each online player;
+     * @return a {@code List} of {@code Player<P>} representing each online player;
      * the list is guaranteed to be non-null.
      */
-    @NotNull List<Player<?>> getOnlinePlayers();
+    @NotNull List<Player<P>> getOnlinePlayers();
 
     /**
      * Retrieves a list of alternative players who are connected to the same host
@@ -55,17 +75,17 @@ public interface TInterface {
      * Players with a matching connected host are returned in the resulting list, ensuring that the specified player is
      * excluded from this list.
      *
-     * @param player the {@code Player<?>} whose connected host is used for comparison;
+     * @param player the {@code Player<P>} whose connected host is used for comparison;
      *               must not be null
-     * @return a {@code List<Player<?>>} containing all players who are connected
+     * @return a {@code List<Player<P>>} containing all players who are connected
      * to the same host as the specified player, excluding the player itself;
      * the list is guaranteed to be non-null but may be empty if no other
      * players share the same connected host
      */
-    default @NotNull List<Player<?>> getAltPlayers(@NotNull Player<?> player) {
-        final List<Player<?>> end = Collections.newArrayList();
-        final List<Player<?>> players = getOnlinePlayers();
-        for (Player<?> p : players) {
+    default @NotNull List<Player<P>> getAltPlayers(@NotNull Player<P> player) {
+        final List<Player<P>> end = Collections.newArrayList();
+        final List<Player<P>> players = getOnlinePlayers();
+        for (Player<P> p : players) {
             if (p.getUniqueId() != player.getUniqueId() && Objects.equals(p.getConnectedHost(), player.getConnectedHost()))
                 end.add(p);
         }
@@ -77,10 +97,10 @@ public interface TInterface {
      * <p>
      * The specific type of player instances within this list may vary based on the platform implementation.
      *
-     * @return a {@code List<?>} representing the platform-specific online players;
+     * @return a {@code List<P>} representing the platform-specific online players;
      * the list is guaranteed to be non-null.
      */
-    @NotNull List<?> getPlatformOnlinePlayers();
+    @NotNull List<P> getPlatformOnlinePlayers();
 
     /**
      * Retrieves a list of the names of all online players currently connected to the server.
diff --git a/src/main/java/one/tranic/t/base/player/BedrockPlayer.java b/src/main/java/one/tranic/t/base/player/BedrockPlayer.java
@@ -2,6 +2,7 @@
 
 import one.tranic.t.base.parse.uuid.UUIDParser;
 import one.tranic.t.utils.Reflect;
+import org.apache.commons.lang.Validate;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.cumulus.form.Form;
@@ -15,14 +16,15 @@
 
 import java.util.UUID;
 
-public class BedrockPlayer {
+@SuppressWarnings("all")
+public class BedrockPlayer<P> {
     private static final boolean geyser = Reflect.hasClass("org.geysermc.geyser.api.GeyserApi");
     private static final boolean floodgate = Reflect.hasClass("org.geysermc.floodgate.api.FloodgateApi");
 
-    private final Player player;
+    private final Player<P> player;
     private final Object bedrockPlayer;
 
-    protected BedrockPlayer(@NotNull Player player) {
+    public BedrockPlayer(@NotNull Player<P> player) {
         this.player = player;
         this.bedrockPlayer = getBedrockPlayer(player.getUniqueId());
     }
@@ -33,7 +35,7 @@ protected BedrockPlayer(@NotNull Player player) {
      * @param player the {@link Player} to convert to a {@link BedrockPlayer}; must not be null
      * @return a new {@link BedrockPlayer} instance associated with the given {@link Player}
      */
-    public static BedrockPlayer of(@NotNull Player player) {
+    public static @NotNull BedrockPlayer of(@NotNull Player player) {
         return new BedrockPlayer(player);
     }
 
@@ -50,14 +52,24 @@ public static boolean isBedrockPlayer(UUID uuid) {
         return isFloodgatePlayer(uuid);
     }
 
+    /**
+     * Determines whether the specified player is a Bedrock player.
+     *
+     * @param player the player to check; must not be null
+     * @return true if the specified player is a Bedrock player, otherwise false
+     */
+    public static boolean isBedrockPlayer(@NotNull Player player) {
+        return isBedrockPlayer(player.getUniqueId());
+    }
+
     /**
      * Checks if a given UUID string represents a Floodgate player by verifying
      * if it starts with the Floodgate UUID prefix.
      *
      * @param uuid the UUID string of the player, expected to contain dashes and not null
      * @return {@code true} if the UUID represents a Floodgate player, {@code false} otherwise
      */
-    public static boolean isFloodgatePlayer(String uuid) {
+    public static boolean isFloodgatePlayer(@NotNull String uuid) {
         final String FLOODGATE_UUID_PREFIX = "0000000000000000";
 
         String str = UUIDParser.removeDashes(uuid);
@@ -70,17 +82,37 @@ public static boolean isFloodgatePlayer(String uuid) {
      * @param uuid the universally unique identifier (UUID) of the player to check
      * @return true if the player is a Floodgate player, false otherwise
      */
-    public static boolean isFloodgatePlayer(UUID uuid) {
+    public static boolean isFloodgatePlayer(@NotNull UUID uuid) {
         return isFloodgatePlayer(uuid.toString());
     }
 
+    /**
+     * Determines if the specified Bedrock player is a Floodgate player.
+     *
+     * @param player the Bedrock player to check; must not be null
+     * @return true if the specified player is a Floodgate player, false otherwise
+     */
+    public static boolean isFloodgatePlayer(@NotNull BedrockPlayer player) {
+        return isFloodgatePlayer(player.uuid());
+    }
+
+    /**
+     * Determines whether the specified player is a Floodgate player.
+     *
+     * @param player the player to check; must not be null
+     * @return true if the player is a Floodgate player, false otherwise
+     */
+    public static boolean isFloodgatePlayer(@NotNull Player player) {
+        return isFloodgatePlayer(player.getUniqueId());
+    }
+
     /**
      * Retrieves the Bedrock player associated with the given UUID.
      *
      * @param uuid the unique identifier of the player to retrieve
      * @return the Bedrock player object if found, otherwise null
      */
-    private static @Nullable Object getBedrockPlayer(UUID uuid) {
+    private static @Nullable Object getBedrockPlayer(@NotNull UUID uuid) {
         return floodgate ? FloodgateApi.getInstance().getPlayer(uuid) :
                 geyser ? GeyserApi.api().connectionByUuid(uuid) : null;
     }
@@ -108,7 +140,7 @@ public static boolean hasFloodgate() {
      *
      * @return the {@link Player} instance associated with this object; never null
      */
-    public @NotNull Player player() {
+    public @NotNull Player<P> player() {
         return player;
     }
 
@@ -131,11 +163,8 @@ public boolean isFloodgatePlayer() {
      */
     public @NonNull String platform() {
         if (bedrockPlayer != null) {
-            if (floodgate) {
-                return ((FloodgatePlayer) bedrockPlayer).getDeviceOs().toString();
-            } else if (geyser) {
-                return ((GeyserConnection) bedrockPlayer).platform().toString();
-            }
+            if (floodgate) return ((FloodgatePlayer) bedrockPlayer).getDeviceOs().toString();
+            if (geyser) return ((GeyserConnection) bedrockPlayer).platform().toString();
         }
         return "Java Edition";
     }
@@ -150,9 +179,34 @@ public boolean isFloodgatePlayer() {
      * @return the subscription ID of the Floodgate player, or -1 if unavailable
      */
     public int subscribeId() {
-        if (bedrockPlayer != null && floodgate) {
+        if (bedrockPlayer != null && floodgate)
             return ((FloodgatePlayerImpl) bedrockPlayer).getSubscribeId();
+        return -1;
+    }
+
+    /**
+     * Retrieves the version of the Bedrock player, if applicable.
+     *
+     * @return the version of the Bedrock player as a {@code String}, or {@code null}
+     * if the player is not a Bedrock player or the version could not be determined
+     */
+    public @Nullable String version() {
+        if (bedrockPlayer != null) {
+            if (geyser) return ((GeyserConnection) bedrockPlayer).version();
+            if (floodgate) return ((FloodgatePlayer) bedrockPlayer).getVersion();
         }
+        return null;
+    }
+
+    /**
+     * Retrieves the protocol version of the Bedrock player if applicable.
+     *
+     * @return the protocol version as an integer if the player is a Geyser Bedrock player;
+     * otherwise, returns -1 if the player is not a Bedrock player or Geyser is not available.
+     */
+    public int protocolVersion() {
+        if (bedrockPlayer != null && geyser)
+            return ((GeyserConnection) bedrockPlayer).protocolVersion();
         return -1;
     }
 
@@ -166,9 +220,8 @@ public int subscribeId() {
      * Bedrock player, Geyser is not enabled, or if the device ID is unavailable
      */
     public @Nullable String deviceId() {
-        if (bedrockPlayer != null && geyser) {
+        if (bedrockPlayer != null && geyser)
             return ((GeyserSession) bedrockPlayer).getClientData().getDeviceId();
-        }
         return null;
     }
 
@@ -181,9 +234,8 @@ public int subscribeId() {
      * @return the device model of the Bedrock player as a string, or {@code null} if unavailable
      */
     public @Nullable String deviceModel() {
-        if (bedrockPlayer != null && geyser) {
+        if (bedrockPlayer != null && geyser)
             return ((GeyserSession) bedrockPlayer).getClientData().getDeviceModel();
-        }
         return null;
     }
 
@@ -198,12 +250,8 @@ public int subscribeId() {
      */
     public @Nullable String inputMode() {
         if (bedrockPlayer != null) {
-            if (floodgate) {
-                return ((FloodgatePlayer) bedrockPlayer).getInputMode().name();
-            }
-            if (geyser) {
-                return ((GeyserConnection) bedrockPlayer).inputMode().name();
-            }
+            if (floodgate) return ((FloodgatePlayer) bedrockPlayer).getInputMode().name();
+            if (geyser) return ((GeyserConnection) bedrockPlayer).inputMode().name();
         }
         return null;
     }
@@ -219,9 +267,8 @@ public int subscribeId() {
      * @return the client ID as a long if the player is a Geyser Bedrock player; -1 otherwise
      */
     public long clientID() {
-        if (bedrockPlayer != null && geyser) {
+        if (bedrockPlayer != null && geyser)
             return ((GeyserSession) bedrockPlayer).getClientData().getClientRandomId();
-        }
         return -1;
     }
 
@@ -235,14 +282,27 @@ public long clientID() {
      */
     public @Nullable String xuid() {
         if (bedrockPlayer != null) {
-            if (floodgate) {
-                return ((FloodgatePlayer) bedrockPlayer).getXuid();
-            }
+            if (floodgate) return ((FloodgatePlayer) bedrockPlayer).getXuid();
+            if (geyser) return ((GeyserConnection) bedrockPlayer).xuid();
+        }
+        return null;
+    }
+
+    /**
+     * Retrieves the unique identifier (UUID) associated with this player.
+     *
+     * @return the UUID of the player; never null
+     */
+    public @NotNull UUID uuid() {
+        if (bedrockPlayer != null) {
+            if (floodgate) return ((FloodgatePlayer) bedrockPlayer).getCorrectUniqueId();
             if (geyser) {
-                return ((GeyserConnection) bedrockPlayer).xuid();
+                var uuid = ((GeyserConnection) bedrockPlayer).playerUuid();
+                if (uuid == null) uuid = player.getUniqueId();
+                return uuid;
             }
         }
-        return null;
+        return player.getUniqueId();
     }
 
     /**
@@ -256,29 +316,20 @@ public long clientID() {
     @SuppressWarnings("all")
     public boolean form(@NotNull Form form) {
         if (bedrockPlayer != null && form != null) {
-            if (floodgate) {
-                return ((FloodgatePlayer) bedrockPlayer).sendForm(form);
-            }
-            if (geyser) {
-                return ((GeyserConnection) bedrockPlayer).sendForm(form);
-            }
+            if (floodgate) return ((FloodgatePlayer) bedrockPlayer).sendForm(form);
+            if (geyser) return ((GeyserConnection) bedrockPlayer).sendForm(form);
         }
         return false;
     }
 
     /**
      * Retrieves the ping value of a Bedrock player if applicable.
-     * <p>
-     * This method checks if the associated player is a Bedrock player and if
-     * the Geyser integration is available.
      *
      * @return the ping value in milliseconds for a Bedrock player, or -1 if
      * the player is not a Bedrock player or Geyser is not available.
      */
     public long ping() {
-        if (bedrockPlayer != null && geyser) {
-            return ((GeyserConnection) bedrockPlayer).ping();
-        }
-        return -1;
+        if (bedrockPlayer != null && geyser) return ((GeyserConnection) bedrockPlayer).ping();
+        return player.getPing();
     }
 }
diff --git a/src/main/java/one/tranic/t/base/player/Player.java b/src/main/java/one/tranic/t/base/player/Player.java

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`group = "one.tranic"`
`12`		`-version = "1.3.1"`
	`12`	`+version = "1.3.2"`
`13`	`13`
`14`	`14`	`repositories {`
`15`	`15`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -99,5 +99,6 @@ public static <T> CompletableFuture<T> runAsync(Supplier<T> supplier) {`
`99`	`99`
`100`	`100`	`public static void close() {`
`101`	`101`	`executor.shutdownNow();`
	`102`	`+ INSTANCE.disable();`
`102`	`103`	`}`
`103`	`104`	`}`