Skip to content

Commit 13b1dca

Browse files
committed
chore(deps): upgrade deps
1 parent 6499e19 commit 13b1dca

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import java.net.URL
66

77
plugins {
88
id("java")
9-
id("org.jetbrains.kotlin.jvm") version "2.0.20"
9+
id("org.jetbrains.kotlin.jvm") version "2.1.0"
1010
id("net.kyori.indra") version "3.1.3"
1111
id("net.kyori.indra.publishing") version "3.1.3"
1212
id("net.kyori.indra.license-header") version "3.1.3"
13-
id("com.github.johnrengelman.shadow") version "8.1.1"
13+
id("com.gradleup.shadow") version "8.3.5"
1414
id("io.github.slimjar") version "1.3.0"
15-
id("xyz.jpenilla.run-paper") version "2.3.0"
15+
id("xyz.jpenilla.run-paper") version "2.3.1"
1616
id("com.github.ben-manes.versions") version "0.51.0"
1717
id("org.jetbrains.dokka") version "1.9.20"
1818
}
@@ -58,15 +58,15 @@ dependencies {
5858
implementation("org.codemc.worldguardwrapper:worldguardwrapper:1.1.9-SNAPSHOT")
5959
implementation("ch.jalu:configme:1.3.0")
6060
implementation("com.dumptruckman.minecraft:JsonConfiguration:1.1")
61-
implementation("com.github.cryptomorin:XSeries:11.2.2")
61+
implementation("com.github.cryptomorin:XSeries:12.0.0")
6262
implementation("net.kyori:adventure-platform-bukkit:4.3.4")
6363
implementation("dev.triumphteam:triumph-gui:3.1.10")
6464
implementation("com.zaxxer:HikariCP:4.0.3")
6565
implementation("org.jdbi:jdbi3-core:3.8.2")
6666
implementation("org.jdbi:jdbi3-sqlobject:3.8.2")
6767
implementation("org.mariadb.jdbc:mariadb-java-client:2.7.2")
6868

69-
compileOnly("org.spigotmc:spigot-api:1.21.1-R0.1-SNAPSHOT")
69+
compileOnly("org.spigotmc:spigot-api:1.21.4-R0.1-SNAPSHOT")
7070
compileOnly("net.milkbowl:vault:1.7")
7171
compileOnly("me.clip:placeholderapi:2.11.6")
7272
compileOnly("com.mojang:authlib:1.5.21")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public GuildSkull(Player player) {
4848
final Profileable playerProfile = Profileable.of(player);
4949

5050
itemStack = XSkull.createItem().profile(playerProfile).apply();
51-
serialized = XSkull.of(itemStack.getItemMeta()).getProfileString();
51+
serialized = XSkull.of(itemStack.getItemMeta()).getProfileValue();
5252
}
5353

5454
/**

src/main/kotlin/me/glaremasters/guilds/arena/ArenaHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ArenaHandler(private val guilds: Guilds) {
4242
* @param arena The [Arena] to be added.
4343
*/
4444
fun addArena(arena: Arena) {
45-
arenas[arena.name.toLowerCase()] = arena
45+
arenas[arena.name.lowercase(Locale.getDefault())] = arena
4646
}
4747

4848
/**
@@ -70,7 +70,7 @@ class ArenaHandler(private val guilds: Guilds) {
7070
* @return An [Optional] object containing the [Arena] object.
7171
*/
7272
fun getArena(name: String): Optional<Arena> {
73-
return Optional.ofNullable(arenas[name.toLowerCase()])
73+
return Optional.ofNullable(arenas[name.lowercase(Locale.getDefault())])
7474
}
7575

7676
/**

src/main/kotlin/me/glaremasters/guilds/guis/ListGUI.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ import me.glaremasters.guilds.utils.GuiUtils
3838
import me.glaremasters.guilds.utils.StringUtils
3939
import org.bukkit.entity.Player
4040
import java.text.SimpleDateFormat
41+
import java.util.*
42+
import kotlin.Comparator
43+
import kotlin.collections.ArrayList
4144

4245
class ListGUI(private val guilds: Guilds, private val settingsManager: SettingsManager, private val guildHandler: GuildHandler) {
4346
private val items: MutableList<GuiItem>
@@ -75,7 +78,7 @@ class ListGUI(private val guilds: Guilds, private val settingsManager: SettingsM
7578
private fun createListItems(gui: PaginatedGui, player: Player) {
7679
val guilds = guildHandler.guilds.values.toMutableList()
7780

78-
when (settingsManager.getProperty(GuildListSettings.GUILD_LIST_SORT).toUpperCase()) {
81+
when (settingsManager.getProperty(GuildListSettings.GUILD_LIST_SORT).uppercase(Locale.getDefault())) {
7982
"TIER" -> guilds.sortWith(Comparator.comparingInt { g: Guild -> g.tier.level }.reversed())
8083
"MEMBERS" -> guilds.sortWith(Comparator.comparingInt { g: Guild -> g.members.size }.reversed())
8184
"BALANCE" -> guilds.sortWith(Comparator.comparingDouble { obj: Guild -> obj.balance }.reversed())

src/main/kotlin/me/glaremasters/guilds/guis/MembersGUI.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class MembersGUI(private val guilds: Guilds, private val settingsManager: Settin
8989
private fun addItems(gui: PaginatedGui, guild: Guild, player: Player) {
9090
val members = guild.members
9191

92-
when (settingsManager.getProperty(GuildInfoMemberSettings.SORT_ORDER).toUpperCase()) {
92+
when (settingsManager.getProperty(GuildInfoMemberSettings.SORT_ORDER).uppercase(Locale.getDefault())) {
9393
"ROLE" -> members.sortWith(Comparator.comparingInt { g: GuildMember -> g.role.level })
9494
"NAME" -> members.sortWith(compareBy(GuildMember::name))
9595
"AGE" -> members.sortWith(Comparator.comparingLong(GuildMember::joinDate))

src/main/kotlin/me/glaremasters/guilds/messages/Messages.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ package me.glaremasters.guilds.messages
2525

2626
import co.aikar.locales.MessageKey
2727
import co.aikar.locales.MessageKeyProvider
28+
import java.util.*
2829

2930
/**
3031
* Created by GlareMasters
@@ -302,7 +303,7 @@ enum class Messages : MessageKeyProvider {
302303
/**
303304
* Message keys that grab from the config to send messages
304305
*/
305-
private val key = MessageKey.of(name.toLowerCase().replace("__", ".").replace("_", "-"))
306+
private val key = MessageKey.of(name.lowercase(Locale.getDefault()).replace("__", ".").replace("_", "-"))
306307

307308
/**
308309
* Get the message get from the config

src/main/kotlin/me/glaremasters/guilds/placeholders/PlaceholderAPI.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import me.glaremasters.guilds.exte.rounded
2929
import me.glaremasters.guilds.guild.GuildHandler
3030
import me.glaremasters.guilds.utils.EconomyUtils
3131
import org.bukkit.entity.Player
32+
import java.util.*
3233

3334
class PlaceholderAPI(private val guildHandler: GuildHandler) : PlaceholderExpansion() {
3435

@@ -55,7 +56,7 @@ class PlaceholderAPI(private val guildHandler: GuildHandler) : PlaceholderExpans
5556
val api = Guilds.getApi() ?: return ""
5657

5758
// Check formatted here because this needs to return before we check the guild
58-
if (arg.toLowerCase() == "formatted") {
59+
if (arg.lowercase(Locale.getDefault()) == "formatted") {
5960
return guildHandler.getFormattedPlaceholder(player)
6061
}
6162

@@ -178,7 +179,7 @@ class PlaceholderAPI(private val guildHandler: GuildHandler) : PlaceholderExpans
178179
return member.name ?: ""
179180
}
180181

181-
return when (arg.toLowerCase()) {
182+
return when (arg.lowercase(Locale.getDefault())) {
182183
"id" -> guild.id.toString()
183184
"name" -> guild.name
184185
"master" -> guild.guildMaster.asOfflinePlayer.name.toString()

0 commit comments

Comments
 (0)