Port to 1.20.4

.github/ISSUE_TEMPLATE/BUG_REPORT.yaml

@@ -24,15 +24,15 @@ body:
     id: loader-info
     attributes:
       label: Loader version
-      placeholder: ex. Forge 36.2.0 / Fabric 0.14.12
+      placeholder: ex. NeoForge 20.4.100-beta / Forge 49.0.22 / Fabric 0.15.6
       description: Please be as specific as possible, latest is not a valid version
     validations:
       required: true
   - type: input
     id: minecraft-info
     attributes:
       label: Minecraft version
-      placeholder: ex. 1.16.5
+      placeholder: ex. 1.20.4
       description: Please be as specific as possible, latest is not a valid version
     validations:
       required: true

.github/workflows/build.yml

@@ -20,11 +20,20 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: ForgeArtifact
-          path: ./Forge/build/libs/*.jar
+          path: ./forge/build/libs/*.jar
+      - uses: actions/upload-artifact@v3
+        with:
+          name: NeoForgeArtifact
+          path: ./neoforge/build/libs/*.jar
+      - name: Publish to maven
+        if: contains(github.event.head_commit.message, '[push]') || contains(github.event.head_commit.message, '[build]')
+        env:
+          SAP_SECRET: ${{ secrets.SAP_SECRET }}
+        run: ./gradlew publish
       - uses: actions/upload-artifact@v3
         with:
           name: FabricArtifact
-          path: ./Fabric/build/libs/*.jar
+          path: ./fabric/build/libs/*.jar
       - name: Publish To Curseforge
         if: contains(github.event.head_commit.message, '[publish]') || contains(github.event.head_commit.message, '[curseforge]')
         env:
@@ -34,9 +43,4 @@ jobs:
         if: contains(github.event.head_commit.message, '[publish]') || contains(github.event.head_commit.message, '[modrinth]')
         env:
           MODRINTH_KEY: ${{ secrets.MODRINTH_KEY }}
-        run: ./gradlew modrinth
-      - name: Publish to maven
-        if: contains(github.event.head_commit.message, '[push]') || contains(github.event.head_commit.message, '[build]')
-        env:
-          SAP_SECRET: ${{ secrets.SAP_SECRET }}
-        run: ./gradlew publish
+        run: ./gradlew modrinth

.gitignore

@@ -21,3 +21,4 @@ build
 # other
 eclipse
 run
+runs

build.gradle

@@ -1,10 +1,8 @@
 plugins {
-    id 'fabric-loom' version '1.3-SNAPSHOT' apply(false)
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)' apply(false)
-    id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' apply(false)
-    id("org.spongepowered.mixin") version "0.7-SNAPSHOT" apply(false)
-    id("com.matthewprenger.cursegradle") version "1.4.0" apply(false)
-    id("com.modrinth.minotaur") version "2.+" apply(false)
+    // Required for NeoGradle
+    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
+    id "net.darkhax.curseforgegradle" version "1.1.17" apply(false)
+    id "com.modrinth.minotaur" version "2.+" apply(false)
 }
 
 subprojects {

common/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'idea'
     id 'java'
     id 'maven-publish'
-    id 'org.spongepowered.gradle.vanilla'
+    id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
 }
 
 base {

fabric/build.gradle

@@ -2,8 +2,8 @@ plugins {
     id 'java'
     id 'idea'
     id 'maven-publish'
-    id 'fabric-loom'
-    id 'com.matthewprenger.cursegradle'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
+    id 'net.darkhax.curseforgegradle'
     id 'com.modrinth.minotaur'
 }
 
@@ -82,26 +82,19 @@ publishing {
 }
 
 if (System.getenv().CURSEFORGE_KEY) {
-    curseforge {
-        apiKey = System.getenv().CURSEFORGE_KEY
-        project {
-            id = project.curseforge_id
-            releaseType = "beta"
-            addGameVersion "Fabric"
-            addGameVersion "${minecraft_version}"
-            addGameVersion "Java 17"
-            mainArtifact(remapJar)
-            changelog = file("$project.rootDir/changelog.md")
-            changelogType = 'markdown'
+    task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+        apiToken = System.getenv().CURSEFORGE_KEY
 
-            relations {
-                requiredDependency "jei"
-            }
-        }
+        def mainFile = upload(project.curseforge_id, remapJar)
+        mainFile.releaseType = 'beta'
+        mainFile.addGameVersion "Fabric"
+        mainFile.addGameVersion "${minecraft_version}"
+        mainFile.addGameVersion "Java 17"
 
-        options {
-            forgeGradleIntegration = false
-        }
+        mainFile.changelog = file("$project.rootDir/changelog.md")
+        mainFile.changelogType = 'markdown'
+
+        mainFile.addRequirement("jei")
     }
 }
 

fabric/src/main/resources/fabric.mod.json

@@ -24,11 +24,11 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.14",
-    "fabric": "*",
-    "minecraft": "~1.20.2",
+    "fabricloader": ">=0.15.3",
+    "minecraft": "~1.20.4",
     "java": ">=17",
-    "jei": ">=16.0.0.28"
+    "fabric-api": "*",
+    "jei": ">=17.0.0.29"
   }
 }
 

forge/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle'
-    id 'com.matthewprenger.cursegradle'
+    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.darkhax.curseforgegradle'
     id 'com.modrinth.minotaur'
 }
 
@@ -109,22 +109,19 @@ publishing {
 }
 
 if (System.getenv().CURSEFORGE_KEY) {
-    curseforge {
-        apiKey = System.getenv().CURSEFORGE_KEY
-        project {
-            id = project.curseforge_id
-            releaseType = "release"
-            addGameVersion "Forge"
-            addGameVersion "${minecraft_version}"
-            addGameVersion "Java 17"
-            mainArtifact(jar)
-            changelog = file("$project.rootDir/changelog.md")
-            changelogType = 'markdown'
-
-            relations {
-                requiredDependency "jei"
-            }
-        }
+    task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+        apiToken = System.getenv().CURSEFORGE_KEY
+
+        def mainFile = upload(project.curseforge_id, remapJar)
+        mainFile.releaseType = 'alpha'
+        mainFile.addGameVersion "Forge"
+        mainFile.addGameVersion "${minecraft_version}"
+        mainFile.addGameVersion "Java 17"
+
+        mainFile.changelog = file("$project.rootDir/changelog.md")
+        mainFile.changelogType = 'markdown'
+
+        mainFile.addRequirement("jei")
     }
 }
 
@@ -133,7 +130,7 @@ if (System.getenv().MODRINTH_KEY) {
     modrinth {
         token = System.getenv().MODRINTH_KEY
         projectId = project.modrinth_id
-        versionType = "release"
+        versionType = "alpha"
         versionName = "${mod_name} ${minecraft_version}"
         versionNumber = project.version
         uploadFile = jar

forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[48,)"
+loaderVersion="[49,)"
 issueTrackerURL="https://github.com/Mrbysco/JustEnoughProfessions/issues"
 license="MIT"
 
@@ -16,18 +16,18 @@ Adds info about professions to JEI
 [[dependencies.justenoughprofessions]]
 modId="jei"
 mandatory=true
-versionRange="[16.0.0.28,)"
+versionRange="[17.0.0.29,)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.justenoughprofessions]]
 modId="forge"
 mandatory=true
-versionRange="[48.0.1,)"
+versionRange="[49.0.1,)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.justenoughprofessions]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.20.2,1.21)"
+versionRange="[1.20.4,1.21)"
 ordering="NONE"
 side="BOTH"

gradle.properties

@@ -3,14 +3,17 @@ version=3.1.0
 group=com.mrbysco.justenoughprofessions
 
 # Common
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 
-# Forge
-forge_version=48.0.1
+# NeoForge
+neo_version=20.4.128-beta
 
 # Fabric
-fabric_version=0.89.2+1.20.2
-fabric_loader_version=0.14.22
+fabric_version=0.95.1+1.20.4
+fabric_loader_version=0.15.6
+
+# Forge
+forge_version=49.0.22
 
 # Mod options
 mod_name=JustEnoughProfessions
@@ -26,4 +29,4 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Dependencies
-jei_version=16.0.0.28
+jei_version=17.0.0.37

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists