diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4ad77..cdc7898 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Add `ClientPlayLifecycleEvents`. +Update to 1.21.4 diff --git a/build.gradle b/build.gradle index 04b40d3..7defb21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false id "com.github.breadmoirai.github-release" version "2.4.1" id "maven-publish" } diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java index 866fb92..97fd5f1 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java @@ -49,7 +49,7 @@ private SelectionListEntry getHoveredEntry(int mouseX, int mouseY) { } @Override - protected int getScrollbarPosition() { + protected int scrollBarX() { return this.width - 7; } diff --git a/fabric/build.gradle b/fabric/build.gradle index f7cef2a..152eb11 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -95,17 +95,18 @@ publishing { } processResources { + def substitutions = [ + "version" : project.version, + "minecraft_version" : project.minimum_minecraft_version, + "fabric_api_version" : project.minimum_fabric_api_version, + "architectury_version": project.minimum_architectury_api_version + ] + filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minimum_minecraft_version, - "fabric_api_version": libs.versions.fabric.api.get(), - "architectury_version": libs.versions.architectury.get() + expand substitutions } - inputs.property "version", project.version - inputs.property "minecraft_version", project.minimum_minecraft_version - inputs.property "fabric_api_version", libs.versions.fabric.api.get() - inputs.property "architectury_version", libs.versions.architectury.get() + substitutions.each { inputs.property it.key, it.value } } shadowJar { diff --git a/gradle.properties b/gradle.properties index e21f8d1..862c8ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,14 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.2.1+1.21.3 -minecraft_version=1.21.3 -additional_minecraft_versions=1.21.2 -minimum_minecraft_version=1.21.2 +version=1.2.2+1.21.4 +minecraft_version=1.21.4 + +additional_minecraft_versions= +minimum_minecraft_version=1.21.4 +minimum_architectury_api_version=15.0.1 +minimum_fabric_api_version=0.111.0+1.21.4 + branch=main group=io.github.jamalam360 mod_name=JamLib diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..a4b76b9 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 0d18421..94113f2 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,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/platforms/jvm/plugins-application/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 +82,12 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,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 +201,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..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -26,6 +28,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% @@ -42,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/libs.versions.toml b/libs.versions.toml index b9f18f7..9e0d330 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,20 +1,20 @@ [versions] # https://modrinth.com/mod/architectury-api/versions -architectury = "14.0.3" +architectury = "15.0.1" # https://parchmentmc.org/docs/getting-started -parchment-minecraft = "1.21" -parchment = "2024.07.28" +parchment-minecraft = "1.21.4" +parchment = "2024.12.07" # https://projects.neoforged.net/neoforged/neoforge -neoforge = "21.3.1-beta" +neoforge = "21.4.13-beta" # https://fabricmc.net/develop -fabric-loader = "0.16.7" -fabric-api = "0.106.1+1.21.3" +fabric-loader = "0.16.9" +fabric-api = "0.111.0+1.21.4" # https://modrinth.com/mod/modmenu/versions -modmenu = "12.0.0-beta.1" +modmenu = "13.0.0-beta.1" # https://github.com/falkreon/Jankson/releases/latest jankson = "1.2.3" diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 68c58e0..8d05c19 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -96,13 +96,18 @@ publishing { } processResources { - filesMatching("neoforge.mods.toml") { - expand "minecraft_version": project.minimum_minecraft_version, - "architectury_version": libs.versions.architectury.get() + def substitutions = [ + "version" : project.version, + "minecraft_version" : project.minimum_minecraft_version, + "neoforge_version" : project.minimum_minecraft_version.substring(2), + "architectury_version": project.minimum_architectury_api_version + ] + + filesMatching("META-INF/neoforge.mods.toml") { + expand substitutions } - inputs.property "minecraft_version", project.minimum_minecraft_version - inputs.property "architectury_version", libs.versions.architectury.get() + substitutions.each { inputs.property it.key, it.value } } shadowJar { diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 1019f4f..6f06682 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -5,7 +5,7 @@ issueTrackerURL = "https://github.com/JamCoreModding/jamlib/issues" [[mods]] modId = "jamlib" -version = "${file.jarVersion}" +version = "${version}" displayName = "JamLib" displayURL = "https://github.com/JamCoreModding/jamlib" logoFile = "icon.png" @@ -15,7 +15,7 @@ description = '''The platform-agnostic library used in all of JamCore's mods''' [[dependencies.jamlib]] modId = "neoforge" type = "required" -versionRange = "[21,)" +versionRange = "[${neoforge_version},)" ordering = "NONE" side = "BOTH"