Update dependencies and Colorful Hearts compat; use SPDX identifier f…

…or license in fabric.mod.json (#618)

* Update Gradle + dependencies

* Update Colorful Hearts compat

* Use SPDX identifier for license in fabric.mod.json

build.gradle

@@ -30,11 +30,11 @@ repositories {
 
 dependencies {
 	// jetbrains annotations
-	implementation ("org.jetbrains:annotations:24.0.1")
+	implementation ("org.jetbrains:annotations:26.0.1")
 
 	// graph api and its dependencies
-	implementation include("org.jgrapht:jgrapht-core:1.5.1")
-	implementation include("org.jheaps:jheaps:0.13")
+	implementation include("org.jgrapht:jgrapht-core:1.5.2")
+	implementation include("org.jheaps:jheaps:0.14")
 
 	// Some other dependency is adding annotations, and it throws an error without this
 	compileOnly ("com.demonwav.mcdev:annotations:1.0")
@@ -47,7 +47,7 @@ dependencies {
 
 	// ours
 	modImplementation("maven.modrinth:exclusions-lib:${project.exclusionslib_version}") // soft impl via json
-	modImplementation ("maven.modrinth:Revelationary:${project.revelationary_version}")
+	modImplementation("maven.modrinth:Revelationary:${project.revelationary_version}")
 	modImplementation include("maven.modrinth:AdditionalEntityAttributes:${project.additional_entity_attributes_version}")
 	modImplementation include("com.github.DaFuqs:Arrowhead:${project.arrowhead_version}")
 	modImplementation include("com.github.DaFuqs:DimensionalReverb:${project.dimensional_reverb_version}")

gradle.properties

@@ -16,15 +16,15 @@ archives_base_name=spectrum
 # https://fabricmc.net/develop/
 fabric_version=0.92.2+1.20.1
 
-cloth_config_version=11.1.106
+cloth_config_version=11.1.136
 modmenu_version=7.2.2
-rei_version=12.0.684
-emi_version=1.1.4+1.20.1
-architectury_version=9.1.12
+rei_version=12.1.785
+emi_version=1.1.18+1.20.1
+architectury_version=9.1.13
 # https://cloudsmith.io/~klikli-dev/repos/mods/groups/
 modonomicon_version=1.77.3
 # https://maven.terraformersmc.com/releases/dev/emi/trinkets/
-trinkets_version=3.7.1
+trinkets_version=3.7.2
 # https://github.com/emilyploszaj/step-height-entity-attribute
 step_height_attribute_version=1.2.0
 cca_version=5.2.2
@@ -37,31 +37,31 @@ reach_entity_attributes_version=2.4.0
 arrowhead_version=797635e3c7
 mixin_extras_version=0.4.1
 # https://github.com/Terrails/colorful-hearts
-colorful_hearts_version=4.0.4
+colorful_hearts_version=eBE7QD7E
 # https://modrinth.com/mod/sodium
-sodium_version=mc1.20.1-0.5.10
+sodium_version=mc1.20.1-0.5.11
 dimensional_reverb_version=26b0822932
 # https://github.com/Patbox/common-protection-api
 cpa_version=1.0.0
-ears_version=1.4.5
+ears_version=1.4.6
 # https://modrinth.com/mod/enchantment-descriptions/versions
 #enchantment_descriptions_version=hPYsgWD1
 # https://modrinth.com/mod/idwtialsimmoedm/versions
 idwtialsimmoedm_version=0.3.1+1.20
 # https://modrinth.com/mod/travelersbackpack/
 travelers_backpack_version=xa2rNDt3
 # https://modrinth.com/mod/botania/
-botania_version=1.20.1-444-fabric
+botania_version=1.20.1-446-fabric
 auth_me_version=7.0.2+1.20
 # https://modrinth.com/mod/create-fabric
-create_version=0.5.1-f-build.1417+mc1.20.1
+create_version=0.5.1-j-build.1604+mc1.20.1
 # https://modrinth.com/mod/neepmeat
-neepmeat_version=0.7.0-beta+1.20.1
+neepmeat_version=0.7.2-beta+1.20.1
 # https://modrinth.com/mod/malum
 malum_version=1.20.1-1.6.3.0b-fabric
 # https://modrinth.com/mod/lodestonelib
 lodestone_version=1.20.1-1.6.2.3f
-port_lib_version = 2.3.4+1.20.1
+port_lib_version = 2.3.5+1.20.1
 port_lib_modules = lazy_registration
 # https://modrinth.com/mod/exclusions-lib
 exclusionslib_version=0.6

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright � 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -32,10 +34,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions �$var�, �${var}�, �${var:-default}�, �${var+SET}�,
-#           �${var#prefix}�, �${var%suffix}�, and �$( cmd )�;
-#         * compound commands having a testable exit status, especially �case�;
-#         * various built-in commands including �command�, �set�, and �ulimit�.
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -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,18 +201,28 @@ 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" \
         -classpath "$CLASSPATH" \
         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

@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,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,13 +43,13 @@ 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.
-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
 
@@ -75,13 +78,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

src/main/java/de/dafuqs/spectrum/mixin/compat/colorful_hearts/present/HeartMixin.java

@@ -5,13 +5,13 @@
 import net.minecraft.client.*;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.*;
-import terrails.colorfulhearts.heart.*;
+import terrails.colorfulhearts.api.heart.drawing.*;
 
 @Environment(EnvType.CLIENT)
 @Mixin(Heart.class)
 public abstract class HeartMixin {
 
-    @ModifyVariable(method = "draw", at = @At("STORE"), ordinal = 1)
+    @ModifyVariable(method = "draw", at = @At("STORE"), ordinal = 0, argsOnly = true)
     private boolean heartRendererRenderPlayerHeartsGetHealthInjector(boolean hardcore) {
         MinecraftClient client = MinecraftClient.getInstance();
         if (!hardcore && client.player != null && client.player.hasStatusEffect(SpectrumStatusEffects.DIVINITY)) {

src/main/resources/fabric.mod.json

@@ -25,7 +25,7 @@
     "sources": "https://github.com/DaFuqs/Spectrum",
     "issues": "https://github.com/DaFuqs/Spectrum/issues"
   },
-  "license": "lGPL3",
+  "license": "LGPL-3.0-only",
   "icon": "assets/spectrum/icon.png",
   "environment": "*",
   "entrypoints": {