Changed Forge to NeoForge 1.20.1-47.1.54 (compatible with Forge 47.1.0)

- updated Gradle
cech12 · Aug 9, 2023 · b8ea259 · b8ea259
1 parent 7963fde
commit b8ea259
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 15 deletions.
diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml
@@ -44,6 +44,9 @@ jobs:
       game-versions: |
         1.20.1
       release-type: release
+      loaders: |
+        neoforge
+        forge
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
       curseforge-token: ${{ secrets.CURSEFORGE_API_KEY }}
@@ -58,6 +61,9 @@ jobs:
       game-versions: |
         1.20.1
       release-type: release
+      loaders: |
+        neoforge
+        forge
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
       modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
+## [1.20.1-4.1.0.0] - 2023-08-09
+### Changed
+- Changed Forge to NeoForge 1.20.1-47.1.54 (compatible with Forge 47.1.0)
+- Updated BucketLib mod to 1.20.1-2.3.0.0
+
 ## [1.20.1-4.0.0.0] - 2023-06-14
 ### Changed
 - Update to Forge 1.20.1-47.0.1 #69

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'net.neoforged.gradle' version '[6.0,6.2)'
 }
 
 version = "${minecraft_version}-${mod_version}"
@@ -104,7 +104,7 @@ repositories {
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+    minecraft "net.neoforged:forge:${project.minecraft_version}-${project.forge_version}"
 
     // compile against the BucketLib API but do not include it at runtime
     compileOnly fg.deobf("com.github.cech12:BucketLib:${project.bucketlib_version}:api")

diff --git a/gradle.properties b/gradle.properties
@@ -6,13 +6,13 @@ org.gradle.daemon=false
 ## Environment Properties
 minecraft_version=1.20.1
 minecraft_version_range=[1.20.1,1.21)
-forge_version=47.0.1
-forge_version_range=[47.0.1,)
+forge_version=47.1.54
+forge_version_range=[47.1.0,)
 loader_version_range=[47,)
 
 ## Mod Properties
 mod_id=ceramicbucket
-mod_version=4.0.0.0
+mod_version=4.1.0.0
 mod_group_id=cech12.ceramicbucket
 mod_name=Ceramic Bucket
 mod_authors=Cech12
@@ -22,5 +22,5 @@ mod_issue_tracker=https://github.com/cech12/CeramicBucket/issues
 mod_description=A mod which adds a Ceramic Bucket.
 
 #Bucket Lib
-bucketlib_version=1.20.1-2.1.0.0
-bucketlib_version_range=[1.20.1-2.1.0.0,)
+bucketlib_version=1.20.1-2.3.0.0
+bucketlib_version_range=[1.20.1-2.3.0.0,)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,15 +141,15 @@ 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 
+        # 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 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

diff --git a/settings.gradle b/settings.gradle
@@ -2,8 +2,8 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
+            name = 'NeoForge'
+            url = 'https://maven.neoforged.net'
         }
     }
 }