diff --git a/buildSrc/src/main/kotlin/curseforge.kt b/buildSrc/src/main/kotlin/curseforge.kt index 01f49aebc..8ab0c7c64 100644 --- a/buildSrc/src/main/kotlin/curseforge.kt +++ b/buildSrc/src/main/kotlin/curseforge.kt @@ -1,5 +1,5 @@ import com.matthewprenger.cursegradle.CurseProject -import gradle.kotlin.dsl.accessors._0d85c8abe599c3884bce56e72c18751a.curseforge +import gradle.kotlin.dsl.accessors._30aa10cce2eda716151152e22de91a4c.curseforge import org.gradle.api.Action import org.gradle.api.Project import org.gradle.kotlin.dsl.closureOf @@ -14,4 +14,4 @@ fun Project.curseforgeBlueMap (configuration: Action) { configuration.execute(this) }) -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5b1890dbe..fa204bd4d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -adventure = "4.17.0" +adventure = "4.23.0" bluecommands = "1.3.4" bstats = "2.2.1" configurate = "4.1.2" @@ -22,7 +22,7 @@ commons-cli = { module = "commons-cli:commons-cli", version = "1.5.0" } commons-dbcp2 = { module = "org.apache.commons:commons-dbcp2", version = "2.9.0" } configurate-hocon = { module = "org.spongepowered:configurate-hocon", version.ref = "configurate" } configurate-gson = { module = "org.spongepowered:configurate-gson", version.ref = "configurate" } -fabric-permissions = { module = "me.lucko:fabric-permissions-api", version = "0.3.1" } +fabric-permissions = { module = "me.lucko:fabric-permissions-api", version = "0.4.0" } flow-math = { module = "com.flowpowered:flow-math", version = "1.0.3" } gson = { module = "com.google.code.gson:gson", version = "2.8.9" } guava = { module = "com.google.guava:guava", version = "33.3.0-jre" } @@ -36,7 +36,7 @@ lz4 = { module = "org.lz4:lz4-java", version = "1.8.0" } cursegradle = { id = "com.matthewprenger.cursegradle", version = "1.4.0" } forgegradle = { id = "net.minecraftforge.gradle", version = "[6.0.24,6.2)" } hangar = { id = "io.papermc.hangar-publish-plugin", version = "0.1.2" } -loom = { id = "fabric-loom", version = "1.9.2" } +loom = { id = "fabric-loom", version = "1.10-SNAPSHOT" } minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" } node-gradle = { id = "com.github.node-gradle.node", version = "7.0.2" } neoforge-gradle = { id = "net.neoforged.moddev", version = "2.0.28-beta" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f..a4b76b953 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 e48eca575..ca025c83a 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.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c78733..f5feea6d6 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" \ @@ -205,6 +217,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..9d21a2183 100755 --- a/gradlew.bat +++ b/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 diff --git a/implementations/fabric/build.gradle.kts b/implementations/fabric/build.gradle.kts index 918e065b6..b0c946b60 100644 --- a/implementations/fabric/build.gradle.kts +++ b/implementations/fabric/build.gradle.kts @@ -8,13 +8,13 @@ plugins { } val supportedMinecraftVersions = listOf( - "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5" + "1.21.6" ) val minecraftVersion = supportedMinecraftVersions.first() val yarnMappings = "${minecraftVersion}+build.1" -val fabricLoaderVersion = "0.15.11" -val fabricApiVersion = "0.100.1+${minecraftVersion}" +val fabricLoaderVersion = "0.16.14" +val fabricApiVersion = "0.127.1+${minecraftVersion}" val shadowInclude: Configuration by configurations.creating configurations.api.get().extendsFrom(shadowInclude) diff --git a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java index 18bc6bd44..f80163e48 100644 --- a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java +++ b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java @@ -25,6 +25,8 @@ package de.bluecolored.bluemap.fabric; import com.flowpowered.math.vector.Vector3d; +import com.mojang.serialization.DataResult; +import com.mojang.serialization.JsonOps; import de.bluecolored.bluemap.common.commands.TextFormat; import de.bluecolored.bluemap.common.serverinterface.CommandSource; import de.bluecolored.bluemap.common.serverinterface.ServerWorld; @@ -32,6 +34,8 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.Text; +import net.minecraft.text.TextCodecs; import net.minecraft.util.math.Vec3d; import java.util.Optional; @@ -51,8 +55,8 @@ public void sendMessage(Component text) { if (TextFormat.lineCount(text) > 1) text = Component.newline().append(text).appendNewline(); - delegate.sendMessage(net.minecraft.text.Text.Serialization - .fromJson(GsonComponentSerializer.gson().serialize(text.compact()), delegate.getRegistryManager())); + DataResult result = TextCodecs.CODEC.parse(JsonOps.INSTANCE, GsonComponentSerializer.gson().serializeToTree(text.compact())); + delegate.sendMessage(result.getOrThrow()); } @Override diff --git a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index 2cdbe378a..74519e5f4 100644 --- a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -138,7 +138,7 @@ public void onInitialize() { @Override public String getMinecraftVersion() { - return SharedConstants.getGameVersion().getId(); + return SharedConstants.getGameVersion().comp_4024(); } @Override diff --git a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java index db09e7703..e69bc2f48 100644 --- a/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java +++ b/implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java @@ -148,7 +148,7 @@ private void update(ServerPlayerEntity player) { this.rotation = new Vector3d(player.getPitch(), player.getHeadYaw(), 0); this.sneaking = player.isSneaking(); - net.minecraft.server.world.ServerWorld world = player.getServerWorld(); + net.minecraft.server.world.ServerWorld world = player.getWorld(); this.skyLight = world.getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos()); this.blockLight = world.getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());