Merge pull request #10 from Sayan-Development/1.21.3

add 1.21.3 support and update dependencies

Author: Syrent

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "2.0.0"
+    kotlin("jvm") version "2.0.21"
     `version-catalog`
     `maven-publish`
 }
@@ -8,7 +8,7 @@ val slug = "stickynote"
 
 allprojects {
     group = "org.sayandev"
-    version = "1.7.97"
+    version = "1.7.108"
     description = "A modular Kotlin library for Minecraft: JE"
 
     plugins.apply("maven-publish")
@@ -17,7 +17,7 @@ allprojects {
     plugins.apply("kotlin")
 
     dependencies {
-        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.0.0")
+        compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
     }
 
     tasks {

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 
 [versions]
 # core
-kotlin = "2.0.0"
+kotlin = "2.0.21"
 kotlin-poet = "1.17.0"
 snakeyaml = "2.2"
 configurate = "4.1.2"
@@ -16,27 +16,28 @@ reflections = "0.10.2"
 hikari = "5.1.0"
 guava = "31.1-jre"
 gson = "2.10.1"
-kotlin-reflect = "2.0.0"
+kotlin-reflect = "2.0.21"
 netty = "4.1.111.Final"
 exposed = "0.53.0"
 libby = "2.0.0-SNAPSHOT"
 mccoroutines = "2.20.0"
 kotlinx-coroutines = "1.9.0-RC.2"
 
 # minecraft
-adventure-platform = "4.3.3"
+adventure-platform = "4.3.4"
 
 # bukkit
 paper = "1.21-R0.1-SNAPSHOT"
 folia = "1.20.4-R0.1-SNAPSHOT"
 inventoryframework = "0.10.15"
-xseries = "11.2.0"
+xseries = "11.3.0"
 pathetic-pathfinder-bukkit = "2.4.6"
 authlib = "6.0.54"
 skinsrestorer-api = "15.3.1"
 placeholderapi = "2.11.6"
 
 # bukkit - nms
+packetevents-spigot = "2.6.0"
 takenaka = "1.2.0"
 
 # proxy - velocity
@@ -70,6 +71,7 @@ netty-all = { group = "io.netty", name = "netty-all", version.ref = "netty" }
 exposed-core = { group = "org.jetbrains.exposed", name = "exposed-core", version.ref = "exposed" }
 exposed-jdbc = { group = "org.jetbrains.exposed", name = "exposed-jdbc",version.ref = "exposed" }
 exposed-dao = { group = "org.jetbrains.exposed", name = "exposed-dao",version.ref = "exposed" }
+exposed-kotlin-datetime = { group = "org.jetbrains.exposed", name = "exposed-kotlin-datetime",version.ref = "exposed" }
 libby = { group = "com.alessiodp.libby", name = "libby-core", version.ref = "libby" }
 kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 
@@ -94,6 +96,7 @@ mccoroutines-folia-api = { group = "com.github.shynixn.mccoroutine", name = "mcc
 mccoroutines-folia-core = { group = "com.github.shynixn.mccoroutine", name = "mccoroutine-folia-core", version.ref = "mccoroutines" }
 
 # bukkit - nms
+packetevents-spigot = { group = "com.github.retrooper", name = "packetevents-spigot", version.ref = "packetevents-spigot" }
 takenaka = { group = "me.kcra.takenaka", name = "generator-accessor-runtime", version.ref = "takenaka" }
 
 # proxy - velocity
@@ -139,6 +142,7 @@ implementation-core = [
     "exposed-core",
     "exposed-jdbc",
     "exposed-dao",
+    "exposed-kotlin-datetime",
     "kotlinx-coroutines",
     "mysql-connector",
     "sqlite-jdbc"
@@ -156,7 +160,8 @@ implementation-bukkit = [
     "mccoroutines-folia-core",
 ]
 implementation-bukkit-nms = [
-    "takenaka"
+    "takenaka",
+    "packetevents-spigot"
 ]
 implementation-proxy = [
 ]

stickynote-bukkit/stickynote-bukkit-nms/build.gradle.kts

@@ -21,6 +21,8 @@ repositories {
 }
 
 dependencies {
+    api(libs.packetevents.spigot)
+
     compileOnly(libs.paper)
 
     compileOnly(project(":stickynote-core"))

stickynote-bukkit/stickynote-bukkit-nms/src/main/kotlin/org/sayandev/stickynote/bukkit/nms/skin/SkinUtils.kt

@@ -95,7 +95,7 @@ object SkinUtils {
             signature = signatureMethod.invoke(property) as String
         }
 
-        return Skin(PlayerProfiles.getSkinValue(gameProfile)!!, signature)
+        return Skin(PlayerProfiles.getTextureValue(gameProfile)!!, signature)
     }
 
     /**

stickynote-loader/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "2.0.0"
+    kotlin("jvm") version "2.0.21"
     `kotlin-dsl`
     publishing
     id("com.gradle.plugin-publish") version "1.2.1"
@@ -13,7 +13,7 @@ dependencies {
     api(libs.kotlin.poet.java)
 
     implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.4")
-    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.0.0")
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
 }
 
 tasks {

stickynote-loader/src/main/kotlin/org/sayandev/plugin/StickyNoteProjectPlugin.kt

@@ -47,6 +47,7 @@ class StickyNoteProjectPlugin : Plugin<Project> {
         target.dependencies.extensions.create("stickynote", StickyLoadDependencyExtension::class.java, target)
 
         target.plugins.apply("com.gradleup.shadow")
+        target.plugins.apply("java-library")
 
         target.repositories {
             mavenLocal()
@@ -113,10 +114,14 @@ class StickyNoteProjectPlugin : Plugin<Project> {
 //                relocate("com.alessiodp.libby", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.libby")
 //                relocate("org.sqlite", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.sqlite")
                 relocate("com.mysql", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.mysql")
-                for (bundleAlias in libs.bundleAliases.filter { config.modules.get().map { "implementation.".plus(it.type.artifact.removePrefix("stickynote-")) }.contains(it) }) {
+                for (bundleAlias in libs.bundleAliases.filter { config.modules.get().map { "implementation.".plus(it.type.artifact.removePrefix("stickynote-").replace("-", ".")) }.contains(it) }) {
                     val bundle = libs.findBundle(bundleAlias).get().get()
                     for (alias in bundle) {
                         if (relocateExclusion.any { alias.module.name == it }) continue
+                        if (alias.module.name.contains("packetevents")) {
+                            relocate("io.github.retrooper", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.packetevents")
+                            continue
+                        }
                         // We DON'T relocate adventure to keep compatibility with local paper/velocity adventure api calls
                         if (alias.module.name.contains("adventure")) {
 //                            relocate("net.kyori.adventure.text.serializer", "${target.rootProject.group}.${target.rootProject.name.lowercase()}.lib.adventure.text.serializer")

stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/StickyNoteLoader.java

@@ -68,6 +68,10 @@ public void load(String id, File dataFolder, Logger logger, LibraryManager libra
                 }
                 String name = cachedDependency.getName();
                 String group = cachedDependency.getGroup();
+                if (name.contains("packetevents")) {
+                    relocations.put("io{}github{}retrooper", relocationTo + "{}lib{}packetevents");
+                    continue;
+                }
                 if (cachedDependency.isStickyLoad()) {
                     if (cachedDependency.getRelocation() != null) {
                         String[] splitted = cachedDependency.getGroup().split("\\{}");
@@ -93,6 +97,10 @@ public void load(String id, File dataFolder, Logger logger, LibraryManager libra
             for (Dependency missingDependency : dependencies) {
                 String name = missingDependency.getName();
                 String group = missingDependency.getGroup();
+                if (name.contains("packetevents")) {
+                    relocations.put("io{}github{}retrooper", relocationTo + "{}lib{}packetevents");
+                    continue;
+                }
                 if (missingDependency.isStickyLoad()) {
                     if (missingDependency.getRelocation() != null) {
                         String[] splitted = missingDependency.getGroup().split("\\{}");