Update cloud (#505)

GeyserMC · May 6, 2024 · 41c42ed · 41c42ed
1 parent a44e3a5
commit 41c42ed
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt
@@ -33,7 +33,8 @@ object Versions {
     const val guiceVersion = "6.0.0"
     const val nettyVersion = "4.1.49.Final"
     const val snakeyamlVersion = "1.28"
-    const val cloudVersion = "2.0.0-beta.2"
+    // TODO move to cloud release once those have 1.20.5 support
+    const val cloudVersion = "2.0.0-20240503.183307-62" // for cloud-minecraft
     const val bstatsVersion = "3.0.2"
 
     const val javaWebsocketVersion = "1.5.2"

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -15,7 +15,8 @@ dependencies {
     api("com.nukkitx.fastutil", "fastutil-short-object-maps", Versions.fastutilVersion)
     api("com.nukkitx.fastutil", "fastutil-int-object-maps", Versions.fastutilVersion)
     api("org.java-websocket", "Java-WebSocket", Versions.javaWebsocketVersion)
-    api("org.incendo", "cloud-core", Versions.cloudVersion)
+    // TODO move to cloud release
+    api("org.incendo", "cloud-core", "2.0.0-20240503.181645-64")
     api("org.bstats", "bstats-base", Versions.bstatsVersion)
 }
 

diff --git a/core/src/main/java/org/geysermc/floodgate/player/audience/PlayerAudienceArgument.java b/core/src/main/java/org/geysermc/floodgate/player/audience/PlayerAudienceArgument.java
@@ -102,10 +102,10 @@ private static CommandComponent.Builder<UserAudience, ProfileAudience> of(String
                     CommandUtil commandUtil = context.get("CommandUtil");
 
                     boolean quoted = input.remainingInput().startsWith("\"");
-                    List<Suggestion> suggestions = new ArrayList<Suggestion>();
+                    List<Suggestion> suggestions = new ArrayList<>();
                     for (final String player : commandUtil.getOnlineUsernames(limitTo)) {
                         suggestions.add(
-                                Suggestion.simple(BrigadierUtils.escapeIfRequired(player, quoted)));
+                                Suggestion.suggestion(BrigadierUtils.escapeIfRequired(player, quoted)));
                     }
                     return CompletableFuture.completedFuture(suggestions);
                 });

diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
@@ -13,9 +13,7 @@ indra {
 dependencies {
     api(projects.core)
 
-    // TODO move to release once cloud-paper releases for 1.20.5
-    // https://repo.papermc.io/#browse/browse:maven-public:org%2Fincendo%2Fcloud-paper%2F2.0.0-SNAPSHOT%2F2.0.0-20240427.220226-58
-    implementation("org.incendo", "cloud-paper", "2.0.0-20240427.220226-58")
+    implementation("org.incendo", "cloud-paper", Versions.cloudVersion)
     // hack to make pre 1.12 work
     implementation("com.google.guava", "guava", guavaVersion)