Port to NeoForge 1.20.4

Author: PlatinPython

.gitignore

@@ -19,7 +19,5 @@ build
 
 # other
 eclipse
-run
-
-# Files from Forge MDK
-forge*changelog.txt
+runs
+libs

build.gradle

@@ -1,75 +1,48 @@
 plugins {
+    id 'java-library'
     id 'eclipse'
-    id 'maven-publish'
-    id 'net.neoforged.gradle' version '[6.0.18,6.2)'
-    id 'org.parchmentmc.librarian.forgegradle' version '1.+'
-    id 'org.spongepowered.mixin' version '0.7.+'
+    id 'idea'
+    id 'net.neoforged.gradle.userdev' version '7.0.96'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
 version = "${minecraft_version}-${mod_version}"
 group = 'platinpython.rgbblocks'
-archivesBaseName = 'RGB Blocks'
+base.archivesName = 'RGB Blocks'
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
-minecraft {
-    mappings channel: 'parchment', version: '2023.08.06-1.20.1'
 
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+minecraft.accessTransformers.entry 'public net.minecraft.world.entity.item.FallingBlockEntity blockState'
 
-    runs {
-        client {
-            workingDirectory project.file('run')
+runs {
+    configureEach {
+        systemProperty 'forge.logging.markers', 'REGISTRIES'
 
-            property 'forge.logging.markers', 'REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
 
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                rgbblocks {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                rgbblocks {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
+        modSource project.sourceSets.main
+    }
 
-            property 'forge.logging.console.level', 'debug'
+    client {
+        systemProperty 'forge.enabledGameTestNamespaces', 'rgbblocks'
+    }
 
-            args '--mod', 'rgbblocks', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+    server {
+        systemProperty 'forge.enabledGameTestNamespaces', 'rgbblocks'
+        programArgument '--nogui'
+    }
 
-            mods {
-                rgbblocks {
-                    source sourceSets.main
-                }
-            }
-        }
+    data {
+        programArguments.addAll '--mod', 'rgbblocks', '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    maven { // TOP
+    maven {
         url "https://www.cursemaven.com/"
         content {
             includeGroup "curse.maven"
@@ -78,12 +51,14 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.neoforged:forge:1.20.1-47.1.65'
+    implementation 'net.neoforged:neoforge:20.4.167'
 
-    compileOnly "org.jspecify:jspecify:0.3.0"
+    compileOnly 'org.jspecify:jspecify:0.3.0'
 
-    implementation fg.deobf("curse.maven:the-one-probe-245211:4629624")
-    implementation fg.deobf("curse.maven:framedblocks-441647:4657096")
+    compileOnly 'curse.maven:the-one-probe-245211:5082106'
+    if (rootProject.file('libs/FramedBlocks-10.0.0.1.jar').exists()) {
+        implementation files('libs/FramedBlocks-10.0.0.1.jar')
+    }
 }
 
 jar {
@@ -100,8 +75,6 @@ jar {
     }
 }
 
-jar.finalizedBy('reobfJar')
-
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }

gradle.properties

@@ -2,7 +2,11 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+org.gradle.debug=false
 
 #version info
-minecraft_version=1.20.1
-mod_version=1.1.8.0
+minecraft_version=1.20.4
+mod_version=1.1.8.0
+
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.02.25

settings.gradle

@@ -2,10 +2,9 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven { url = 'https://maven.neoforged.net/releases' }
-        maven { url = 'https://maven.parchmentmc.org' }
     }
 }
 
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
-}
+}