diff --git a/README.md b/README.md index 7f77acb..bf318b6 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Kotlinx Serialization for Minecraft Payloads. ### Features - Kotlinx Serialization encoder/decoder for Minecraft's FriendlyByteBuf/PacketByteBuf. - Abstract `SerializedPayload` for easy packet creation. +- Support for both Fabric and NeoForge loaders. ### Developer Usage This project is intended to be included via Jar-in-Jar.\ @@ -22,8 +23,11 @@ dependencies { modImplementation("dev.wanderia:netlib-fabric:$version") // NeoForge - jarJar("dev.wanderia:netlib-neoforge:$version") { - jarJar.pin(it, "[$version,)") + jarJar(implementation("dev.wanderia:netlib-neoforge")) { + version { + strictly("[$version,)") + prefer("$version") + } } } ``` diff --git a/build.gradle.kts b/build.gradle.kts index d3b2bc8..c2c2ea4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,7 @@ import org.jetbrains.changelog.date plugins { alias(libs.plugins.kotlin) apply false alias(libs.plugins.loom) apply false + alias(libs.plugins.neogradle) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.spotless) apply false alias(libs.plugins.changelog) @@ -19,7 +20,7 @@ plugins { } group = "dev.wanderia" -version = "1.3.0" +version = "1.3.1" repositories { mavenCentral() } diff --git a/libs.versions.toml b/libs.versions.toml index 02cd021..61402d3 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -12,7 +12,7 @@ kotlinx-kover = "0.8.3" # https://github.com/Kotlin/kotlinx-kover/releases kotlinxSerialization = "1.7.3" # https://github.com/Kotlin/kotlinx.serialization/releases minecraft = "1.21.1" neoForge = "21.1.66" # https://projects.neoforged.net/neoforged/neoforge -neoGradle = "7.0.165" # https://projects.neoforged.net/neoforged/neogradle +neoGradle = "2.0.34-beta" # https://projects.neoforged.net/neoforged/moddevgradle minotaur = "2.8.7" # https://github.com/modrinth/minotaur/releases parchment = "2024.07.28" # https://parchmentmc.org/docs/getting-started spotless = "7.0.0.BETA2" # https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md @@ -41,7 +41,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi kotlinx-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kotlinx-kover" } loom = { id = "fabric-loom", version.ref = "fabricLoom" } minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" } -neogradle = { id = "net.neoforged.gradle.userdev", version.ref = "neoGradle" } +neogradle = { id = "net.neoforged.moddev", version.ref = "neoGradle" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } # custom plugins, in buildLogic/ diff --git a/mod/neoforge/build.gradle.kts b/mod/neoforge/build.gradle.kts index 2601a42..7a76491 100644 --- a/mod/neoforge/build.gradle.kts +++ b/mod/neoforge/build.gradle.kts @@ -15,12 +15,18 @@ repositories { maven("https://thedarkcolour.github.io/KotlinForForge/") { name = "KotlinForForge" } } -dependencies { - implementation(libs.neoforge) - implementation(libs.kotlinforforge) -} +dependencies { implementation(libs.kotlinforforge) } + +neoForge { + version = libs.versions.neoForge.get() -subsystems { parchment { mappingsVersion = libs.versions.parchment.get() } } + parchment { + minecraftVersion = "1.21" + mappingsVersion = libs.versions.parchment.get() + } + + unitTest { enable() } +} tasks { processResources {