From ffb8256899a7313724801b13121f86da98e1fca1 Mon Sep 17 00:00:00 2001
From: Konicai <71294714+Konicai@users.noreply.github.com>
Date: Sun, 9 Jun 2024 22:54:12 -0500
Subject: [PATCH] update to cloud rc.2

---
 .../geyser/platform/spigot/GeyserSpigotPlugin.java       | 9 ++++-----
 .../geyser/extension/command/GeyserExtensionCommand.java | 2 --
 gradle/libs.versions.toml                                | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
index 7b57d3840..9ddc45348 100644
--- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
+++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
@@ -68,7 +68,7 @@ import org.geysermc.geyser.util.FileUtils;
 import org.incendo.cloud.bukkit.BukkitCommandManager;
 import org.incendo.cloud.bukkit.CloudBukkitCapabilities;
 import org.incendo.cloud.execution.ExecutionCoordinator;
-import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.LegacyPaperCommandManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -170,11 +170,10 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
                 Bukkit::getConsoleSender,
                 SpigotCommandSource::new
         );
-        PaperCommandManager<GeyserCommandSource> cloud;
+        LegacyPaperCommandManager<GeyserCommandSource> cloud;
         try {
-            // PaperCommandManager is a cloud impl for all Bukkit based platforms
-            // https://github.com/Incendo/cloud-minecraft/blob/master/cloud-paper/src/main/java/org/incendo/cloud/paper/PaperCommandManager.java#L47-L49
-            cloud = new PaperCommandManager<>(
+            // LegacyPaperCommandManager works for spigot too. todo: use PaperCommandManager instead for Paper 1.20.6+
+            cloud = new LegacyPaperCommandManager<>(
                     this,
                     ExecutionCoordinator.simpleCoordinator(),
                     sourceConverter
diff --git a/core/src/main/java/org/geysermc/geyser/extension/command/GeyserExtensionCommand.java b/core/src/main/java/org/geysermc/geyser/extension/command/GeyserExtensionCommand.java
index acc264094..0b22a8b8e 100644
--- a/core/src/main/java/org/geysermc/geyser/extension/command/GeyserExtensionCommand.java
+++ b/core/src/main/java/org/geysermc/geyser/extension/command/GeyserExtensionCommand.java
@@ -188,8 +188,6 @@ public abstract class GeyserExtensionCommand extends GeyserCommand {
 
                 @Override
                 public void register(CommandManager<GeyserCommandSource> manager) {
-                    // todo: if we don't find a way to expose cloud in the api, we should implement a way
-                    //  to not have the [args] if its not necessary for this command. and maybe tab completion.
                     manager.command(baseBuilder(manager)
                         .optional("args", greedyStringParser())
                         .handler(this::execute));
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 19bb09c00..8c5d46c3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -26,9 +26,9 @@ terminalconsoleappender = "1.2.0"
 folia = "1.19.4-R0.1-SNAPSHOT"
 viaversion = "4.9.2"
 adapters = "1.12-SNAPSHOT"
-cloud = "2.0.0-20240503.181645-64" # todo: cloud - update when beta6 is released. this is currrently required for 1.20.6
-cloud-minecraft = "2.0.0-20240503.183307-62"
-cloud-minecraft-modded = "2.0.0-SNAPSHOT"
+cloud = "2.0.0-rc.2"
+cloud-minecraft = "2.0.0-beta.8"
+cloud-minecraft-modded = "2.0.0-beta.7"
 commodore = "2.2"
 bungeecord = "a7c6ede"
 velocity = "3.3.0-SNAPSHOT"