fix: adventure bungeecord integration

FllipEis · FllipEis · commit e7e90f7b63cd · 2026-01-20T19:48:59.000+01:00
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -90,8 +90,42 @@ openApiGenerate {
     )
 }
 
-tasks.compileJava {
+// Fix OpenAPI generator bug: oneOf schemas with Object option have wrong instanceof order
+// The generator checks "instanceof Object" before specific types, which always matches
+tasks.register("fixOpenApiGeneratedCode") {
     dependsOn("openApiGenerate")
+    doLast {
+        val modelsDir = file("$buildDir/generated/src/main/java/app/simplecloud/api/web/models")
+        modelsDir.listFiles()?.filter { it.name.startsWith("V0") && it.name.endsWith(".java") }?.forEach { file ->
+            var content = file.readText()
+
+            // Fix the write() method: move "instanceof Object" check to the end
+            // Pattern: check for specific type first, then Object
+            val writeMethodPattern = Regex(
+                """(// check if the actual instance is of the type `Object`\s+if \(value\.getActualInstance\(\) instanceof Object\) \{[^}]+\}\s+)(// check if the actual instance is of the type `(\w+)`\s+if \(value\.getActualInstance\(\) instanceof \3\) \{[^}]+\})""",
+                RegexOption.DOT_MATCHES_ALL
+            )
+            content = content.replace(writeMethodPattern) { match ->
+                // Swap: put specific type check before Object check
+                "${match.groupValues[2]}\n                    ${match.groupValues[1]}"
+            }
+
+            // Fix setActualInstance(): move "instanceof Object" check to the end
+            val setInstancePattern = Regex(
+                """(public void setActualInstance\(Object instance\) \{\s+)(if \(instance instanceof Object\) \{\s+super\.setActualInstance\(instance\);\s+return;\s+\}\s+)(if \(instance instanceof (\w+)\) \{)""",
+                RegexOption.DOT_MATCHES_ALL
+            )
+            content = content.replace(setInstancePattern) { match ->
+                "${match.groupValues[1]}${match.groupValues[3]}"
+            }
+
+            file.writeText(content)
+        }
+    }
+}
+
+tasks.compileJava {
+    dependsOn("fixOpenApiGeneratedCode")
 }
 
 tasks.named<Javadoc>("javadoc") {
diff --git a/api/src/main/java/app/simplecloud/api/internal/group/GroupApiImpl.java b/api/src/main/java/app/simplecloud/api/internal/group/GroupApiImpl.java
@@ -134,7 +134,7 @@ public CompletableFuture<Group> createGroup(CreateGroupRequest request) {
                 ModelsCreateServerGroupResponse response = serverGroupsApi.v0ServerGroupsPost(
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
-                        apiRequest
+                        new V0ServerGroupsPostRequest(apiRequest)
                 );
 
                 ModelsServerGroupSummary summary = new ModelsServerGroupSummary();
@@ -192,7 +192,7 @@ public CompletableFuture<Group> updateGroup(String id, UpdateGroupRequest reques
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
                         id,
-                        apiRequest
+                        new V0ServerGroupsPutRequest(apiRequest)
                 );
 
                 ModelsServerGroupSummary summary = new ModelsServerGroupSummary();
@@ -306,7 +306,7 @@ public CompletableFuture<Map<String, Object>> updateGroupProperties(String id, M
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
                         id,
-                        request
+                        new V0PersistentServersPropertiesPatchRequest(request)
                 );
 
                 Map<String, Object> result = response.getProperties();
@@ -328,7 +328,7 @@ public CompletableFuture<Map<String, Object>> deleteGroupProperties(String id, L
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
                         id,
-                        request
+                        new V0PersistentServersPropertiesDeleteRequest(request)
                 );
 
                 Map<String, Object> result = response.getProperties();
diff --git a/api/src/main/java/app/simplecloud/api/internal/server/ServerApiImpl.java b/api/src/main/java/app/simplecloud/api/internal/server/ServerApiImpl.java
@@ -18,6 +18,10 @@
 import app.simplecloud.api.web.models.ModelsServerSummary;
 import app.simplecloud.api.web.models.ModelsStartServerRequest;
 import app.simplecloud.api.web.models.ModelsStartServerResponse;
+import app.simplecloud.api.web.models.V0PersistentServersPropertiesDeleteRequest;
+import app.simplecloud.api.web.models.V0PersistentServersPropertiesPatchRequest;
+import app.simplecloud.api.web.models.V0ServersPatchRequest;
+import app.simplecloud.api.web.models.V0ServersPostRequest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -198,7 +202,7 @@ public CompletableFuture<Server> startServer(StartServerRequest request) {
                 ModelsStartServerResponse modelsStartServerResponse = serversApi.v0ServersPost(
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
-                        apiRequest
+                        new V0ServersPostRequest(apiRequest)
                 );
                 return new ServerImpl(modelsStartServerResponse.getServer());
             } catch (ApiException e) {
@@ -232,7 +236,7 @@ public CompletableFuture<Server> updateServer(String id, UpdateServerRequest req
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
                         id,
-                        patchRequest
+                        new V0ServersPatchRequest(patchRequest)
                 );
                 
                 if (response.getServer() == null) {
@@ -282,7 +286,7 @@ public CompletableFuture<Map<String, Object>> updateServerProperties(String id,
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
                         id,
-                        request
+                        new V0PersistentServersPropertiesPatchRequest(request)
                 );
                 
                 Map<String, Object> result = response.getProperties();
@@ -304,7 +308,7 @@ public CompletableFuture<Map<String, Object>> deleteServerProperties(String id,
                         this.options.getNetworkId(),
                         this.options.getNetworkSecret(),
                         id,
-                        request
+                        new V0PersistentServersPropertiesDeleteRequest(request)
                 );
                 
                 Map<String, Object> result = response.getProperties();
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     `signing`
 }
 
-val baseVersion = "0.1.0-platform.10"
+val baseVersion = "0.1.0-platform.11"
 val commitHash = System.getenv("COMMIT_HASH")
 val isSnapshot = commitHash != null
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,8 +20,8 @@ velocity = "3.4.0-SNAPSHOT"
 bungeecord = "1.21-R0.4"
 paper = "1.21.4-R0.1-SNAPSHOT"
 
-adventure-api = "4.25.0"
-adventure-gson = "4.25.0"
+adventure = "4.25.0"
+adventure-platform = "4.4.1"
 
 minotaur = "2.8.7"
 sonatype-central-portal-publisher = "1.2.3"
@@ -47,8 +47,9 @@ paper-api = { module = "io.papermc.paper:paper-api", version.ref = "paper" }
 velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
 bungeecord = { module = "net.md-5:bungeecord-api", version.ref = "bungeecord" }
 
-adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure-api" }
-adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure-gson" }
+adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }
+adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure" }
+adventure-bungeecord = { module = "net.kyori:adventure-platform-bungeecord", version.ref = "adventure-platform" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/platform/bungeecord/build.gradle.kts b/platform/bungeecord/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     compileOnly(rootProject.libs.bungeecord)
     compileOnly(rootProject.libs.adventure.api)
+    implementation(rootProject.libs.adventure.bungeecord)
     implementation(project(":platform:shared"))
     implementation(project(":api")) {
         exclude(group = "net.kyori")
diff --git a/platform/bungeecord/src/main/java/app/simplecloud/api/platform/bungeecord/BungeeCordApiProvider.java b/platform/bungeecord/src/main/java/app/simplecloud/api/platform/bungeecord/BungeeCordApiProvider.java
@@ -4,6 +4,7 @@
 import app.simplecloud.api.internal.integration.player.PlayerIntegration;
 import app.simplecloud.api.player.CloudPlayer;
 import app.simplecloud.api.platform.shared.PlayerSynchronizer;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -17,6 +18,8 @@ public class BungeeCordApiProvider extends Plugin {
     private PlayerSynchronizer playerSynchronizer;
     private PlayerIntegration playerIntegration;
 
+    private BungeeAudiences bungeeAudiences;
+
     @Override
     public void onEnable() {
         this.cloudApi = CloudApi.create();
@@ -29,6 +32,8 @@ public void onEnable() {
         playerIntegration.onKick(this::handleKickRequest);
         playerIntegration.onConnect(this::handleConnectRequest);
 
+        this.bungeeAudiences = BungeeAudiences.create(this);
+
         getLogger().info("SimpleCloud v3 API provider initialized!");
         getProxy().getPluginManager().registerListener(this, new PlayerConnectionListener(playerSynchronizer, playerIntegration));
 
@@ -41,6 +46,10 @@ public void onDisable() {
         getLogger().info("SimpleCloud v3 API provider uninitialized!");
         playerSynchronizer.stop();
         playerIntegration.stop();
+
+        if (bungeeAudiences != null) {
+            bungeeAudiences.close();
+        }
     }
 
     private CompletableFuture<Boolean> handleKickRequest(String playerUniqueId, String reason) {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ plugins {`
`9`	`9`	`signing`
`10`	`10`	`}`
`11`	`11`
`12`		`-val baseVersion = "0.1.0-platform.10"`
	`12`	`+val baseVersion = "0.1.0-platform.11"`
`13`	`13`	`val commitHash = System.getenv("COMMIT_HASH")`
`14`	`14`	`val isSnapshot = commitHash != null`
`15`	`15`