Updated to NeoForge 1.20.4

Author: Hexeption

.github/workflows/main.yml

@@ -3,18 +3,21 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: azul/zulu-openjdk-alpine:17-latest
     steps:
-      - uses: actions/[email protected]
-      - uses: gradle/[email protected]
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
       - run: chmod +x ./gradlew
-      - run: ./gradlew clean build publish curseforge modrinth
+      - run: ./gradlew clean build publishCurseForge modrinth
         env:
           REPO_PASSWORD: ${{ secrets.REPO_PASSWORD }}
           CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
           MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }}
-      - uses: actions/upload-artifact@v2.2.2
+      - uses: actions/upload-artifact@v4
         with:
           name: Builds
           path: build/libs/*.jar

.gitignore

@@ -116,3 +116,5 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+
+runs/

build.gradle

@@ -1,87 +1,23 @@
-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        maven { url = 'https://repo.spongepowered.org/maven' }
-        maven { url "https://plugins.gradle.org/m2/" }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
-        classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
-        classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
-        classpath group: 'com.modrinth.minotaur', name: 'Minotaur', version: '2+'
-    }
+plugins {
+    id 'java-library'
+    id 'eclipse'
+    id 'idea'
+    id 'maven-publish'
+    id 'net.neoforged.gradle.userdev' version '7.0.142'
+    id 'net.darkhax.curseforgegradle' version '1.1.15'
+    id "com.modrinth.minotaur" version "2.+"
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.spongepowered.mixin'
-apply plugin: "com.matthewprenger.cursegradle"
-apply plugin: 'maven-publish'
-apply plugin: 'com.modrinth.minotaur'
-
-version = "1.20.1-1.0"
 def env = System.getenv()
 if (env.GITHUB_RUN_NUMBER) {
-    version = version + "+" + "${env.GITHUB_RUN_NUMBER}"
+    mod_version = 'neoforge-1.20.4-1.0.0' + "+" + "${env.GITHUB_RUN_NUMBER}"
 }
 
-group = 'uk.co.hexeption'
-archivesBaseName = 'RSInfinityBooster'
-
-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: 'official', version: '1.20.1'
-
-    runs {
-        client {
-            workingDirectory project.file('run/client')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-            arg "-mixin.config=rsinfinitybooster.mixins.json"
-
-            mods {
-                rsinfinitybooster {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run/server')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-            arg "-mixin.config=rsinfinitybooster.mixins.json"
-
-            mods {
-                rsinfinitybooster {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run/data')
-            // property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-            args '--mod', 'rsinfinitybooster', '--all',
-                    '--existing', file('src/main/resources').toString(),
-                    '--existing', file('src/generated/resources').toString(),
-                    '--output', file('src/generated/resources/')
-
-            mods {
-                rsinfinitybooster {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
-
-sourceSets.main.resources { srcDir 'src/generated/resources' }
+version = mod_version
+group = mod_group_id
 
 repositories {
+    mavenLocal()
     maven {
         url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage")
         /* As of december 2021, GitHub packages requires authentication.
@@ -115,111 +51,112 @@ repositories {
     }
 }
 
-dependencies {
-    minecraft 'net.minecraftforge:forge:1.20.1-47.0.3'
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    compileOnly "com.refinedmods:refinedstorage:1.12.3"
-    runtimeOnly fg.deobf("com.refinedmods:refinedstorage:1.12.3") {
-        transitive false
-    }
-    runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.0.0.12")
+base {
+    archivesName = mod_id
 }
 
+// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21.
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+
+runs {
+    configureEach {
+        systemProperty 'forge.logging.markers', 'REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
+
+        modSource project.sourceSets.main
+    }
+
+    client {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
+
+    server {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        programArgument '--nogui'
+    }
+
+    gameTestServer {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-jar {
-    manifest {
-        attributes([
-                "Specification-Title"     : "rsinfinitybooster",
-                //"Specification-Vendor": "rsinfinitybooster authors",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.version,
-                //"Implementation-Vendor": "rsinfinitybooster authors",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
-                "MixinConfigs"            : "rsinfinitybooster.mixins.json"
-        ])
+    data {
+        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
-jar.finalizedBy('reobfJar')
+sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-mixin {
-    add sourceSets.main, "rsinfinitybooster.refmap.json"
+configurations {
+    runtimeClasspath.extendsFrom localRuntime
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
+dependencies {
+    implementation "net.neoforged:neoforge:${neo_version}"
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    runtimeOnly "mezz.jei:jei-1.20.6-neoforge:18.0.0.62"
+    compileOnly "com.refinedmods:refinedstorage:1.13.0-beta.4"
+    runtimeOnly "com.refinedmods:refinedstorage:1.13.0-beta.4"
 }
 
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    archiveClassifier = 'deobf'
+tasks.withType(ProcessResources).configureEach {
+    var replaceProperties = [
+            minecraft_version      : minecraft_version,
+            minecraft_version_range: minecraft_version_range,
+            neo_version            : neo_version,
+            neo_version_range      : neo_version_range,
+            loader_version_range   : loader_version_range,
+            mod_id                 : mod_id,
+            mod_name               : mod_name,
+            mod_license            : mod_license,
+            mod_version            : mod_version,
+            mod_authors            : mod_authors,
+            mod_description        : mod_description
+    ]
+    inputs.properties replaceProperties
+
+    filesMatching(['META-INF/mods.toml']) {
+        expand replaceProperties
+    }
 }
 
-artifacts {
-    archives jar
-    archives sourcesJar
-    archives deobfJar
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
 }
 
-curseforge {
-    if (env.CURSE_API_KEY) {
-        apiKey = env.CURSE_API_KEY
-    }
-    project {
-        id = '446870'
-        changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
-        releaseType = 'release'
-        addGameVersion '1.20.1'
-
-        mainArtifact(jar) {
-            displayName = "RSInfinityBooster v$version"
-        }
-        relations {
-            requiredDependency 'refined-storage'
-        }
+// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
     }
 }
 
-// configure the maven publication
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-            artifact sourcesJar
-            artifact deobfJar
-        }
-    }
+task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+
+    apiToken = env.CURSE_API_KEY
+
+    // The main file to upload
+    def mainFile = upload(446870, jar)
+    mainFile.releaseType = 'release'
+    mainFile.changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
+    mainFile.changelogType = 'markdown'
+    mainFile.gameVersions = ['1.20.4']
+    mainFile.addModLoader("neoforge")
+    mainFile.displayName = "RSInfinityBooster ${version}"
+
 
-    // select the repositories you want to publish to
-    repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
-        if (env.REPO_PASSWORD) {
-            maven {
-                url = "https://nexus.hexeption.dev/repository/hex-mods/"
-                credentials {
-                    username = "admin"
-                    password = env.REPO_PASSWORD
-                }
-            }
-        }
-    }
 }
 
 modrinth {
-    if (env.MODRINTH_API_KEY) {
-        token = env.MODRINTH_API_KEY
-    }
+    token = env.MODRINTH_API_KEY
     projectId = 'Sjzdj2cy'
-    versionName = "RSInfinityBooster v$version"
+    versionName = "RSInfinityBooster $version"
     changelog = 'A changelog can be found at https://github.com/Hexeption/RSInfinityBooster'
-    versionNumber = "$version"
     uploadFile = jar
-    gameVersions = ["1.20.1"]
-    loaders = ["forge"]
+    gameVersions = ["1.20.4"]
+    loaders = ["neoforge"]
     dependencies {
-        required.version "refined-storage", "1.12.3"
+        required.version "refined-storage", "1.13.0-beta.4"
     }
-}
+}

gradle.properties

@@ -1,2 +1,22 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+
+neogradle.subsystems.parchment.minecraftVersion=1.20.4
+neogradle.subsystems.parchment.mappingsVersion=2024.02.25
+
+minecraft_version=1.20.4
+minecraft_version_range=[1.20.4,1.20.5)
+
+neo_version=20.4.214
+neo_version_range=[20.4,)
+
+loader_version_range=[2,)
+
+## Mod Properties
+mod_id=rsinfinitybooster
+mod_name=RSInfinityBooster
+mod_license=GNU Lesser General Public License
+mod_version=1.0.0
+mod_group_id=uk.co.hexeption.rsinfinitybooster
+mod_authors=Hexeption
+mod_description=Adds Infinite Range Card and Dimension Card to Refine Storage

gradle/wrapper/gradle-wrapper.jar

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