Skip to content

Commit 8d59c6e

Browse files
committed
feat: started working on 1.20.6 support
- Updated Gradle to 8.7 - Updated various dependencies - Started working on integrating XSeries overhaul
1 parent 90b23a1 commit 8d59c6e

File tree

7 files changed

+16
-22
lines changed

7 files changed

+16
-22
lines changed

build.gradle.kts

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

77
plugins {
88
id("java")
9-
id("org.jetbrains.kotlin.jvm") version "1.9.22"
9+
id("org.jetbrains.kotlin.jvm") version "2.0.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"
1313
id("com.github.johnrengelman.shadow") version "8.1.1"
1414
id("io.github.slimjar") version "1.3.0"
15-
id("xyz.jpenilla.run-paper") version "2.2.2"
16-
id("com.github.ben-manes.versions") version "0.48.0"
17-
id("org.jetbrains.dokka") version "1.9.10"
15+
id("xyz.jpenilla.run-paper") version "2.3.0"
16+
id("com.github.ben-manes.versions") version "0.51.0"
17+
id("org.jetbrains.dokka") version "1.9.20"
1818
}
1919

2020
group = "me.glaremasters"
@@ -58,17 +58,17 @@ 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:9.9.0")
61+
implementation("com.github.cryptomorin:XSeries:11.0.0-beta")
6262
implementation("net.kyori:adventure-platform-bukkit:4.3.2")
63-
implementation("dev.triumphteam:triumph-gui:3.1.5")
63+
implementation("dev.triumphteam:triumph-gui:3.1.7")
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

6969
compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
7070
compileOnly("net.milkbowl:vault:1.7")
71-
compileOnly("me.clip:placeholderapi:2.11.5")
71+
compileOnly("me.clip:placeholderapi:2.11.6")
7272

7373
slim("org.jetbrains.kotlin:kotlin-stdlib")
7474
}
@@ -119,7 +119,7 @@ tasks {
119119
}
120120

121121
runServer {
122-
minecraftVersion("1.20.4")
122+
minecraftVersion("1.20.6")
123123
}
124124

125125
license {

gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import ch.jalu.configme.SettingsManager;
2727
import co.aikar.commands.CommandManager;
28-
import com.cryptomorin.xseries.SkullUtils;
2928
import me.glaremasters.guilds.Guilds;
3029
import me.glaremasters.guilds.configuration.sections.GuildListSettings;
3130
import me.glaremasters.guilds.messages.Messages;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
package me.glaremasters.guilds.guild;
2525

26-
import com.cryptomorin.xseries.SkullUtils;
2726
import com.cryptomorin.xseries.XMaterial;
27+
import com.cryptomorin.xseries.XSkull;
2828
import org.bukkit.entity.Player;
2929
import org.bukkit.inventory.ItemStack;
3030
import org.bukkit.inventory.meta.SkullMeta;
@@ -44,8 +44,8 @@ public class GuildSkull {
4444
* @param player the player whose head will be used for the guild skull
4545
*/
4646
public GuildSkull(Player player) {
47-
itemStack = SkullUtils.getSkull(player.getUniqueId());
48-
serialized = SkullUtils.getSkinValue(Objects.requireNonNull(itemStack.getItemMeta()));
47+
itemStack = XSkull.getSkull(player.getUniqueId());
48+
serialized = XSkull.getSkinValue(Objects.requireNonNull(itemStack.getItemMeta()));
4949
}
5050

5151
/**
@@ -54,7 +54,7 @@ public GuildSkull(Player player) {
5454
* @param texture the texture string, which should be a Minecraft resource location string
5555
*/
5656
public GuildSkull(String texture) {
57-
serialized = SkullUtils.encodeTexturesURL(texture);
57+
serialized = XSkull.encodeTexturesURL(texture);
5858
itemStack = createSkull();
5959
}
6060

@@ -66,7 +66,7 @@ public GuildSkull(String texture) {
6666
public ItemStack createSkull() {
6767
final ItemStack head = XMaterial.PLAYER_HEAD.parseItem();
6868
SkullMeta meta = (SkullMeta) head.getItemMeta();
69-
meta = SkullUtils.applySkin(meta, serialized);
69+
meta = XSkull.applySkin(meta, serialized);
7070
head.setItemMeta(meta);
7171
return head;
7272
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
package me.glaremasters.guilds.utils;
2525

26-
import com.cryptomorin.xseries.SkullUtils;
2726
import com.cryptomorin.xseries.XMaterial;
27+
import com.cryptomorin.xseries.XSkull;
2828
import me.glaremasters.guilds.guild.GuildMember;
2929
import org.bukkit.Material;
3030
import org.bukkit.inventory.ItemFlag;
@@ -73,7 +73,7 @@ public static ItemStack createItem(String material, String name, List<String> lo
7373
* @return the skull item
7474
*/
7575
public static ItemStack createSkullItem(final GuildMember member, final String name, final List<String> lore) {
76-
final ItemStack skull = SkullUtils.getSkull(member.getUuid());
76+
final ItemStack skull = XSkull.getSkull(member.getUuid());
7777
final ItemMeta meta = skull.getItemMeta();
7878

7979
meta.setDisplayName(StringUtils.color(name));

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@
2424
package me.glaremasters.guilds.guis
2525

2626
import ch.jalu.configme.SettingsManager
27-
import com.cryptomorin.xseries.SkullUtils
28-
import dev.triumphteam.gui.guis.Gui
2927
import dev.triumphteam.gui.guis.GuiItem
3028
import dev.triumphteam.gui.guis.PaginatedGui
3129
import me.glaremasters.guilds.Guilds
32-
import me.glaremasters.guilds.conf.GuildBuffSettings
3330
import me.glaremasters.guilds.configuration.sections.ExperimentalSettings
3431
import me.glaremasters.guilds.configuration.sections.GuildInfoMemberSettings
3532
import me.glaremasters.guilds.configuration.sections.GuildListSettings
36-
import me.glaremasters.guilds.configuration.sections.PluginSettings
37-
import me.glaremasters.guilds.exte.addBackground
3833
import me.glaremasters.guilds.exte.addBottom
3934
import me.glaremasters.guilds.guild.Guild
4035
import me.glaremasters.guilds.guild.GuildHandler

0 commit comments

Comments
 (0)