GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

update to cloud rc.2

Browse source
This commit is contained in:
Konicai 2024-06-09 22:54:12 -05:00
parent c3d52195c5
commit ffb8256899
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java
View file

@ -68,7 +68,7 @@ import org.geysermc.geyser.util.FileUtils;
import org.incendo.cloud.bukkit.BukkitCommandManager; import org.incendo.cloud.bukkit.BukkitCommandManager;
import org.incendo.cloud.bukkit.CloudBukkitCapabilities; import org.incendo.cloud.bukkit.CloudBukkitCapabilities;
import org.incendo.cloud.execution.ExecutionCoordinator; 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.File;
import java.io.IOException; import java.io.IOException;
@ -170,11 +170,10 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap {
Bukkit::getConsoleSender, Bukkit::getConsoleSender,
SpigotCommandSource::new SpigotCommandSource::new
); );
PaperCommandManager<GeyserCommandSource> cloud; LegacyPaperCommandManager<GeyserCommandSource> cloud;
try { try {
// PaperCommandManager is a cloud impl for all Bukkit based platforms // LegacyPaperCommandManager works for spigot too. todo: use PaperCommandManager instead for Paper 1.20.6+
// https://github.com/Incendo/cloud-minecraft/blob/master/cloud-paper/src/main/java/org/incendo/cloud/paper/PaperCommandManager.java#L47-L49 cloud = new LegacyPaperCommandManager<>(
cloud = new PaperCommandManager<>(
this, this,
ExecutionCoordinator.simpleCoordinator(), ExecutionCoordinator.simpleCoordinator(),
sourceConverter sourceConverter

2
core/src/main/java/org/geysermc/geyser/extension/command/GeyserExtensionCommand.java
View file

@ -188,8 +188,6 @@ public abstract class GeyserExtensionCommand extends GeyserCommand {
@Override @Override
public void register(CommandManager<GeyserCommandSource> manager) { 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) manager.command(baseBuilder(manager)
.optional("args", greedyStringParser()) .optional("args", greedyStringParser())
.handler(this::execute)); .handler(this::execute));

6
gradle/libs.versions.toml
View file

@ -26,9 +26,9 @@ terminalconsoleappender = "1.2.0"
folia = "1.19.4-R0.1-SNAPSHOT" folia = "1.19.4-R0.1-SNAPSHOT"
viaversion = "4.9.2" viaversion = "4.9.2"
adapters = "1.12-SNAPSHOT" 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 = "2.0.0-rc.2"
cloud-minecraft = "2.0.0-20240503.183307-62" cloud-minecraft = "2.0.0-beta.8"
cloud-minecraft-modded = "2.0.0-SNAPSHOT" cloud-minecraft-modded = "2.0.0-beta.7"
commodore = "2.2" commodore = "2.2"
bungeecord = "a7c6ede" bungeecord = "a7c6ede"
velocity = "3.3.0-SNAPSHOT" velocity = "3.3.0-SNAPSHOT"