Support NeoForge and 1.20.4 version

.github/workflows/build.yml

@@ -41,3 +41,8 @@ jobs:
       with:
         name: Forge
         path: forge/build/libs/
+    - name: Publish NeoForge
+      uses: actions/upload-artifact@v3
+      with:
+        name: Forge
+        path: neoforged/build/libs/

.github/workflows/publish.yml

@@ -57,14 +57,17 @@ jobs:
 
           loaders: |
             forge
-            neoforge
           modrinth-game-versions: |
+            1.20.4
+            1.20.3
             1.20.2
             1.20.1
             1.20
             1.19.4
             1.19.3
           curseforge-game-versions: |
+            1.20.4
+            1.20.3
             1.20.2
             1.20.1
             1.20
@@ -74,6 +77,47 @@ jobs:
             18
             17
 
+          retry-attempts: 2
+          retry-delay: 10000
+          fail-mode: fail
+      - name: Publish NeoForge to CurseForge and Modrinth
+        uses: Kir-Antipov/mc-publish@v3.2
+        with:
+          modrinth-id: 4sQDl6he
+          modrinth-featured: true
+          modrinth-unfeature-mode: intersection
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+          curseforge-id: 658780
+          curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
+
+          files-primary: neoforged/build/libs/!(*-@(dev|dev-shadow|sources|javadoc)).jar
+          files-secondary: neoforged/build/libs/*-@(dev|dev-shadow|sources|javadoc).jar
+
+          name: ""
+          version-type: release
+
+          modrinth-dependencies: |
+            jei | suggests
+            rei | suggests
+          curseforge-dependencies: |
+            jei | suggests
+            roughly-enough-items | suggests
+
+          loaders: |
+            neoforged
+          modrinth-game-versions: |
+            1.20.4
+            1.20.3
+            1.20.2
+          curseforge-game-versions: |
+            1.20.4
+            1.20.3
+            1.20.2
+          java: |
+            18
+            17
+
           retry-attempts: 2
           retry-delay: 10000
           fail-mode: fail
@@ -107,12 +151,16 @@ jobs:
             fabric
             quilt
           modrinth-game-versions: |
+            1.20.4
+            1.20.3
             1.20.2
             1.20.1
             1.20
             1.19.4
             1.19.3
           curseforge-game-versions: |
+            1.20.4
+            1.20.3
             1.20.2
             1.20.1
             1.20

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
 }
 
 architectury {
@@ -19,7 +19,7 @@ subprojects {
         // The following line declares the mojmap mappings, you may use other mappings as well
         mappings loom.officialMojangMappings()
         // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.19.2+build.3:v2"
+        // mappings "net.fabricmc:yarn:1.20.1+build.10:v2"
     }
 }
 
@@ -28,7 +28,10 @@ allprojects {
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    archivesBaseName = rootProject.archives_base_name + "-" + rootProject.minecraft_version
+    base {
+        archivesName = rootProject.archives_base_name
+    }
+
     version = rootProject.mod_version
     group = rootProject.maven_group
 

common/build.gradle

@@ -7,7 +7,6 @@ loom {
 }
 
 repositories {
-    maven { url "https://dvs1.progwml6.com/files/maven/" }
     maven { url "https://modmaven.dev" }
 }
 

fabric/build.gradle

@@ -15,14 +15,13 @@ loom {
 
 configurations {
     common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
 }
 
 repositories {
-    maven { url "https://dvs1.progwml6.com/files/maven/" }
     maven { url "https://modmaven.dev" }
 }
 
@@ -50,18 +49,13 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
 }
 
 sourcesJar {

forge/build.gradle

@@ -20,14 +20,13 @@ loom {
 
 configurations {
     common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
 }
 
 repositories {
-    maven { url "https://dvs1.progwml6.com/files/maven/" }
     maven { url "https://modmaven.dev" }
 }
 
@@ -55,17 +54,12 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
 }
 
 sourcesJar {

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

@@ -20,7 +20,7 @@ side = "BOTH"
 [[dependencies.colorize]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.3,1.21)"
+versionRange = "[1.19.3,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.colorize]]

gradle.properties

@@ -1,16 +1,20 @@
 org.gradle.jvmargs=-Xmx8G
 
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 enabled_platforms=fabric,forge
 
 archives_base_name=colorize
-mod_version=1.7.1
+mod_version=1.8.0
 maven_group=pl.panszelescik.colorize
 
-fabric_loader_version=0.14.22
-fabric_api_version=0.89.3+1.20.2
+//architectury_version=9.1.12
 
-forge_version=1.20.2-48.0.13
+fabric_loader_version=0.15.1
+fabric_api_version=0.91.1+1.20.4
+
+forge_version=1.20.4-49.0.3
+
+neoforge_version=20.4.3-beta
 
 jei_minecraft_version=1.20.2
 jei_version=16.0.0.28

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal