Port to 1.21.1 neoforge

.github/workflows/build-and-test.yml

@@ -3,9 +3,9 @@ name: Build and test
 
 on:
   pull_request:
-    branches: [ 1.20.1 ]
+    branches: [ 1.21.1 ]
   push:
-    branches: [ 1.20.1 ]
+    branches: [ 1.21.1 ]
 
 jobs:
   build-and-test:

.github/workflows/test-scala-presence.yml

@@ -2,9 +2,9 @@ name: Test Scala Presence
 
 on:
   pull_request:
-    branches: [ 1.20.1 ]
+    branches: [ 1.21.1 ]
   push:
-    branches: [ 1.20.1 ]
+    branches: [ 1.21.1 ]
 
 jobs:
   test-scala-presence:

build.gradle

@@ -1,14 +1,10 @@
 plugins {
     id 'java-library'
-    id 'org.jetbrains.kotlin.jvm'
-    id 'eclipse'
+    id 'net.neoforged.moddev' version '2.0.113'
     id 'idea'
     id 'maven-publish'
-    alias libs.plugins.modDevGradle
-    //alias libs.plugins.shadow
-    alias libs.plugins.spotless
-    alias libs.plugins.lombok
-    id 'com.palantir.git-version' version '4.0.0' apply false // 0.13.0 is the last jvm8 supporting version
+    id 'com.diffplug.spotless' version '7.0.2'
+    id 'com.palantir.git-version' version '4.0.0' apply false
 }
 
 group = maven_group
@@ -39,34 +35,18 @@ version = "${mod_version}"
 boolean isCI = System.getenv("CI") != null
 
 java {
-    toolchain.languageVersion = JavaLanguageVersion.of(17)
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
 }
 
-sourceSets {
-    // Include resources generated by data generators.
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
-
-    client {
-        compileClasspath += main.output
-        runtimeClasspath += main.output + main.runtimeClasspath
-    }
-
-    test {
-        compileClasspath += main.output
-        runtimeClasspath += main.output + main.runtimeClasspath
-    }
-
-    extra {
-        compileClasspath += main.output
-        runtimeClasspath += main.output + main.runtimeClasspath
-    }
+//neoForge.version = libs.versions.neo.get()
 
-    clientExtra {
-        compileClasspath += client.output + extra.compileClasspath
-        runtimeClasspath += client.output + client.runtimeClasspath + extra.runtimeClasspath
+sourceSets {
+    main {
+        resources {
+            srcDir 'src/generated/resources'
+        }
     }
+    buildtools
 }
 
 configurations {
@@ -80,9 +60,6 @@ configurations {
     clientRuntimeClasspath.extendsFrom clientLocalRuntime
     extraClientRuntimeClasspath.extendsFrom clientExtraLocalRuntime
 
-    renderNurseCfg {
-        canBeConsumed = false
-    }
 }
 
 afterEvaluate {
@@ -93,13 +70,6 @@ afterEvaluate {
         modClientExtraRuntimeOnly.canBeResolved = false
     }
 }
-obfuscation {
-    createRemappingConfiguration(configurations.localRuntime)
-    createRemappingConfiguration(configurations.clientLocalRuntime)
-
-    createRemappingConfiguration(configurations.extraLocalRuntime)
-    createRemappingConfiguration(configurations.clientExtraLocalRuntime)
-}
 
 apply from: "$rootDir/gradle/scripts/jars.gradle"
 apply from: "$rootDir/gradle/scripts/moddevgradle.gradle"
@@ -115,7 +85,3 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << "-Xlint:-removal"
     options.compilerArgs << "-Aquiet=true" // Suppress mixin notes
 }
-
-lombok {
-    version = "1.18.38"
-}

dependencies.gradle

@@ -1,41 +1,20 @@
 dependencies {
     compileOnly(libs.jetbrains.annotations)
 
-    // LDLib
-    //jarJar(modApi(forge.ldlib.get()))
-
-    // Registrate
-    //jarJar(modApi(forge.registrate.get()))
-
-    // Configuration
-    //jarJar(modApi(forge.configuration.get()))
-
-    // Mixin (& Extras)
-    annotationProcessor(variantOf(libs.mixin) { classifier("processor") })
-    compileOnly(annotationProcessor(forge.mixinExtras.common.get()))
-    jarJar(api(forge.mixinExtras.forge.get())).version {
-        require("[${forge.versions.mixinExtras.get()},)")
-    }
-
     // AE2
-    modApi(forge.ae2)
-    modCompileOnly(forge.ae2wtlib)
-
+    implementation(neoforge.ae2)
+    compileOnly(neoforge.ae2wtlib)
 
     // Standard runtime mods //
-    modLocalRuntime(forge.jade)
-    //modLocalRuntime(forge.ae2)
-    modLocalRuntime(forge.spark)
-    modLocalRuntime(forge.modernfix)
+    localRuntime(neoforge.jade)
+    localRuntime(neoforge.spark)
+    localRuntime(neoforge.modernfix)
 
-    // Runtime Recipe Viewers - uncomment whichever one you want to use //
-    modLocalRuntime(forge.emi)
-//    modLocalRuntime(forge.jei.forge.impl)
-//    modLocalRuntime(forge.bundles.rei.runtime)
+    // Runtime Recipe Viewers //
+    localRuntime(neoforge.emi)
 
     // Client-only runtime mods //
-    modClientLocalRuntime(forge.embeddium)
-    modClientLocalRuntime(forge.oculus)
-    renderNurseCfg(libs.renderNurse)
+    clientLocalRuntime(neoforge.embeddium)
+    //modClientLocalRuntime(forge.oculus)
 
 }

gradle/daemon-jvm.properties

@@ -0,0 +1,3 @@
+
+#This file is generated by updateDaemonJvm
+toolchainVersion=21

gradle/forge.versions.toml

@@ -1,124 +1,34 @@
 [versions]
-ldlib = "1.0.40.b"
-registrate = "MC1.20-1.3.11"
-configuration = "2.2.0"
 mixinExtras = "0.5.0-rc.3"
 
-jei = "15.20.0.105"
-rei = "12.1.785"
-emi = "1.1.13+1.20.1"
-ae2 = "15.0.18"
-kubejs = "2001.6.5-build.16"
-rhino = "2001.2.3-build.10"
-architectury = "9.2.14"
-clothconfig = "11.1.136"
+emi = "1.1.21+1.21.1"
+ae2 = "19.2.4"
 theoneprobe = "1.20.1-10.0.1-3"
-curios = "5.9.1+1.20.1"
-kotlinforforge = "4.11.0"
-shimmer = "1.20.1-0.2.4"
-journeyMapApi = "1.20-1.9-SNAPSHOT"
-ftblibrary = "2001.2.4"
-ftbteams = "2001.3.0"
-ftbquests = "2001.4.11"
-ftbchunks = "2001.3.4"
-ccTweaked = "1.114.3"
-create = "6.0.6-150"
-ponder = "1.0.80"
-flywheel = "1.0.4"
 
 ## modrinth maven ##
-jade = "11.6.3"
-embeddium = "0.3.31+mc1.20.1"
+jade = "15.10.3+neoforge"
+embeddium = "1.0.15+mc1.21.1"
 oculus = "1.20.1-1.8.0"
-modernfix = "DdUByV9S" # 5.24.1+mc1.20.1
+modernfix = "4SPHwiDB" # 5.24.3+mc1.21.1
 
 ## cursemaven ##
-worldStripper = "4578579"
-javd = "4803995"
-trenzalore = "4848244"
-xaerosWorldMap = "5658224"
-xaerosMinimap = "5773012"
-journeyMap = "5789363"
-resourcefullib = "5659871"
-argonauts = "5263580"
-heracles = "5406935"
-ae2wtlib = "5217955"
-spark = "4738952"
-observable = "5643037"
-gamestages = "15.0.2"
-bookshelf = "20.2.13"
-ftblibrary-cm = "5567591"
-ftbteams-cm = "5267190"
-ftbquests-cm = "6167056"
-ftbchunks-cm = "5956390"
+ae2wtlib = "6939030"
+spark = "6225208"
+
 
 
 [libraries]
-ldlib               = { module = "com.lowdragmc.ldlib:ldlib-forge-1.20.1", version.ref = "ldlib" }
-registrate          = { module = "com.tterrag.registrate:Registrate", version.ref = "registrate" }
-configuration       = { module = "dev.toma.configuration:configuration-forge-1.20.1", version.ref = "configuration" }
-mixinExtras-common  = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtras" }
-mixinExtras-forge   = { module = "io.github.llamalad7:mixinextras-forge", version.ref = "mixinExtras" }
 
-jei-common-api      = { module = "mezz.jei:jei-1.20.1-common-api", version.ref = "jei" }
-jei-forge-api       = { module = "mezz.jei:jei-1.20.1-forge-api", version.ref = "jei" }
-jei-forge-impl      = { module = "mezz.jei:jei-1.20.1-forge", version.ref = "jei" }
-rei-plugin          = { module = "me.shedaniel:RoughlyEnoughItems-default-plugin-forge", version.ref = "rei" }
-rei-api             = { module = "me.shedaniel:RoughlyEnoughItems-api-forge", version.ref = "rei" }
-rei-forge           = { module = "me.shedaniel:RoughlyEnoughItems-forge", version.ref = "rei" }
-emi                 = { module = "dev.emi:emi-forge", version.ref = "emi" }
+emi                 = { module = "dev.emi:emi-neoforge", version.ref = "emi" }
 
-ae2                 = { module = "appeng:appliedenergistics2-forge", version.ref = "ae2" }
-create              = { module = "com.simibubi.create:create-1.20.1", version.ref = "create"}
-ponder              = { module = "net.createmod.ponder:Ponder-Forge-1.20.1", version.ref = "ponder"}
-flywheel-forge-api  = { module = "dev.engine-room.flywheel:flywheel-forge-api-1.20.1", version.ref = "flywheel"}
-flywheel-forge      = { module = "dev.engine-room.flywheel:flywheel-forge-1.20.1", version.ref = "flywheel"}
-kubejs              = { module = "dev.latvian.mods:kubejs-forge", version.ref = "kubejs" }
-rhino               = { module = "dev.latvian.mods:rhino-forge", version.ref = "rhino" }
-architectury        = { module = "dev.architectury:architectury-forge", version.ref = "architectury" }
-clothconfig         = { module = "me.shedaniel.cloth:cloth-config-forge", version.ref = "clothconfig" }
+ae2                 = { module = "org.appliedenergistics:appliedenergistics2", version.ref = "ae2" }
 theoneprobe         = { module = "mcjty.theoneprobe:theoneprobe", version.ref = "theoneprobe" }
-curios              = { module = "top.theillusivec4.curios:curios-forge", version.ref = "curios" }
-kotlinforforge      = { module = "thedarkcolour:kotlinforforge", version.ref = "kotlinforforge" }
-journeymap-api      = { module = "info.journeymap:journeymap-api", version.ref = "journeyMapApi" }
-shimmer             = { module = "com.lowdragmc.shimmer:Shimmer-forge", version.ref = "shimmer" }
-ftblibrary          = { module = "dev.ftb.mods:ftb-library-forge", version.ref = "ftblibrary" }
-ftbteams            = { module = "dev.ftb.mods:ftb-teams-forge", version.ref = "ftbteams" }
-ftbquests           = { module = "dev.ftb.mods:ftb-quests-forge", version.ref = "ftbquests" }
-ftbchunks           = { module = "dev.ftb.mods:ftb-chunks-forge", version.ref = "ftbchunks" }
 jade                = { module = "maven.modrinth:jade", version.ref = "jade" }
 embeddium           = { module = "maven.modrinth:embeddium", version.ref = "embeddium" }
 oculus              = { module = "maven.modrinth:oculus", version.ref = "oculus" }
 modernfix           = { module = "maven.modrinth:modernfix", version.ref = "modernfix" }
 
-
-cc-tweaked-core-api   = { module = "cc.tweaked:cc-tweaked-1.20.1-core-api", version.ref = "ccTweaked" }
-cc-tweaked-forge-api  = { module = "cc.tweaked:cc-tweaked-1.20.1-forge-api", version.ref = "ccTweaked" }
-cc-tweaked-forge-impl = { module = "cc.tweaked:cc-tweaked-1.20.1-forge", version.ref = "ccTweaked" }
-
-worldstripper       = { module = "curse.maven:worldStripper-250603", version.ref = "worldStripper" }
-javd                = { module = "curse.maven:javd-370890", version.ref = "javd" }
-trenzalore          = { module = "curse.maven:trenzalore-870210", version.ref = "trenzalore" }
-xaerosworldmap      = { module = "curse.maven:xaeros-world-map-317780", version.ref = "xaerosWorldMap" }
-xaerosminimap       = { module = "curse.maven:xaeros-minimap-263420", version.ref = "xaerosMinimap" }
-journeymap-forge    = { module = "curse.maven:journeymap-32274", version.ref = "journeyMap" }
-resourcefullib      = { module = "curse.maven:resourceful-lib-570073", version.ref = "resourcefullib" }
-argonauts           = { module = "curse.maven:argonauts-845833", version.ref = "argonauts" }
-heracles            = { module = "curse.maven:heracles-845831", version.ref = "heracles" }
 ae2wtlib            = { module = "curse.maven:ae2wtlib-459929", version.ref = "ae2wtlib" }
 spark               = { module = "curse.maven:spark-361579", version.ref = "spark" }
-observable          = { module = "curse.maven:observable-509575", version.ref = "observable" }
-gamestages          = { module = "net.darkhax.gamestages:GameStages-Forge-1.20.1", version.ref = "gamestages" }
-bookshelf           = { module = "net.darkhax.bookshelf:Bookshelf-Forge-1.20.1", version.ref = "bookshelf" }
-## cursemaven as a backup ##
-ftblibrary-cm       = { module = "curse.maven:ftb-library-forge-404465", version.ref = "ftblibrary-cm" }
-ftbteams-cm         = { module = "curse.maven:ftb-teams-forge-404468", version.ref = "ftbteams-cm" }
-ftbquests-cm        = { module = "curse.maven:ftb-quests-forge-289412", version.ref = "ftbquests-cm" }
-ftbchunks-cm        = { module = "curse.maven:ftb-chunks-forge-314906", version.ref = "ftbchunks-cm" }
 
 [bundles]
-jei = ["jei-common-api", "jei-forge-api", "jei-forge-impl"]
-rei = ["rei-plugin", "rei-forge"]
-rei-runtime = ["rei-forge", "architectury", "clothconfig"]
-kjs = ["kubejs", "rhino", "architectury"]
-

gradle/libs.versions.toml

@@ -1,25 +1,9 @@
 [versions]
-minecraft = "1.20.1"
-forge = "47.3.0"
-minecraftForge = "1.20.1-47.3.0"
-parchment = "2023.09.03" # https://parchmentmc.org/docs/getting-started
-shadow = "8.3.5"
-spotless = "7.0.2"
-modDevGradle = "2.0.86"
-lombok = "8.14"
+minecraft = "1.21.1"
+neo = "21.1.169"
+parchment = "2024.11.17"
 jetbrains-annotations = "26.0.1"
-renderNurse = "0.0.12"
-mixin = "0.8.7"
 
 [libraries]
 minecraft               = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-minecraftForge          = { module = "net.minecraftforge:forge", version.ref = "minecraftForge" }
 jetbrains-annotations   = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
-renderNurse             = { module = "net.neoforged:render-nurse", version.ref = "renderNurse" }
-mixin                   = { module = "org.spongepowered:mixin", version.ref = "mixin" }
-
-[plugins]
-modDevGradle            = { id = "net.neoforged.moddev.legacyforge", version.ref = "modDevGradle" }
-shadow                  = { id = "com.gradleup.shadow", version.ref = "shadow" }
-spotless                = { id = "com.diffplug.spotless", version.ref = "spotless" }
-lombok                  = { id = "io.freefair.lombok", version.ref = "lombok" }

gradle/scripts/jars.gradle

@@ -4,15 +4,10 @@ tasks.register('slimJar', Jar) {
     from sourceSets.main.output
 }
 
-obfuscation {
-    reobfuscate(tasks.named('slimJar'), sourceSets.main) {
-        archiveClassifier = "slim"
-    }
-}
 
 // Add sources jar to components.java
 java {
-    artifacts.archives(reobfSlimJar)
+    artifacts.archives(slimJar)
     withSourcesJar()
 }
 
@@ -23,7 +18,7 @@ base {
 }
 
 afterEvaluate {
-    reobfJar.archiveClassifier = ""
+    jar.archiveClassifier = ""
     tasks.withType(org.gradle.jvm.tasks.Jar).configureEach {
         destinationDirectory = file('build/libs/')
         manifest.attributes([