diff --git a/fabric/build.gradle b/fabric/build.gradle index 2f5dae4..b8f3746 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.4-SNAPSHOT' } base { archivesName = "${mod_name}-fabric-${minecraft_version}" diff --git a/gradle.properties b/gradle.properties index 984ae71..16a0fd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,27 +6,27 @@ version=1.0.0 group=com.example.examplemod # Common -minecraft_version=1.20.3 +minecraft_version=1.20.4 mod_name=ExampleMod mod_author=Jared mod_id=examplemod license=C0-1.0 credits= description=The description of your mod. \nAccepts multilines. -minecraft_version_range=[1.20.3, 1.21) +minecraft_version_range=[1.20.4, 1.21) # Fabric -fabric_version=0.91.1+1.20.3 +fabric_version=0.92.1+1.20.4 fabric_loader_version=0.15.3 # Forge -forge_version=49.0.2 +forge_version=49.0.19 forge_loader_version_range=[49,) forge_version_range=[49,) # NeoForge -neoforge_version=20.3.8-beta -neoforge_loader_version_range=[1,) +neoforge_version=20.4.83-beta +neoforge_loader_version_range=[2,) # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +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.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..1aa94a4 100755 --- a/gradlew +++ b/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,13 +80,11 @@ 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##*/} - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. 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=SC2039,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=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index f127cfd..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 2d8f233..96ab3ed 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.41' + id 'net.neoforged.gradle.userdev' version '7.0.81' id 'java-library' } base { diff --git a/neoforge/src/main/java/com/example/examplemod/ExampleMod.java b/neoforge/src/main/java/com/example/examplemod/ExampleMod.java index c243a4a..fb019fe 100644 --- a/neoforge/src/main/java/com/example/examplemod/ExampleMod.java +++ b/neoforge/src/main/java/com/example/examplemod/ExampleMod.java @@ -1,12 +1,13 @@ package com.example.examplemod; +import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; @Mod(Constants.MOD_ID) public class ExampleMod { - public ExampleMod() { + public ExampleMod(IEventBus eventBus) { // This method is invoked by the NeoForge mod loader when it is ready // to load your mod. You can access NeoForge and Common code in this diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index 75d35f2..4533573 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -18,13 +18,13 @@ config = "${mod_id}.mixins.json" config = "${mod_id}.neoforge.mixins.json" [[dependencies.${mod_id}]] #optional modId = "neoforge" #mandatory -mandatory = true #mandatory +type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") versionRange = "${neoforge_loader_version_range}" #mandatory ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' [[dependencies.${mod_id}]] modId = "minecraft" -mandatory = true +type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") versionRange = "${minecraft_version_range}" ordering = "NONE" side = "BOTH" diff --git a/settings.gradle b/settings.gradle index 76227cf..c300a3c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,7 +21,7 @@ pluginManagement { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } // This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606)