Add 1.21.10 support

Author: AverageGithub

build.gradle.kts

@@ -14,6 +14,7 @@ allprojects {
         maven("https://jitpack.io/")
         maven("https://repo.artillex-studios.com/releases/")
         maven("https://repo.codemc.org/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
     }
@@ -34,8 +35,8 @@ subprojects {
     dependencies {
         implementation("com.artillexstudios.axapi:axapi:1.4.802:all")
         compileOnly("com.github.ben-manes.caffeine:caffeine:3.2.2")
-        compileOnly("org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT")
-        compileOnly("dev.jorel:commandapi-spigot-shade:11.0.0")
+        compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
+        compileOnly("dev.jorel:commandapi-paper-shade:11.0.0")
         compileOnly("net.kyori:adventure-platform-bukkit:4.4.1")
         compileOnly("org.apache.commons:commons-lang3:3.19.0")
         compileOnly("commons-io:commons-io:2.20.0")

common/src/main/java/com/artillexstudios/axvanish/AxVanishPlugin.java

@@ -28,7 +28,7 @@ public void dependencies(DependencyManagerWrapper manager) {
         manager.repository(Repository.jitpack());
         manager.repository("https://repo.codemc.org/repository/maven-public/");
         manager.repository("https://hub.spigotmc.org/nexus/content/repositories/snapshots/");
-        manager.dependency("dev{}jorel:commandapi-spigot-shade:11.0.0", true);
+        manager.dependency("dev{}jorel:commandapi-paper-shade:11.0.0");
         manager.dependency("com{}h2database:h2:2.4.240");
         manager.dependency("com{}zaxxer:HikariCP:7.0.2");
         manager.dependency("org{}jooq:jooq:3.20.8");

common/src/main/java/com/artillexstudios/axvanish/command/AxVanishCommand.java

@@ -14,8 +14,9 @@
 import com.artillexstudios.axvanish.config.Config;
 import com.artillexstudios.axvanish.config.Groups;
 import com.artillexstudios.axvanish.config.Language;
+import com.destroystokyo.paper.profile.PlayerProfile;
 import dev.jorel.commandapi.CommandAPI;
-import dev.jorel.commandapi.CommandAPISpigotConfig;
+import dev.jorel.commandapi.CommandAPIPaperConfig;
 import dev.jorel.commandapi.CommandTree;
 import dev.jorel.commandapi.arguments.LiteralArgument;
 import dev.jorel.commandapi.arguments.PlayerProfileArgument;
@@ -35,8 +36,7 @@ public AxVanishCommand(AxVanishPlugin plugin) {
     }
 
     public void load() {
-        CommandAPI.onLoad(new CommandAPISpigotConfig(this.plugin)
-                .skipReloadDatapacks(true)
+        CommandAPI.onLoad(new CommandAPIPaperConfig(this.plugin)
                 .setNamespace("axvanish")
         );
     }
@@ -93,13 +93,13 @@ public void register() {
                         .then(new PlayerProfileArgument("player")
                                 .withPermission("axvanish.command.toggle.other")
                                 .executes((sender, args) -> {
-                                    OfflinePlayer offlinePlayer = args.getByClass("player", OfflinePlayer.class);
+                                    PlayerProfile offlinePlayer = args.getByClass("player", PlayerProfile.class);
                                     if (offlinePlayer == null) {
                                         return;
                                     }
 
                                     VanishSource source = sender instanceof Player player ? AxVanishAPI.instance().getUserIfLoadedImmediately(player) : ConsoleVanishSource.INSTANCE;
-                                    AxVanishAPI.instance().user(offlinePlayer.getUniqueId()).thenAccept(user -> {
+                                    AxVanishAPI.instance().user(offlinePlayer.getId()).thenAccept(user -> {
                                         if (source instanceof User senderUser) {
                                             if (senderUser.group() != null && user.group() != null && senderUser.group().priority() < user.group().priority()) {
                                                 MessageUtils.sendMessage(sender, Language.prefix, Language.error.notHighEnoughGroup);

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,3 @@
-#Sun Jan 05 12:59:55 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip