Port/1.21

.github/workflows/build.yml

@@ -35,11 +35,12 @@ jobs:
                   path: gradle.properties
                   properties: minecraft_version enabled_platforms archives_base_name
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v4
               with:
-                  java-version: 17
+                  java-version: 21
                   distribution: temurin
+                  cache: 'gradle'
 
             - name: Validate Gradle wrapper
               uses: gradle/actions/wrapper-validation@v3
@@ -55,21 +56,21 @@ jobs:
                       loom-cache
 
             - name: Build jar
-              run: ./gradlew build
+              run: ./gradlew :neoforge:build
 
             - name: Publish to GitHub Packages
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               if: env.GITHUB_TOKEN != ''
               continue-on-error: true
-              run: ./gradlew publishMavenJavaPublicationToGitHubPackagesRepository
+              run: ./gradlew :neoforge:publishMavenJavaPublicationToGitHubPackagesRepository
 
             - name: Publish to realRobotix Maven
               env:
                   MAVEN_USER: ${{ secrets.MAVEN_USER }}
                   MAVEN_ACCESS_TOKEN: ${{ secrets.MAVEN_ACCESS_TOKEN }}
               if: env.MAVEN_USER != '' && env.MAVEN_ACCESS_TOKEN != ''
-              run: ./gradlew publishMavenJavaPublicationToRealRobotixMavenRepository -PrealRobotixMavenUsername=${{ secrets.MAVEN_USER }} -PrealRobotixMavenPassword=${{ secrets.MAVEN_ACCESS_TOKEN }}
+              run: ./gradlew :neoforge:publishMavenJavaPublicationToRealRobotixMavenRepository -PrealRobotixMavenUsername=${{ secrets.MAVEN_USER }} -PrealRobotixMavenPassword=${{ secrets.MAVEN_ACCESS_TOKEN }}
 
             - name: Find jars
               id: find_jars
@@ -79,14 +80,15 @@ jobs:
                   find . -regextype posix-extended -regex "\.\/($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\/build\/libs\/${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}\+mc\.${{ steps.read_properties.outputs.minecraft_version }}-($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))-build\.${{ github.run_number }}\.jar" >> $GITHUB_OUTPUT
                   echo "$EOF" >> $GITHUB_OUTPUT
 
-#            - name: Send building message to discord
-#              env:
-#                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-#              if: env.DISCORD_WEBHOOK != ''
-#              uses: realRobotix/action-discord-notifier@master
-#              with:
-#                  webhook: ${{ secrets.DISCORD_WEBHOOK }}
-#                  message-title: Building mod from branch ${{ steps.get_branch.outputs.branch }}
+            - name: Send building message to discord
+              continue-on-error: true
+              env:
+                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+              if: env.DISCORD_WEBHOOK != ''
+              uses: realRobotix/action-discord-notifier@master
+              with:
+                  webhook: ${{ secrets.DISCORD_WEBHOOK }}
+                  message-title: Building mod from branch ${{ steps.get_branch.outputs.branch }}
 
             - name: Send built file to discord
               env:

.github/workflows/pull_request.yml

@@ -30,11 +30,12 @@ jobs:
                   path: gradle.properties
                   properties: minecraft_version enabled_platforms archives_base_name
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v4
               with:
-                  java-version: 17
+                  java-version: 21
                   distribution: temurin
+                  cache: 'gradle'
 
             - name: Validate Gradle wrapper
               uses: gradle/actions/wrapper-validation@v3
@@ -48,7 +49,7 @@ jobs:
                   cache-read-only: true
 
             - name: Build jar
-              run: ./gradlew build
+              run: ./gradlew :neoforge:build
 
             - name: Find jars
               id: find_jars

.github/workflows/release.yml

@@ -35,11 +35,12 @@ jobs:
                   path: gradle.properties
                   properties: minecraft_version enabled_platforms archives_base_name
 
-            - name: Set up JDK 17
+            - name: Set up JDK 21
               uses: actions/setup-java@v4
               with:
-                  java-version: 17
+                  java-version: 21
                   distribution: temurin
+                  cache: 'gradle'
 
             - name: Validate Gradle wrapper
               uses: gradle/actions/wrapper-validation@v3
@@ -57,31 +58,31 @@ jobs:
             - name: Build jar
               env:
                   RELEASE: true
-              run: ./gradlew build
+              run: ./gradlew :neoforge:build
 
             - name: Publish to GitHub Packages
               env:
                   RELEASE: true
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               if: env.GITHUB_TOKEN != ''
               continue-on-error: true
-              run: ./gradlew publishMavenJavaPublicationToGitHubPackagesRepository
+              run: ./gradlew :neoforge:publishMavenJavaPublicationToGitHubPackagesRepository
 
             - name: Publish to realRobotix Maven
               env:
                   RELEASE: true
                   MAVEN_USER: ${{ secrets.MAVEN_USER }}
                   MAVEN_ACCESS_TOKEN: ${{ secrets.MAVEN_ACCESS_TOKEN }}
               if: env.MAVEN_USER != '' && env.MAVEN_ACCESS_TOKEN != ''
-              run: ./gradlew publishMavenJavaPublicationToRealRobotixMavenRepository -PrealRobotixMavenUsername=${{ secrets.MAVEN_USER }} -PrealRobotixMavenPassword=${{ secrets.MAVEN_ACCESS_TOKEN }}
+              run: ./gradlew :neoforge:publishMavenJavaPublicationToRealRobotixMavenRepository -PrealRobotixMavenUsername=${{ secrets.MAVEN_USER }} -PrealRobotixMavenPassword=${{ secrets.MAVEN_ACCESS_TOKEN }}
 
             - name: Publish to Modrinth and CurseForge
               env:
                 RELEASE: true
                 MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
                 CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
               if: env.MODRINTH_TOKEN != '' && env.CURSEFORGE_TOKEN != ''
-              run: ./gradlew publishMods -PMODRINTH_TOKEN=${{ secrets.MODRINTH_TOKEN }} -PCURSEFORGE_TOKEN=${{ secrets.CURSEFORGE_TOKEN }}
+              run: ./gradlew :neoforge:publishMods -PMODRINTH_TOKEN=${{ secrets.MODRINTH_TOKEN }} -PCURSEFORGE_TOKEN=${{ secrets.CURSEFORGE_TOKEN }}
 
             - name: Find jars
               id: find_jars
@@ -91,14 +92,15 @@ jobs:
                   find . -regextype posix-extended -regex "\.\/($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\/build\/libs\/${{ steps.read_properties.outputs.archives_base_name }}-${{ steps.get_mod_version.outputs.version }}\+mc\.${{ steps.read_properties.outputs.minecraft_version }}-($(tr "," "|" <<< ${{ steps.read_properties.outputs.enabled_platforms }}))\.jar" >> $GITHUB_OUTPUT
                   echo "$EOF" >> $GITHUB_OUTPUT
 
-#            - name: Send building message to discord
-#              env:
-#                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-#              if: env.DISCORD_WEBHOOK != ''
-#              uses: realRobotix/action-discord-notifier@master
-#              with:
-#                  webhook: ${{ secrets.DISCORD_WEBHOOK }}
-#                  message-title: Building mod from branch ${{ steps.get_branch.outputs.branch }}
+            - name: Send building message to discord
+              continue-on-error: true
+              env:
+                  DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+              if: env.DISCORD_WEBHOOK != ''
+              uses: realRobotix/action-discord-notifier@master
+              with:
+                  webhook: ${{ secrets.DISCORD_WEBHOOK }}
+                  message-title: Building mod from branch ${{ steps.get_branch.outputs.branch }}
 
             - name: Send built file to discord
               env:

.gitignore

@@ -27,4 +27,6 @@ run-data
 # Files from Forge MDK
 forge*changelog.txt
 
-secrets.properties
+secrets.properties
+/neoforge/lib/RenderDoc_1.37_64/
+/neoforge/lib/RenderDoc_1.37_64/**

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "architectury-plugin" version "3.4.+"
     id "dev.architectury.loom" version "1.7.+" apply false
 }
 
@@ -37,6 +37,7 @@ subprojects {
             officialMojangMappings()
             parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
         }
+        compileOnly 'com.google.code.findbugs:jsr305:3.0.2' // for nullability annotations
     }
 
     publishing {
@@ -74,12 +75,18 @@ allprojects {
     String buildNumber = System.getenv("GITHUB_RUN_NUMBER")
     version = "${getGitTag()}+mc.${minecraft_version}-${project.name}${nightly ? "-build.${buildNumber}" : ""}"
     group = rootProject.maven_group
+    ext.ci = ci
 
     repositories {
+        maven { url "https://maven.neoforged.net/releases/" }
         maven {
             name = 'ParchmentMC'
             url = 'https://maven.parchmentmc.org'
         }
+        maven {
+            name = 'createmod maven'
+            url = 'https://maven.createmod.net/'
+        }
         maven {
             name = 'tterrag maven'
             url = 'https://maven.tterrag.com/'
@@ -99,6 +106,11 @@ allprojects {
             name = "ModMaven"
             url = "https://modmaven.dev"
         }
+        maven {
+            //Location of EMI
+            name = "TerraformersMC"
+            url = "https://maven.terraformersmc.com/"
+        }
         maven {
             url = "https://cursemaven.com"
         }
@@ -125,6 +137,7 @@ allprojects {
             url = "https://jitpack.io/"
             content { includeGroupAndSubgroups("com.github") }
         }
+        maven { url "https://maven.neoforged.net/releases/" }
         exclusiveContent {
             forRepository {
                 maven {
@@ -141,7 +154,7 @@ allprojects {
         }
     }
 
-    configurations{
+    configurations {
         findAndDelete
     }
 
@@ -157,7 +170,7 @@ allprojects {
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
-        options.release.set(17)
+        options.release.set(21)
     }
 
     jar {
@@ -173,21 +186,28 @@ allprojects {
 
         // set up properties for filling into metadata
         var replaceProperties = [
-                version              : version.replace("forge.", "").replace("fabric.", ""),
-                minecraft_version    : minecraft_version,
-                fabric_api_version   : fabric_api_version,
-                fabric_loader_version: fabric_loader_version,
-                create_forge_range   : create_forge_range,
-                create_fabric_range  : create_fabric_range,
-                mod_license          : mod_license,
-                mod_authors          : mod_authors,
-                mod_name             : mod_name,
-                mod_description      : mod_description
+                version                      : version.replace("neoforge.", "").replace("fabric.", ""),
+                minecraft_version            : minecraft_version,
+                minecraft_version_range      : minecraft_version_range,
+                fabric_api_version           : fabric_api_version,
+                fabric_loader_version        : fabric_loader_version,
+                neoforge_version_range       : neoforge_version_range,
+                neoforge_loader_version_range: neoforge_loader_version_range,
+                create_neoforge_range        : create_neoforge_range,
+                create_fabric_range          : create_fabric_range,
+                archives_base_name           : archives_base_name,
+                mod_license                  : mod_license,
+                mod_authors                  : mod_authors,
+                mod_name                     : mod_name,
+                mod_description              : mod_description,
+                mod_credits                  : mod_credits,
+                mod_url                      : mod_url,
+                mod_issues                   : mod_issues
         ]
 
         inputs.properties replaceProperties
 
-        filesMatching(["fabric.mod.json", "META-INF/mods.toml"]) {
+        filesMatching(["fabric.mod.json", "META-INF/neoforge.mods.toml"]) {
             expand replaceProperties + [project: project]
         }
     }

common/build.gradle

@@ -2,25 +2,36 @@ architectury {
     common(enabled_platforms.split(","))
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/copycats.accesswidener")
+}
+
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
+    neoForge "net.neoforged:neoforge:${neoforge_version}"
 
     // Compile against Create Fabric in common
     // beware of differences across platforms!
     // dependencies must also be pulled in to minimize problems, from remapping issues to compile errors.
     // All dependencies except Flywheel and Registrate are NOT safe to use!
     // Flywheel and Registrate must also be used carefully due to differences.
-    modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}")
+    //TODO: Change to fabric when its out
+    modCompileOnly("com.simibubi.create:create-${minecraft_version}:${create_neoforge_version}:slim") { transitive = false }
+    modCompileOnly("com.tterrag.registrate:Registrate:${registrate_neoforge_version}")
+    modImplementation("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_neoforge_version}")
+    compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_neoforge_version}")
+    modImplementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
+
     // required for proper remapping and compiling
     modCompileOnly("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
     modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_common_version}")
+    modCompileOnly("dev.emi:emi-xplat-mojmap:${emi_common_version}+${minecraft_version}")
 
-    modCompileOnly("curse.maven:additional-placements-fabric-930469:${additionalplacements_fabric_curse_id}")
-    modCompileOnly("curse.maven:embeddium-908741:${embeddium_curse_id}")
-    modCompileOnly("curse.maven:selene-499980:${moonlight_curse_fabric_id}")
-    modCompileOnly("curse.maven:vertical-slabs-compat-724387:${vertical_slabs_curse_fabric_id}")
+    modImplementation("curse.maven:additional-placements-674852:${additionalplacements_neoforge_curse_id}")
+    modImplementation("curse.maven:sodium-394468:${sodium_neoforge_curse_id}")
+    modCompileOnly("curse.maven:selene-499980:${moonlight_curse_neoforge_id}")
+    modCompileOnly("curse.maven:vertical-slabs-compat-724387:${vertical_slabs_curse_neoforge_id}")
 
     //Used for all diagonal mods as they all shadow a common library we can mixin
     modCompileOnly("fuzs.diagonalblocks:diagonalblocks-common:${diagonal_mods_version}")

common/gradle.properties

@@ -0,0 +1 @@
+loom.platform = neoforge