Update to support 1.21.9

Author: booky10

.github/workflows/build.yml

@@ -35,4 +35,4 @@ jobs:
           if-no-files-found: error
 
       - name: Publish to package registry
-        run: ./gradlew publish --no-daemon -PhorreoUsername=${{ secrets.PUBLISH_USERNAME }} -PhorreoPassword=${{ secrets.PUBLISH_PASSWORD }}
+        run: ./gradlew publish --no-daemon -PminceraftUsername=${{ secrets.PUBLISH_USERNAME }} -PminceraftPassword=${{ secrets.PUBLISH_PASSWORD }}

build.gradle.kts

@@ -27,11 +27,11 @@ dependencies {
     implementation(libs.bstats.bukkit)
 
     compileOnlyApi(libs.cloudcore)
-    compileOnly(libs.commandapi.bukkit.core)
+    compileOnly(libs.commandapi.paper.core)
 
     // testserver dependency plugins
     plugin(variantOf(libs.cloudcore) { classifier("all") })
-    plugin(libs.commandapi.bukkit.plugin)
+    plugin(libs.commandapi.paper.plugin)
 }
 
 java {
@@ -48,22 +48,22 @@ publishing {
         from(components["java"])
     }
     repositories.maven("https://repo.cloudcraftmc.de/releases/") {
-        name = "horreo"
+        name = "minceraft"
         credentials(PasswordCredentials::class.java)
     }
 }
 
 bukkit {
     main = "$group.launchplates.LaunchPlatesMain"
-    apiVersion = "1.20"
+    apiVersion = "1.20.5"
     authors = listOf("booky10")
     depend = listOf("CloudCore", "CommandAPI")
     load = net.minecrell.pluginyml.bukkit.BukkitPluginDescription.PluginLoadOrder.POSTWORLD
 }
 
 tasks {
     runServer {
-        minecraftVersion("1.21.1")
+        minecraftVersion("1.21.9")
 
         pluginJars.from(plugin.resolve())
         downloadPlugins {

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 pluginyml = "0.6.0"
-runtask = "2.3.1"
-shadow = "8.3.0"
+runtask = "3.0.0"
+shadow = "8.3.9"
 publishing = "0.7.4"
 
-paper = "1.21.1-R0.1-SNAPSHOT"
+paper = "1.21.9-R0.1-SNAPSHOT"
 bstats = "3.1.0"
 
 cloudcore = "1.1.0-SNAPSHOT"
 
-commandapi = "9.5.3"
+commandapi = "11.0.0"
 debuggery = "1.5.1"
 
 [plugins]
@@ -24,5 +24,5 @@ bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
 
 cloudcore = { module = "dev.booky:cloudcore", version.ref = "cloudcore" }
 
-commandapi-bukkit-core = { module = "dev.jorel:commandapi-bukkit-core", version.ref = "commandapi" }
-commandapi-bukkit-plugin = { module = "dev.jorel:commandapi-bukkit-plugin", version.ref = "commandapi" }
+commandapi-paper-core = { module = "dev.jorel:commandapi-paper-core", version.ref = "commandapi" }
+commandapi-paper-plugin = { module = "dev.jorel:commandapi-paper-plugin", version.ref = "commandapi" }

src/main/java/dev/booky/launchplates/LaunchPlateManager.java

@@ -1,7 +1,7 @@
 package dev.booky.launchplates;
 // Created by booky10 in CloudCore (11:18 14.03.23)
 
-import dev.booky.cloudcore.config.ConfigLoader;
+import dev.booky.cloudcore.config.ConfigurateLoader;
 import dev.booky.launchplates.util.LaunchPlateConfig;
 import dev.booky.launchplates.util.LaunchPlateConfig.LaunchPlate;
 import net.kyori.adventure.text.Component;
@@ -52,12 +52,14 @@ public LaunchPlateManager(Plugin plugin) {
     }
 
     public void reloadConfig() {
-        this.config = ConfigLoader.loadObject(this.configPath, LaunchPlateConfig.class);
+        this.config = ConfigurateLoader.yamlLoader().withAllDefaultSerializers().build()
+                .loadObject(this.configPath, LaunchPlateConfig.class);
         this.updatePlateMap();
     }
 
     public void saveConfig() {
-        ConfigLoader.saveObject(this.configPath, this.config);
+        ConfigurateLoader.yamlLoader().withAllDefaultSerializers().build()
+                .saveObject(this.configPath, this.config);
     }
 
     public synchronized void updateConfig(Consumer<LaunchPlateConfig> consumer) {

src/main/java/dev/booky/launchplates/LaunchPlatesMain.java

@@ -1,26 +1,31 @@
 package dev.booky.launchplates;
 // Created by booky10 in CloudCore (10:35 14.03.23)
 
-import dev.booky.cloudcore.util.TranslationLoader;
+import dev.booky.cloudcore.i18n.CloudTranslator;
 import dev.booky.launchplates.commands.LaunchPlateCommand;
 import dev.booky.launchplates.listener.LaunchListener;
 import dev.booky.launchplates.listener.ProtectionListener;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.Locale;
+
 public class LaunchPlatesMain extends JavaPlugin {
 
     private LaunchPlateManager manager;
-    private TranslationLoader i18n;
+    private CloudTranslator i18n;
 
     @Override
     public void onLoad() {
         new Metrics(this, 18099);
         this.manager = new LaunchPlateManager(this);
 
-        this.i18n = new TranslationLoader(this);
+        this.i18n = new CloudTranslator(this.getClassLoader(),
+                new NamespacedKey(this, "i18n"),
+                Locale.ENGLISH, Locale.GERMAN);
         this.i18n.load();
     }
 

src/main/java/dev/booky/launchplates/commands/LaunchPlateCommand.java

@@ -4,7 +4,6 @@
 import dev.booky.launchplates.LaunchPlateManager;
 import dev.booky.launchplates.util.LaunchPlateConfig.LaunchPlate;
 import dev.jorel.commandapi.CommandAPI;
-import dev.jorel.commandapi.CommandAPIBukkit;
 import dev.jorel.commandapi.CommandTree;
 import dev.jorel.commandapi.arguments.FloatArgument;
 import dev.jorel.commandapi.arguments.LiteralArgument;
@@ -32,6 +31,8 @@
 import java.util.Objects;
 import java.util.Set;
 
+import static dev.jorel.commandapi.CommandAPIPaper.failWithAdventureComponent;
+
 public final class LaunchPlateCommand {
 
     private final LaunchPlateManager manager;
@@ -41,13 +42,11 @@ private LaunchPlateCommand(LaunchPlateManager manager) {
     }
 
     public static void create(LaunchPlateManager manager) {
-        LaunchPlateCommand command = new LaunchPlateCommand(manager);
-        command.unregister();
-        command.register();
+        new LaunchPlateCommand(manager).register();
     }
 
     private WrapperCommandSyntaxException fail(Component message) {
-        return CommandAPIBukkit.failWithAdventureComponent(this.manager.getPrefix()
+        return failWithAdventureComponent(this.manager.getPrefix()
                 .append(message.colorIfAbsent(NamedTextColor.RED)));
     }
 
@@ -133,7 +132,8 @@ private void listPlates(NativeProxyCommandSender sender, CommandArguments args)
                             if (clicker == sender.getCaller() && clicker instanceof Player player) {
                                 blockLocation.setYaw(player.getLocation().getYaw());
                                 blockLocation.setPitch(player.getLocation().getPitch());
-                                player.teleport(blockLocation, TeleportFlag.Relative.YAW, TeleportFlag.Relative.PITCH);
+                                // TODO what the fuck did paper fuck up here, this is NOT a proper replacement
+                                player.teleport(blockLocation, TeleportFlag.Relative.VELOCITY_ROTATION);
                             }
                         }, opts -> opts.uses(ClickCallback.UNLIMITED_USES).lifetime(Duration.ofMinutes(10))));
             }