diff --git a/client b/client index a6460e48..8e982c2b 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit a6460e48dde4663c3c7b6dd6fb3a18948ab83b18 +Subproject commit 8e982c2b17e034e26f4611952aa0f04b0cb02e69 diff --git a/server/neoforge_26_1/build.gradle.kts b/server/neoforge_26_1/build.gradle.kts index ee672b4f..40876380 100644 --- a/server/neoforge_26_1/build.gradle.kts +++ b/server/neoforge_26_1/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("dev.architectury.loom-no-remap") version Versions.architecturyLoom - id("architectury-plugin") version "3.5-SNAPSHOT" +// id("architectury-plugin") version "3.5-SNAPSHOT" } java.sourceCompatibility = JavaVersion.VERSION_25 @@ -19,14 +19,14 @@ dependencies { minecraft("com.mojang:minecraft:26.1") neoForge("net.neoforged:neoforge:26.1.0.19-beta") -// modImplementation("net.kyori:adventure-platform-neoforge:6.9.0") -// -// shadowImplementation("net.kyori:adventure-text-minimessage:4.26.1") -// shadowImplementation("net.kyori:adventure-api:4.26.1") -// shadowImplementation("net.kyori:adventure-text-serializer-gson:4.8.1") -// shadowImplementation("net.kyori:adventure-text-serializer-legacy:4.8.1") -// shadowImplementation("net.kyori:adventure-text-serializer-plain:4.8.1") -// shadowImplementation("net.kyori:adventure-key:4.8.1") + implementation("net.kyori:adventure-platform-neoforge:6.9.0") + + shadowImplementation("net.kyori:adventure-text-minimessage:4.26.1") + shadowImplementation("net.kyori:adventure-api:4.26.1") + shadowImplementation("net.kyori:adventure-text-serializer-gson:4.8.1") + shadowImplementation("net.kyori:adventure-text-serializer-legacy:4.8.1") + shadowImplementation("net.kyori:adventure-text-serializer-plain:4.8.1") + shadowImplementation("net.kyori:adventure-key:4.8.1") } tasks { @@ -41,6 +41,7 @@ tasks { relocate("com.google.gson", "com.coloryr.allmusic.libs.com.google.gson") // inputFile.set(shadowJar.get().archiveFile) + archiveFileName.set("[neoforge-26.1]AllMusic_Server-${project.version}.jar") destinationDirectory.set(file("${parent!!.projectDir}/target")) }