Cloud and adventure bump for 1.20.6

2025-12-19 14:59:19 +00:00 · 2024-06-04 15:22:00 +01:00
parent 9450172129
commit 8eba9053a8
8 changed files with 21 additions and 20 deletions
--- a/build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
@@ -75,11 +75,11 @@ dependencies {
    implementation("com.convallyria.languagy:api:3.0.3-SNAPSHOT")
    implementation("com.google.code.gson:gson:2.10.1")

-    implementation("net.kyori:adventure-api:4.17.0")
-    implementation("net.kyori:adventure-text-serializer-plain:4.17.0")
-    implementation("net.kyori:adventure-platform-bukkit:4.3.3-SNAPSHOT") // IMPLEMENTED VIA LIBRARIES
+//    compileOnly("net.kyori:adventure-api:4.17.0")
+//    compileOnly("net.kyori:adventure-text-serializer-plain:4.17.0")
+    compileOnly("net.kyori:adventure-platform-bukkit:4.3.3") // IMPLEMENTED VIA LIBRARIES
 //    implementation("net.kyori:adventure-platform-api:4.3.3-SNAPSHOT")
-    implementation("net.kyori:adventure-text-minimessage:4.17.0") // IMPLEMENTED VIA LIBRARIES
+    compileOnly("net.kyori:adventure-text-minimessage:4.14.0") // IMPLEMENTED VIA LIBRARIES
 }

 testing {
@@ -119,7 +119,7 @@ tasks {
    shadowJar {
        archiveBaseName.set("rpgregions-2-${project.name}")
        archiveClassifier.set("")
-        relocate("net.kyori", "rpgregions-libs.adventure")
+//        relocate("net.kyori", "rpgregions-libs.adventure")
        relocate("com.google.gson", "rpgregions-libs.gson")
        relocate("org.incendo.cloud", "rpgregions-libs.commandframework")
        relocate("io.leangen.geantyref", "rpgregions-libs.typetoken")
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,4 +8,3 @@ spigot_version = 1.20.6-R0.1-SNAPSHOT
 folia_version = 1.20.4-R0.1-SNAPSHOT
 worldguard_version = 7.0.9
 worldedit_version = 7.2.18-SNAPSHOT
-cloud_version = 2.0.0-beta.7
--- a/rpgregions/build.gradle.kts
+++ b/rpgregions/build.gradle.kts
@@ -16,24 +16,24 @@ dependencies {
    testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.9.0")
    testImplementation("org.reflections:reflections:0.10.2")

-    implementation("org.incendo:cloud-paper:${properties["cloud_version"]}") {
+    implementation("org.incendo:cloud-paper:2.0.0-beta.8") {
        exclude("org.checkerframework")
        exclude("net.kyori")
    }
-    implementation("org.incendo:cloud-annotations:2.0.0-rc.1") {
+    implementation("org.incendo:cloud-annotations:2.0.0-rc.2") {
        exclude("org.checkerframework")
    }
-    implementation("org.incendo:cloud-minecraft-extras:${properties["cloud_version"]}") {
+    implementation("org.incendo:cloud-minecraft-extras:2.0.0-beta.8") {
        exclude("org.checkerframework")
        exclude("net.kyori")
    }
-    implementation("org.incendo:cloud-processors-confirmation:1.0.0-SNAPSHOT") {
+    implementation("org.incendo:cloud-processors-confirmation:1.0.0-beta.3") {
        exclude("org.checkerframework")
        exclude("net.kyori")
    }

    implementation("net.wesjd:anvilgui:1.9.4-SNAPSHOT") // anvilgui
-    implementation("com.github.stefvanschie.inventoryframework:IF:0.10.13") // inventory framework
+    implementation("com.github.stefvanschie.inventoryframework:IF:0.10.14") // inventory framework
    implementation("co.aikar:idb-core:1.0.0-SNAPSHOT") // database
    implementation("org.bstats:bstats-bukkit:3.0.2") // plugin stats
    implementation("io.papermc:paperlib:1.0.7") // paperlib - async teleport on Paper
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/Commands.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/Commands.java
@@ -21,7 +21,7 @@ import org.incendo.cloud.annotations.AnnotationParser;
 import org.incendo.cloud.bukkit.CloudBukkitCapabilities;
 import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.minecraft.extras.MinecraftExceptionHandler;
-import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import org.incendo.cloud.parser.ParserRegistry;
 import org.incendo.cloud.processors.cache.CaffeineCache;
 import org.incendo.cloud.processors.confirmation.ConfirmationConfiguration;
@@ -43,9 +43,9 @@ public class Commands {

    public Commands(RPGRegions plugin) {

-        final PaperCommandManager<CommandSender> manager;
+        final LegacyPaperCommandManager<CommandSender> manager;
        try {
-            manager = new PaperCommandManager<>(
+            manager = new LegacyPaperCommandManager<>(
                    plugin,
                    ExecutionCoordinator.simpleCoordinator(),
                    SenderMapper.identity()
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java
@@ -33,7 +33,7 @@ import org.incendo.cloud.annotations.Permission;
 import org.incendo.cloud.annotations.suggestion.Suggestions;
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.minecraft.extras.MinecraftHelp;
-import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -56,7 +56,7 @@ public class RPGRegionsCommand {
    private static final String WARNING_MESSAGE = ChatColor.RED + "" + ChatColor.ITALIC + "" + ChatColor.BOLD
            + "The regenerate configuration is very dangerous and can delete world sections if used wrongly.";

-    public RPGRegionsCommand(RPGRegions plugin, PaperCommandManager<CommandSender> manager) {
+    public RPGRegionsCommand(RPGRegions plugin, LegacyPaperCommandManager<CommandSender> manager) {
        this.plugin = plugin;
        this.help = MinecraftHelp.create("/rpgregions|rpgr help", manager, sender -> plugin.adventure().sender(sender));
    }
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsExportCommand.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsExportCommand.java
@@ -12,7 +12,7 @@ import org.incendo.cloud.annotations.Argument;
 import org.incendo.cloud.annotations.Command;
 import org.incendo.cloud.annotations.CommandDescription;
 import org.incendo.cloud.minecraft.extras.MinecraftHelp;
-import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import org.jetbrains.annotations.Nullable;

 import java.io.File;
@@ -25,7 +25,7 @@ public class RPGRegionsExportCommand {
    private final RPGRegions plugin;
    private final MinecraftHelp<CommandSender> help;

-    public RPGRegionsExportCommand(RPGRegions plugin, PaperCommandManager<CommandSender> manager) {
+    public RPGRegionsExportCommand(RPGRegions plugin, LegacyPaperCommandManager<CommandSender> manager) {
        this.plugin = plugin;
        this.help = MinecraftHelp.create("/rpgre help", manager, sender -> plugin.adventure().sender(sender));
    }
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsIntegrationCommand.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsIntegrationCommand.java
@@ -17,7 +17,7 @@ import org.incendo.cloud.annotations.Command;
 import org.incendo.cloud.annotations.CommandDescription;
 import org.incendo.cloud.annotations.Permission;
 import org.incendo.cloud.minecraft.extras.MinecraftHelp;
-import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import org.jetbrains.annotations.Nullable;

 import java.util.ArrayList;
@@ -30,7 +30,7 @@ public class RPGRegionsIntegrationCommand {
    private final RPGRegions plugin;
    private final MinecraftHelp<CommandSender> help;

-    public RPGRegionsIntegrationCommand(final RPGRegions plugin, PaperCommandManager<CommandSender> manager) {
+    public RPGRegionsIntegrationCommand(final RPGRegions plugin, LegacyPaperCommandManager<CommandSender> manager) {
        this.plugin = plugin;
        this.help = MinecraftHelp.create("/rpgri help", manager, sender -> plugin.adventure().sender(sender));
    }
--- a/rpgregions/src/main/resources/plugin.yml
+++ b/rpgregions/src/main/resources/plugin.yml
@@ -4,6 +4,8 @@ main: net.islandearth.rpgregions.RPGRegions
 api-version: '1.16'
 libraries:
  - "com.zaxxer:HikariCP:5.0.1" # database
+  - "net.kyori:adventure-platform-bukkit:4.3.3"
+  - "net.kyori:adventure-text-minimessage:4.14.0"
  - "com.github.ben-manes.caffeine:caffeine:3.1.8"
  - "org.xerial:sqlite-jdbc:3.30.1"
  - "org.flywaydb:flyway-core:10.12.0" # db migration