Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21 Spigot support #521

Merged
merged 1 commit into from
Jun 14, 2024
Merged

1.21 Spigot support #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build-logic/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 3 additions & 1 deletion spigot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions spigot/src/main/java/org/geysermc/floodgate/module/SpigotCommandModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
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 {
Expand All @@ -56,7 +56,7 @@ protected void configure() {
@Singleton
@SneakyThrows
public CommandManager<UserAudience> commandManager(CommandUtil commandUtil) {
CommandManager<UserAudience> commandManager = new PaperCommandManager<>(
CommandManager<UserAudience> commandManager = new LegacyPaperCommandManager<>(
plugin,
ExecutionCoordinator.simpleCoordinator(),
new FloodgateSenderMapper<>(commandUtil)
Expand Down