Port to 1.21.8

Author: Edivad99

build.gradle

@@ -5,8 +5,8 @@ plugins {
     id 'java-library'
     id 'eclipse'
     id 'idea'
-    id 'net.neoforged.gradle.userdev' version "$neo_gradle_version"
-    id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '3.0.6'
+    id 'net.neoforged.moddev' version "$mod_dev_gradle"
+    id 'se.bjurr.gitchangelog.git-changelog-gradle-plugin' version '3.0.7'
     id 'me.modmuss50.mod-publish-plugin' version '0.8.4'
     id 'com.diffplug.spotless' version '6.25.0'
 }
@@ -36,33 +36,59 @@ println("JVM: ${System.getProperty('java.vm.version')} (${System.getProperty('ja
 println("Arch: ${System.getProperty('os.arch')}")
 println(repeat('*', 60))
 
-minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
+sourceSets.main.resources {
+    srcDir 'src/generated/resources'
+    exclude '.cache'
+}
 
-runs {
-    configureEach {
-        systemProperty 'forge.logging.console.level', 'debug'
+neoForge {
+    version = project.neo_version
 
-        modSource project.sourceSets.main
-        if (System.getProperty('idea.active')) {
-            jvmArguments.add("-XX:+AllowEnhancedClassRedefinition")
-        }
+    parchment {
+        mappingsVersion = project.parchment_mappings_version
+        minecraftVersion = project.parchment_minecraft_version
     }
 
-    client {
-    }
+    validateAccessTransformers = true
+
+    runs {
+        configureEach {
+            logLevel = org.slf4j.event.Level.DEBUG
+
+            systemProperty 'neoforge.enabledGameTestNamespaces', 'solargeneration'
 
-    server {
-        arguments '--nogui'
+            if (System.getProperty('idea.active')) {
+                jvmArguments.add("-XX:+AllowEnhancedClassRedefinition")
+            }
+        }
+
+        client {
+            client()
+            gameDirectory = project.file('runs/client')
+        }
+
+        server {
+            server()
+            gameDirectory = project.file('runs/server')
+            programArgument '--nogui'
+        }
+
+        clientData {
+            clientData()
+            gameDirectory = project.file('runs/data')
+            programArguments.addAll '--mod', 'solargeneration', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+        }
     }
 
-    clientData {
-        arguments.addAll '--mod', 'solargeneration', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+    mods {
+        solargeneration {
+            sourceSet(sourceSets.main)
+        }
     }
 }
 
-sourceSets.main.resources {
-    srcDir 'src/generated/resources'
-    exclude '.cache'
+configurations {
+    runtimeClasspath.extendsFrom localRuntime
 }
 
 repositories {
@@ -79,13 +105,7 @@ repositories {
     }
 }
 
-configurations {
-    runtimeClasspath.extendsFrom localRuntime
-}
-
 dependencies {
-    implementation "net.neoforged:neoforge:$neo_version"
-
     //implementation "edivad:EdivadLib-$minecraft_version:3.0.0-snapshot"
     implementation "curse.maven:edivadlib-638508:$edivadlib_id"
 
@@ -133,6 +153,16 @@ tasks.withType(ProcessResources).configureEach {
     }
 }
 
+def lastCommit = providers.exec {
+    commandLine 'git', 'rev-parse', 'HEAD'
+}.standardOutput.asText.get().trim()
+
+def penultimateTag = () -> {
+    providers.exec {
+        commandLine 'git', 'describe', '--abbrev=0', '--tags', 'HEAD~'
+    }.standardOutput.asText.get().trim()
+}
+
 tasks.named('jar', Jar).configure {
     manifest {
         attributes([
@@ -142,18 +172,11 @@ tasks.named('jar', Jar).configure {
             'Implementation-Title'    : 'solargeneration',
             'Implementation-Version'  : project.version,
             'Implementation-Vendor'   : 'Edivad99',
-            'Implementation-Commit'   : 'git rev-parse HEAD'.execute().text.trim(),
+            'Implementation-Commit'   : lastCommit,
         ])
     }
 }
 
-def penultimateTag = {
-    def gitVersionProvider = providers.exec {
-        commandLine 'git', 'describe', '--abbrev=0', '--tags', 'HEAD~'
-    }
-    gitVersionProvider.standardOutput.asText.get().trim()
-}
-
 tasks.register('makeChangelog', GitChangelogTask) {
     fromRepo.set(projectDir.absolutePath.toString())
     fromRevision.set(penultimateTag())

gradle.properties

@@ -1,26 +1,27 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx1G
-org.gradle.daemon=false
-org.gradle.debug=false
-org.gradle.caching=true # -30~ seconds trimmed from gradle --scan opt
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 ## Environment Properties
-minecraft_version=1.21.5
-minecraft_version_range=[1.21.5,1.22)
-neo_version=21.5.75
-neo_version_range=[21.5.0,)
+minecraft_version=1.21.8
+minecraft_version_range=[1.21.8,1.22)
+neo_version=21.8.36
+neo_version_range=[21.8.36,)
 loader_version_range=[4,)
-neo_gradle_version=7.0.185
+mod_dev_gradle=2.0.107
 
 ## Parchment
-neogradle.subsystems.parchment.minecraftVersion=1.21.5
-neogradle.subsystems.parchment.mappingsVersion=2025.06.01
+parchment_minecraft_version=1.21.8
+parchment_mappings_version=2025.07.20
 
 ## Mod Properties
-mod_version=7.1.0
-edivadlib_id=6617587
-edivadlib_version_range=[3.1.0,)
+mod_version=7.2.0
+edivadlib_id=6914263
+edivadlib_version_range=[3.2.0,)
 
 # Dependencies
-jei_version=21.3.1.19
+jei_version=24.0.0.2

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -9,5 +9,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }

gradlew

@@ -1,4 +1,4 @@
-// 1.21.5	2025-06-05T15:25:51.4255	SolarGenerationRecipeProvider
+// 1.21.8	2025-08-22T10:38:55.471692	SolarGenerationRecipeProvider
 fb38eaaa9d622daa21debcb904756fdee98ce512 data/solargeneration/advancement/recipes/misc/lapis_lazuli_from_shard.json
 dab815e12fcd22167551d7e1cea9a4986f522d22 data/solargeneration/advancement/recipes/misc/lapis_shard.json
 5a66e81ebd0bd75742109e3fd28124cd151e77cc data/solargeneration/advancement/recipes/misc/photovoltaic_cell.json

gradlew.bat

@@ -1,4 +1,4 @@
-// 1.21.5	2025-06-05T15:25:51.426793	Model Definitions - solargeneration
+// 1.21.8	2025-08-22T10:38:55.473174	Model Definitions - solargeneration
 a433862a0059c81b1daef831a2b4adc3782fa6b0 assets/solargeneration/blockstates/solar_panel_advanced.json
 df887b0bb12d5bfdf156ee379a37896db5a54a7d assets/solargeneration/blockstates/solar_panel_hardened.json
 6a38a4ca2371479176159c879799b4e54a30b76b assets/solargeneration/blockstates/solar_panel_leadstone.json

settings.gradle

@@ -1,3 +1,3 @@
-// 1.21.5	2025-06-05T15:25:51.422629	Tags for minecraft:block mod id solargeneration
+// 1.21.8	2025-08-22T10:38:55.469022	Tags for minecraft:block mod id solargeneration
 2dcef60eaa3e33869208df16d9dcc6f45402d239 data/minecraft/tags/block/mineable/pickaxe.json
 2dcef60eaa3e33869208df16d9dcc6f45402d239 data/minecraft/tags/block/needs_iron_tool.json