Skip to content

Commit 325cae7

Browse files
authored
Update dependencies and Colorful Hearts compat; use SPDX identifier for license in fabric.mod.json (#618)
* Update Gradle + dependencies * Update Colorful Hearts compat * Use SPDX identifier for license in fabric.mod.json
1 parent 31fe916 commit 325cae7

File tree

8 files changed

+79
-54
lines changed

8 files changed

+79
-54
lines changed

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ repositories {
3030

3131
dependencies {
3232
// jetbrains annotations
33-
implementation ("org.jetbrains:annotations:24.0.1")
33+
implementation ("org.jetbrains:annotations:26.0.1")
3434

3535
// graph api and its dependencies
36-
implementation include("org.jgrapht:jgrapht-core:1.5.1")
37-
implementation include("org.jheaps:jheaps:0.13")
36+
implementation include("org.jgrapht:jgrapht-core:1.5.2")
37+
implementation include("org.jheaps:jheaps:0.14")
3838

3939
// Some other dependency is adding annotations, and it throws an error without this
4040
compileOnly ("com.demonwav.mcdev:annotations:1.0")
@@ -47,7 +47,7 @@ dependencies {
4747

4848
// ours
4949
modImplementation("maven.modrinth:exclusions-lib:${project.exclusionslib_version}") // soft impl via json
50-
modImplementation ("maven.modrinth:Revelationary:${project.revelationary_version}")
50+
modImplementation("maven.modrinth:Revelationary:${project.revelationary_version}")
5151
modImplementation include("maven.modrinth:AdditionalEntityAttributes:${project.additional_entity_attributes_version}")
5252
modImplementation include("com.github.DaFuqs:Arrowhead:${project.arrowhead_version}")
5353
modImplementation include("com.github.DaFuqs:DimensionalReverb:${project.dimensional_reverb_version}")

gradle.properties

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ archives_base_name=spectrum
1616
# https://fabricmc.net/develop/
1717
fabric_version=0.92.2+1.20.1
1818

19-
cloth_config_version=11.1.106
19+
cloth_config_version=11.1.136
2020
modmenu_version=7.2.2
21-
rei_version=12.0.684
22-
emi_version=1.1.4+1.20.1
23-
architectury_version=9.1.12
21+
rei_version=12.1.785
22+
emi_version=1.1.18+1.20.1
23+
architectury_version=9.1.13
2424
# https://cloudsmith.io/~klikli-dev/repos/mods/groups/
2525
modonomicon_version=1.77.3
2626
# https://maven.terraformersmc.com/releases/dev/emi/trinkets/
27-
trinkets_version=3.7.1
27+
trinkets_version=3.7.2
2828
# https://github.com/emilyploszaj/step-height-entity-attribute
2929
step_height_attribute_version=1.2.0
3030
cca_version=5.2.2
@@ -37,31 +37,31 @@ reach_entity_attributes_version=2.4.0
3737
arrowhead_version=797635e3c7
3838
mixin_extras_version=0.4.1
3939
# https://github.com/Terrails/colorful-hearts
40-
colorful_hearts_version=4.0.4
40+
colorful_hearts_version=eBE7QD7E
4141
# https://modrinth.com/mod/sodium
42-
sodium_version=mc1.20.1-0.5.10
42+
sodium_version=mc1.20.1-0.5.11
4343
dimensional_reverb_version=26b0822932
4444
# https://github.com/Patbox/common-protection-api
4545
cpa_version=1.0.0
46-
ears_version=1.4.5
46+
ears_version=1.4.6
4747
# https://modrinth.com/mod/enchantment-descriptions/versions
4848
#enchantment_descriptions_version=hPYsgWD1
4949
# https://modrinth.com/mod/idwtialsimmoedm/versions
5050
idwtialsimmoedm_version=0.3.1+1.20
5151
# https://modrinth.com/mod/travelersbackpack/
5252
travelers_backpack_version=xa2rNDt3
5353
# https://modrinth.com/mod/botania/
54-
botania_version=1.20.1-444-fabric
54+
botania_version=1.20.1-446-fabric
5555
auth_me_version=7.0.2+1.20
5656
# https://modrinth.com/mod/create-fabric
57-
create_version=0.5.1-f-build.1417+mc1.20.1
57+
create_version=0.5.1-j-build.1604+mc1.20.1
5858
# https://modrinth.com/mod/neepmeat
59-
neepmeat_version=0.7.0-beta+1.20.1
59+
neepmeat_version=0.7.2-beta+1.20.1
6060
# https://modrinth.com/mod/malum
6161
malum_version=1.20.1-1.6.3.0b-fabric
6262
# https://modrinth.com/mod/lodestonelib
6363
lodestone_version=1.20.1-1.6.2.3f
64-
port_lib_version = 2.3.4+1.20.1
64+
port_lib_version = 2.3.5+1.20.1
6565
port_lib_modules = lazy_registration
6666
# https://modrinth.com/mod/exclusions-lib
6767
exclusionslib_version=0.6

gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

+36-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright 2015-2021 the original authors.
4+
# Copyright © 2015-2021 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -32,10 +34,10 @@
3234
# Busybox and similar reduced shells will NOT work, because this script
3335
# requires all of these POSIX shell features:
3436
# * functions;
35-
# * expansions $var�, �${var}�, �${var:-default}�, �${var+SET},
36-
# ${var#prefix}�, �${var%suffix}, and $( cmd );
37-
# * compound commands having a testable exit status, especially case;
38-
# * various built-in commands including command�, �set, and ulimit.
37+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
38+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
39+
# * compound commands having a testable exit status, especially «case»;
40+
# * various built-in commands including «command», «set», and «ulimit».
3941
#
4042
# Important for patching:
4143
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
146152
MAX_FD=$( ulimit -H -n ) ||
147153
warn "Could not query maximum file descriptor limit"
148154
esac
149155
case $MAX_FD in #(
150156
'' | soft) :;; #(
151157
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
152160
ulimit -n "$MAX_FD" ||
153161
warn "Could not set maximum file descriptor limit to $MAX_FD"
154162
esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
193201
done
194202
fi
195203

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
201213

202214
set -- \
203215
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204216
-classpath "$CLASSPATH" \
205217
org.gradle.wrapper.GradleWrapperMain \
206218
"$@"
207219

220+
# Stop when "xargs" is not available.
221+
if ! command -v xargs >/dev/null 2>&1
222+
then
223+
die "xargs is not available"
224+
fi
225+
208226
# Use "xargs" to parse quoted args.
209227
#
210228
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+21-16
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

17-
@if "%DEBUG%" == "" @echo off
19+
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
1921
@rem
2022
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
2527
if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4043

4144
set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
46+
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6467

6568
goto fail
6669

@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7578

7679
:end
7780
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
81+
if %ERRORLEVEL% equ 0 goto mainEnd
7982

8083
:fail
8184
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8285
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
8590

8691
:mainEnd
8792
if "%OS%"=="Windows_NT" endlocal

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import net.minecraft.client.*;
66
import org.spongepowered.asm.mixin.*;
77
import org.spongepowered.asm.mixin.injection.*;
8-
import terrails.colorfulhearts.heart.*;
8+
import terrails.colorfulhearts.api.heart.drawing.*;
99

1010
@Environment(EnvType.CLIENT)
1111
@Mixin(Heart.class)
1212
public abstract class HeartMixin {
1313

14-
@ModifyVariable(method = "draw", at = @At("STORE"), ordinal = 1)
14+
@ModifyVariable(method = "draw", at = @At("STORE"), ordinal = 0, argsOnly = true)
1515
private boolean heartRendererRenderPlayerHeartsGetHealthInjector(boolean hardcore) {
1616
MinecraftClient client = MinecraftClient.getInstance();
1717
if (!hardcore && client.player != null && client.player.hasStatusEffect(SpectrumStatusEffects.DIVINITY)) {

src/main/resources/fabric.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"sources": "https://github.com/DaFuqs/Spectrum",
2626
"issues": "https://github.com/DaFuqs/Spectrum/issues"
2727
},
28-
"license": "lGPL3",
28+
"license": "LGPL-3.0-only",
2929
"icon": "assets/spectrum/icon.png",
3030
"environment": "*",
3131
"entrypoints": {

0 commit comments

Comments
 (0)