diff --git a/build.gradle.kts b/build.gradle.kts index 424b927..db27887 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,20 +1,21 @@ plugins { id("java") - id("com.gradleup.shadow") version "8.3.2" + id("com.gradleup.shadow") version "9.1.0" id("xyz.jpenilla.run-paper") version "2.3.0" } group = "xyz.ineanto" version = "1.3.0" -val invuiVersion: String = "1.44" +val invuiVersion: String = "1.46" +val jacksonVersion: String = "2.20.0" java { - sourceCompatibility = JavaVersion.VERSION_22 - targetCompatibility = JavaVersion.VERSION_22 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 toolchain { - languageVersion = JavaLanguageVersion.of(22) + languageVersion = JavaLanguageVersion.of(21) } } @@ -30,19 +31,18 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.11.5") compileOnly("net.kyori:adventure-api:4.21.0") compileOnly("xyz.xenondevs.invui:invui-core:$invuiVersion") compileOnly("net.wesjd:anvilgui:1.10.4-SNAPSHOT") - implementation("com.github.retrooper:packetevents-spigot:2.8.0") + implementation("com.github.retrooper:packetevents-spigot:2.9.0") - implementation("de.rapha149.signgui:signgui:2.5.0") implementation("com.github.jsixface:yamlconfig:1.2") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1") - implementation("com.fasterxml.jackson.core:jackson-core:2.18.1") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion") + implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion") implementation("com.mysql:mysql-connector-j:9.2.0") implementation("org.mariadb.jdbc:mariadb-java-client:3.5.2") implementation("redis.clients:jedis:5.2.0") @@ -90,18 +90,17 @@ tasks { // MINIFY minimize { exclude(dependency("xyz.xenondevs.invui:.*")) - exclude(dependency("de.rapha149.signgui:.*")) } } runServer { downloadPlugins { - url("https://download.luckperms.net/1593/bukkit/loader/LuckPerms-Bukkit-5.5.8.jar") + //url("https://download.luckperms.net/1593/bukkit/loader/LuckPerms-Bukkit-5.5.8.jar") // 1.20.5 - latest testing - url("https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar") + //url("https://ci.dmulloy2.net/job/ProtocolLib/lastSuccessfulBuild/artifact/build/libs/ProtocolLib.jar") } - minecraftVersion("1.21.5") + minecraftVersion("1.21.8") } } \ No newline at end of file diff --git a/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java index cd22e5f..70c2765 100644 --- a/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java +++ b/src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java @@ -46,6 +46,7 @@ public class AppearanceManager { } public ActionResult update(boolean skinChange) { + // TODO (Ineanto, 30/06/2025): Name is not updated when joining ONLY? final NickoProfile profile = getNickoProfile(); final String displayName = profile.getName() == null ? player.getName() : profile.getName(); diff --git a/src/main/java/xyz/ineanto/nicko/packet/PacketEventsPacketSender.java b/src/main/java/xyz/ineanto/nicko/packet/PacketEventsPacketSender.java index 0563492..ac17fcb 100644 --- a/src/main/java/xyz/ineanto/nicko/packet/PacketEventsPacketSender.java +++ b/src/main/java/xyz/ineanto/nicko/packet/PacketEventsPacketSender.java @@ -16,6 +16,7 @@ import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import xyz.ineanto.nicko.Nicko; import xyz.ineanto.nicko.appearance.ActionResult; import xyz.ineanto.nicko.language.LanguageKey; @@ -94,7 +95,7 @@ public record PacketEventsPacketSender(Player player, NickoProfile profile) impl @Override public void sendEntityMetadataUpdate() { // This was surprisingly easy to write? - final EntityData entityData = new EntityData<>(17, EntityDataTypes.BYTE, (byte) 0x7f); + final EntityData<@NotNull Byte> entityData = new EntityData<>(17, EntityDataTypes.BYTE, (byte) 0x7f); final WrapperPlayServerEntityMetadata metadata = new WrapperPlayServerEntityMetadata(player.getEntityId(), List.of(entityData)); sendPacket(metadata, player);