diff --git a/.gitignore b/.gitignore index acfe91a..426cacd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ run/ # packaged files *.ear -*.jar *.nar *.rar *.tar.gz diff --git a/build.gradle.kts b/build.gradle.kts index 9746b0f..b1cc9fe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -101,7 +101,9 @@ dependencies { include(libs.permission.api) shadow(libs.mcDiscordReserializer) - shadow(libs.adventure.gson) + +// shadow(libs.adventure.gson) + shadow(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) shadow(libs.kord.extensions) shadow(libs.emoji) diff --git a/libs.versions.toml b/libs.versions.toml index 2db7e88..c2117fd 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -12,7 +12,7 @@ fabric-kotlin = "1.9.4+kotlin.1.8.21" kord-extensions = "1.5.6" mc-discord-reserializer = "4.3.0" emoji-java = "5.1.1" -adventure-gson = "4.11.0" +#adventure-gson = "4.11.0" placeholder-api = "2.1.2+1.20.1" permission-api = "0.2-SNAPSHOT" @@ -30,7 +30,7 @@ fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = kord-extensions = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kord-extensions" } emoji = { module = "com.vdurmont:emoji-java", version.ref = "emoji-java"} mcDiscordReserializer = { module = "dev.vankka:mcdiscordreserializer", version.ref = "mc-discord-reserializer"} -adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure-gson"} +#adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure-gson"} placeholder-api = { module = "eu.pb4:placeholder-api", version.ref = "placeholder-api" } permission-api = { module = "me.lucko:fabric-permissions-api", version.ref = "permission-api"} diff --git a/libs/adventure-api-4.15.0-SNAPSHOT.jar b/libs/adventure-api-4.15.0-SNAPSHOT.jar new file mode 100644 index 0000000..d713fc7 Binary files /dev/null and b/libs/adventure-api-4.15.0-SNAPSHOT.jar differ diff --git a/libs/adventure-text-serializer-gson-4.15.0-SNAPSHOT.jar b/libs/adventure-text-serializer-gson-4.15.0-SNAPSHOT.jar new file mode 100644 index 0000000..8054dcc Binary files /dev/null and b/libs/adventure-text-serializer-gson-4.15.0-SNAPSHOT.jar differ diff --git a/libs/adventure-text-serializer-json-4.15.0-SNAPSHOT.jar b/libs/adventure-text-serializer-json-4.15.0-SNAPSHOT.jar new file mode 100644 index 0000000..c8be3a4 Binary files /dev/null and b/libs/adventure-text-serializer-json-4.15.0-SNAPSHOT.jar differ