GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Preliminary 1.21 Spigot support (#521)

Browse Source
This commit is contained in:
chris
2024-06-14 04:08:27 +02:00
committed by GitHub
parent e1bae5765b
commit 49bd56446f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build-logic/src/main/kotlin/Versions.kt
View File

@@ -33,8 +33,7 @@ object Versions {
const val guiceVersion = "6.0.0"
const val nettyVersion = "4.1.49.Final"
const val snakeyamlVersion = "1.28"
// TODO move to cloud release once those have 1.20.5 support
const val cloudVersion = "2.0.0-beta.7" // for cloud-minecraft
const val cloudVersion = "2.0.0-SNAPSHOT" // for cloud-minecraft
const val cloudCore = "2.0.0-rc.1"
const val bstatsVersion = "3.0.2"

4
spigot/build.gradle.kts
View File

@@ -13,7 +13,9 @@ indra {
dependencies {
api(projects.core)
implementation("org.incendo", "cloud-paper", Versions.cloudVersion)
//implementation("org.incendo", "cloud-paper", Versions.cloudVersion)
// TODO change back after https://github.com/incendo/cloud-minecraft is merged
implementation("com.github.onebeastchris.cloud-minecraft", "cloud-paper", "jitpack-SNAPSHOT")
// hack to make pre 1.12 work
implementation("com.google.guava", "guava", guavaVersion)

4
spigot/src/main/java/org/geysermc/floodgate/module/SpigotCommandModule.java
View File

@@ -40,7 +40,7 @@ import org.geysermc.floodgate.player.UserAudience;
import org.geysermc.floodgate.player.audience.FloodgateSenderMapper;
import org.incendo.cloud.CommandManager;
import org.incendo.cloud.execution.ExecutionCoordinator;
import org.incendo.cloud.paper.PaperCommandManager;
import org.incendo.cloud.paper.LegacyPaperCommandManager;
@RequiredArgsConstructor
public final class SpigotCommandModule extends CommandModule {
@@ -56,7 +56,7 @@ public final class SpigotCommandModule extends CommandModule {
@Singleton
@SneakyThrows
public CommandManager<UserAudience> commandManager(CommandUtil commandUtil) {
CommandManager<UserAudience> commandManager = new PaperCommandManager<>(
CommandManager<UserAudience> commandManager = new LegacyPaperCommandManager<>(
plugin,
ExecutionCoordinator.simpleCoordinator(),
new FloodgateSenderMapper<>(commandUtil)