feat: update surf-api-gradle-plugin to version 1.21.10 and enhance API with new composite codec functions

Author: Keviro

build.gradle.kts

@@ -8,7 +8,7 @@ buildscript {
         maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
     }
     dependencies {
-        classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.8+")
+        classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.10+")
     }
 }
 

gradle.properties

@@ -5,7 +5,7 @@ kotlin.stdlib.default.dependency=false
 kotlin.code.style=official
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
-version=1.21.8-1.0.0-SNAPSHOT
+version=1.21.10-1.0.0-SNAPSHOT
 ksp.incremental=false
 ksp.incremental.log=true
 ksp.useKSP2=false

surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/api/surf-cloud-api-client-common.api

@@ -21,21 +21,32 @@ public final class dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClient
 
 public abstract interface class dev/slne/surf/cloud/api/client/server/CloudClientServerManager : dev/slne/surf/cloud/api/common/server/CloudServerManager {
 	public static final field Companion Ldev/slne/surf/cloud/api/client/server/CloudClientServerManager$Companion;
+	public abstract fun current ()Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;
+	public abstract fun currentProxy ()Ldev/slne/surf/cloud/api/common/server/ProxyCloudServer;
 	public abstract fun currentServer ()Ldev/slne/surf/cloud/api/common/server/CloudServer;
 }
 
 public final class dev/slne/surf/cloud/api/client/server/CloudClientServerManager$Companion : dev/slne/surf/cloud/api/client/server/CloudClientServerManager {
 	public fun broadcast (Lnet/kyori/adventure/text/Component;Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun broadcastToGroup (Ljava/lang/String;Lnet/kyori/adventure/text/Component;Ljava/lang/String;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun current ()Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;
+	public fun currentProxy ()Ldev/slne/surf/cloud/api/common/server/ProxyCloudServer;
 	public fun currentServer ()Ldev/slne/surf/cloud/api/common/server/CloudServer;
 	public fun pullPlayersToGroup (Ljava/lang/String;Ljava/util/Collection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun retrieveAllServers ()Lit/unimi/dsi/fastutil/objects/ObjectCollection;
 	public fun retrieveProxies ()Lit/unimi/dsi/fastutil/objects/ObjectCollection;
+	public fun retrieveProxyList (Ljava/lang/String;)Lit/unimi/dsi/fastutil/objects/ObjectList;
 	public fun retrieveServerByCategoryAndName (Ljava/lang/String;Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;
-	public fun retrieveServerById (J)Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;
 	public fun retrieveServerByName (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;
+	public fun retrieveServerList (Ljava/lang/String;)Lit/unimi/dsi/fastutil/objects/ObjectList;
 	public fun retrieveServers ()Lit/unimi/dsi/fastutil/objects/ObjectCollection;
 	public fun retrieveServersByCategory (Ljava/lang/String;)Lit/unimi/dsi/fastutil/objects/ObjectList;
 	public fun retrieveServersInGroup (Ljava/lang/String;)Lit/unimi/dsi/fastutil/objects/ObjectList;
 }
 
+public final class dev/slne/surf/cloud/api/client/server/CloudClientServerManagerKt {
+	public static final fun current (Ldev/slne/surf/cloud/api/common/server/CloudServer$Companion;)Ldev/slne/surf/cloud/api/common/server/CloudServer;
+	public static final fun current (Ldev/slne/surf/cloud/api/common/server/CommonCloudServer$Companion;)Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;
+	public static final fun current (Ldev/slne/surf/cloud/api/common/server/ProxyCloudServer$Companion;)Ldev/slne/surf/cloud/api/common/server/ProxyCloudServer;
+}
+

surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/api/surf-cloud-api-client-paper.api

@@ -3,8 +3,8 @@ public final class dev/slne/surf/cloud/api/client/paper/Paper_cloud_converterKt
 	public static final fun toBukkitTpFlag (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;)Lio/papermc/paper/entity/TeleportFlag;
 	public static final fun toCloudTpCause (Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
 	public static final fun toCloudTpFlag (Lio/papermc/paper/entity/TeleportFlag;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
-	public static final fun toCloudTpLocation (Lorg/bukkit/Location;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;
-	public static final fun toLocation (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;)Lorg/bukkit/Location;
+	public static final fun toCloudTpLocation (Lorg/bukkit/Location;)Ldev/slne/surf/cloud/api/common/player/teleport/WorldLocation;
+	public static final fun toLocation (Ldev/slne/surf/cloud/api/common/player/teleport/WorldLocation;)Lorg/bukkit/Location;
 }
 
 public final class dev/slne/surf/cloud/api/client/paper/command/args/CloudServerArgument : dev/jorel/commandapi/arguments/CustomArgument {
@@ -70,6 +70,8 @@ public final class dev/slne/surf/cloud/api/client/paper/command/args/OnlineCloud
 public final class dev/slne/surf/cloud/api/client/paper/player/CloudPlayerBukkitExtensionsKt {
 	public static final fun teleport (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Lorg/bukkit/Location;Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;[Lio/papermc/paper/entity/TeleportFlag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public static synthetic fun teleport$default (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Lorg/bukkit/Location;Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;[Lio/papermc/paper/entity/TeleportFlag;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun toBukkitOfflinePlayer (Ldev/slne/surf/cloud/api/common/player/OfflineCloudPlayer;)Lorg/bukkit/OfflinePlayer;
+	public static final fun toBukkitPlayer (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;)Lorg/bukkit/entity/Player;
 	public static final fun toCloudOfflinePlayer (Lorg/bukkit/OfflinePlayer;)Ldev/slne/surf/cloud/api/common/player/OfflineCloudPlayer;
 }
 

surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-velocity/api/surf-cloud-api-client-velocity.api

@@ -1,4 +1,77 @@
-public final class dev/slne/surf/cloud/api/client/velocity/server/VelocityCloudServeExtensionsKt {
+public final class dev/slne/surf/cloud/api/client/velocity/InternalCloudVelocityBridge$Companion {
+	public final fun getInstance ()Ldev/slne/surf/cloud/api/client/velocity/InternalCloudVelocityBridge;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/CloudServerArgument : dev/jorel/commandapi/arguments/Argument {
+	public fun <init> (Ljava/lang/String;)V
+	public fun getArgumentType ()Ldev/jorel/commandapi/arguments/CommandAPIArgumentType;
+	public fun getPrimitiveType ()Ljava/lang/Class;
+	public fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ldev/slne/surf/cloud/api/common/server/CloudServer;
+	public synthetic fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/CloudServerArgumentKt {
+	public static final fun cloudServerArgument (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static final fun cloudServerArgument (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandTree;
+	public static final fun cloudServerArgument (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/arguments/Argument;
+	public static synthetic fun cloudServerArgument$default (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static synthetic fun cloudServerArgument$default (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandTree;
+	public static synthetic fun cloudServerArgument$default (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/arguments/Argument;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/CloudServerGroupArgument : dev/jorel/commandapi/arguments/Argument {
+	public fun <init> (Ljava/lang/String;)V
+	public fun getArgumentType ()Ldev/jorel/commandapi/arguments/CommandAPIArgumentType;
+	public fun getPrimitiveType ()Ljava/lang/Class;
+	public synthetic fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ljava/lang/Object;
+	public fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/CloudServerGroupArgumentKt {
+	public static final fun cloudServerGroupArgument (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static final fun cloudServerGroupArgument (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandTree;
+	public static final fun cloudServerGroupArgument (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/arguments/Argument;
+	public static synthetic fun cloudServerGroupArgument$default (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static synthetic fun cloudServerGroupArgument$default (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandTree;
+	public static synthetic fun cloudServerGroupArgument$default (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/arguments/Argument;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/OfflineCloudPlayerArgument : dev/jorel/commandapi/arguments/Argument {
+	public fun <init> (Ljava/lang/String;)V
+	public fun getArgumentType ()Ldev/jorel/commandapi/arguments/CommandAPIArgumentType;
+	public fun getPrimitiveType ()Ljava/lang/Class;
+	public synthetic fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ljava/lang/Object;
+	public fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Lkotlinx/coroutines/Deferred;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/OfflineCloudPlayerArgumentKt {
+	public static final fun offlineCloudPlayerArgument (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static final fun offlineCloudPlayerArgument (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandTree;
+	public static final fun offlineCloudPlayerArgument (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/arguments/Argument;
+	public static synthetic fun offlineCloudPlayerArgument$default (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static synthetic fun offlineCloudPlayerArgument$default (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandTree;
+	public static synthetic fun offlineCloudPlayerArgument$default (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/arguments/Argument;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/OnlineCloudPlayerArgument : dev/jorel/commandapi/arguments/Argument {
+	public fun <init> (Ljava/lang/String;)V
+	public fun getArgumentType ()Ldev/jorel/commandapi/arguments/CommandAPIArgumentType;
+	public fun getPrimitiveType ()Ljava/lang/Class;
+	public fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ldev/slne/surf/cloud/api/common/player/CloudPlayer;
+	public synthetic fun parseArgument (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;Ldev/jorel/commandapi/executors/CommandArguments;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/command/args/OnlineCloudPlayerArgumentKt {
+	public static final fun onlineCloudPlayerArgument (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static final fun onlineCloudPlayerArgument (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/CommandTree;
+	public static final fun onlineCloudPlayerArgument (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Ldev/jorel/commandapi/arguments/Argument;
+	public static synthetic fun onlineCloudPlayerArgument$default (Ldev/jorel/commandapi/CommandAPICommand;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandAPICommand;
+	public static synthetic fun onlineCloudPlayerArgument$default (Ldev/jorel/commandapi/CommandTree;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/CommandTree;
+	public static synthetic fun onlineCloudPlayerArgument$default (Ldev/jorel/commandapi/arguments/Argument;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ldev/jorel/commandapi/arguments/Argument;
+}
+
+public final class dev/slne/surf/cloud/api/client/velocity/server/VelocityCloudServerExtensionsKt {
+	public static final fun toCloudServer (Lcom/velocitypowered/api/proxy/server/RegisteredServer;)Ldev/slne/surf/cloud/api/common/server/CloudServer;
 	public static final fun toRegisteredServer (Ldev/slne/surf/cloud/api/common/server/CloudServer;Lcom/velocitypowered/api/proxy/ProxyServer;)Lcom/velocitypowered/api/proxy/server/RegisteredServer;
 }