Merge branch 'master' into l10n_master

Author: darbyjack

build.gradle.kts

@@ -6,15 +6,15 @@ import java.net.URL
 
 plugins {
     id("java")
-    id("org.jetbrains.kotlin.jvm") version "1.9.22"
+    id("org.jetbrains.kotlin.jvm") version "2.0.0"
     id("net.kyori.indra") version "3.1.3"
     id("net.kyori.indra.publishing") version "3.1.3"
     id("net.kyori.indra.license-header") version "3.1.3"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("io.github.slimjar") version "1.3.0"
-    id("xyz.jpenilla.run-paper") version "2.2.0"
-    id("com.github.ben-manes.versions") version "0.48.0"
-    id("org.jetbrains.dokka") version "1.9.10"
+    id("xyz.jpenilla.run-paper") version "2.3.0"
+    id("com.github.ben-manes.versions") version "0.51.0"
+    id("org.jetbrains.dokka") version "1.9.20"
 }
 
 group = "me.glaremasters"
@@ -58,17 +58,17 @@ dependencies {
     implementation("org.codemc.worldguardwrapper:worldguardwrapper:1.1.9-SNAPSHOT")
     implementation("ch.jalu:configme:1.3.0")
     implementation("com.dumptruckman.minecraft:JsonConfiguration:1.1")
-    implementation("com.github.cryptomorin:XSeries:9.8.1")
+    implementation("com.github.cryptomorin:XSeries:11.0.0-beta")
     implementation("net.kyori:adventure-platform-bukkit:4.3.2")
-    implementation("dev.triumphteam:triumph-gui:3.1.5")
+    implementation("dev.triumphteam:triumph-gui:3.1.7")
     implementation("com.zaxxer:HikariCP:4.0.3")
     implementation("org.jdbi:jdbi3-core:3.8.2")
     implementation("org.jdbi:jdbi3-sqlobject:3.8.2")
     implementation("org.mariadb.jdbc:mariadb-java-client:2.7.2")
 
     compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
     compileOnly("net.milkbowl:vault:1.7")
-    compileOnly("me.clip:placeholderapi:2.11.5")
+    compileOnly("me.clip:placeholderapi:2.11.6")
 
     slim("org.jetbrains.kotlin:kotlin-stdlib")
 }
@@ -119,7 +119,7 @@ tasks {
     }
 
     runServer {
-        minecraftVersion("1.20.4")
+        minecraftVersion("1.20.6")
     }
 
     license {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -25,7 +25,6 @@
 
 import ch.jalu.configme.SettingsManager;
 import co.aikar.commands.CommandManager;
-import com.cryptomorin.xseries.SkullUtils;
 import me.glaremasters.guilds.Guilds;
 import me.glaremasters.guilds.configuration.sections.GuildListSettings;
 import me.glaremasters.guilds.messages.Messages;

src/main/java/me/glaremasters/guilds/guild/Guild.java

@@ -23,8 +23,8 @@
  */
 package me.glaremasters.guilds.guild;
 
-import com.cryptomorin.xseries.SkullUtils;
 import com.cryptomorin.xseries.XMaterial;
+import com.cryptomorin.xseries.XSkull;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
@@ -44,8 +44,8 @@ public class GuildSkull {
      * @param player the player whose head will be used for the guild skull
      */
     public GuildSkull(Player player) {
-        itemStack = SkullUtils.getSkull(player.getUniqueId());
-        serialized = SkullUtils.getSkinValue(Objects.requireNonNull(itemStack.getItemMeta()));
+        itemStack = XSkull.getSkull(player.getUniqueId());
+        serialized = XSkull.getSkinValue(Objects.requireNonNull(itemStack.getItemMeta()));
     }
 
     /**
@@ -54,7 +54,7 @@ public GuildSkull(Player player) {
      * @param texture the texture string, which should be a Minecraft resource location string
      */
     public GuildSkull(String texture) {
-        serialized = SkullUtils.encodeTexturesURL(texture);
+        serialized = XSkull.encodeTexturesURL(texture);
         itemStack = createSkull();
     }
 
@@ -66,7 +66,7 @@ public GuildSkull(String texture) {
     public ItemStack createSkull() {
         final ItemStack head = XMaterial.PLAYER_HEAD.parseItem();
         SkullMeta meta = (SkullMeta) head.getItemMeta();
-        meta = SkullUtils.applySkin(meta, serialized);
+        meta = XSkull.applySkin(meta, serialized);
         head.setItemMeta(meta);
         return head;
     }

src/main/java/me/glaremasters/guilds/guild/GuildSkull.java

@@ -23,8 +23,8 @@
  */
 package me.glaremasters.guilds.utils;
 
-import com.cryptomorin.xseries.SkullUtils;
 import com.cryptomorin.xseries.XMaterial;
+import com.cryptomorin.xseries.XSkull;
 import me.glaremasters.guilds.guild.GuildMember;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemFlag;
@@ -73,7 +73,7 @@ public static ItemStack createItem(String material, String name, List<String> lo
      * @return the skull item
      */
     public static ItemStack createSkullItem(final GuildMember member, final String name, final List<String> lore) {
-        final ItemStack skull = SkullUtils.getSkull(member.getUuid());
+        final ItemStack skull = XSkull.getSkull(member.getUuid());
         final ItemMeta meta = skull.getItemMeta();
 
         meta.setDisplayName(StringUtils.color(name));

src/main/java/me/glaremasters/guilds/utils/GuiUtils.java

@@ -25,6 +25,7 @@ package me.glaremasters.guilds.commands.admin.arena
 
 import co.aikar.commands.ACFBukkitUtil
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -64,7 +65,7 @@ internal class CommandAdminArena : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @Description("{@@descriptions.arena-create}")
     @Syntax("%name")
-    fun create(player: Player, name: String) {
+    fun create(issuer: CommandIssuer, name: String) {
         val arena = Arena(UUID.randomUUID(), name, null, null, false)
         arenaHandler.addArena(arena)
         currentCommandIssuer.sendInfo(Messages.ARENA__CREATED, "{arena}", name)
@@ -85,7 +86,7 @@ internal class CommandAdminArena : BaseCommand() {
     @Description("{@@descriptions.arena-delete}")
     @CommandCompletion("@arenas")
     @Syntax("%name")
-    fun delete(player: Player, @Values("@arenas") arena: Arena) {
+    fun delete(issuer: CommandIssuer, @Values("@arenas") arena: Arena) {
         val name = arena.name
         arenaHandler.removeArena(arena)
         currentCommandIssuer.sendInfo(Messages.ARENA__DELETED, "{arena}", name)
@@ -94,7 +95,7 @@ internal class CommandAdminArena : BaseCommand() {
     @Subcommand("arena list")
     @CommandPermission(Constants.ADMIN_PERM)
     @Description("{@@descriptions.arena-list}")
-    fun list(player: Player) {
+    fun list(issuer: CommandIssuer) {
         val arenas = arenaHandler.getArenas()
 
         if (arenas.isEmpty()) {

src/main/kotlin/me/glaremasters/guilds/commands/admin/arena/CommandAdminArena.kt

@@ -25,6 +25,7 @@ package me.glaremasters.guilds.commands.admin.homes
 
 import ch.jalu.configme.SettingsManager
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -53,7 +54,7 @@ internal class CommandAdminHome : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild")
-    fun delete(player: Player, @Flags("other") @Values("@guilds") guild: Guild) {
+    fun delete(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild) {
         guild.delHome()
         currentCommandIssuer.sendInfo(Messages.ADMIN__DELHOME, "{guild}", guild.name)
     }

src/main/kotlin/me/glaremasters/guilds/commands/admin/homes/CommandAdminHome.kt

@@ -24,6 +24,7 @@
 package me.glaremasters.guilds.commands.admin.manage
 
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -51,7 +52,7 @@ internal class CommandAdminPrefix : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild %prefix")
-    fun prefix(player: Player, @Flags("other") @Values("@guilds") guild: Guild, prefix: String) {
+    fun prefix(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild, prefix: String) {
         guild.prefix = StringUtils.color(prefix)
         currentCommandIssuer.sendInfo(Messages.PREFIX__SUCCESSFUL, "{prefix}", guild.prefix)
     }

src/main/kotlin/me/glaremasters/guilds/commands/admin/manage/CommandAdminPrefix.kt

@@ -24,6 +24,7 @@
 package me.glaremasters.guilds.commands.admin.manage
 
 import co.aikar.commands.BaseCommand
+import co.aikar.commands.CommandIssuer
 import co.aikar.commands.annotation.CommandAlias
 import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
@@ -52,7 +53,7 @@ internal class CommandAdminRename : BaseCommand() {
     @CommandPermission(Constants.ADMIN_PERM)
     @CommandCompletion("@guilds")
     @Syntax("%guild %new-name")
-    fun rename(player: Player, @Flags("other") @Values("@guilds") guild: Guild, @Single name: String) {
+    fun rename(issuer: CommandIssuer, @Flags("other") @Values("@guilds") guild: Guild, @Single name: String) {
         guild.name = StringUtils.color(name)
         currentCommandIssuer.sendInfo(Messages.RENAME__SUCCESSFUL, "{name}", guild.name)
     }