diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 793156d..4742bd2 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -12,7 +12,7 @@ jobs: packages: write steps: - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/Common/build.gradle b/Common/build.gradle index 71d0bf8..2134f46 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -24,7 +24,7 @@ minecraft { dependencies { compileOnly group:'org.spongepowered', name: 'mixin', version: '0.8.5' - compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' + compileOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' compileOnly("com.electronwill.night-config:toml:${nightconfig_version}") compileOnly("com.electronwill.night-config:core:${nightconfig_version}") } diff --git a/Common/src/main/resources/pack.mcmeta b/Common/src/main/resources/pack.mcmeta index 2babb79..7e79416 100644 --- a/Common/src/main/resources/pack.mcmeta +++ b/Common/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Resources used for TerraBlender", - "pack_format": 10 + "pack_format": 18 } } \ No newline at end of file diff --git a/Example/Fabric/build.gradle b/Example/Fabric/build.gradle index 56f3737..2f060c3 100644 --- a/Example/Fabric/build.gradle +++ b/Example/Fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.4-SNAPSHOT' id 'idea' } diff --git a/Example/Fabric/gradle.properties b/Example/Fabric/gradle.properties index a431627..bd4c372 100644 --- a/Example/Fabric/gradle.properties +++ b/Example/Fabric/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false mod_version=1.0.0 -minecraft_version=1.20.1 -fabric_version=0.83.1+1.20.1 -fabric_loader_version=0.14.21 -terrablender_version=3.0.0.167 \ No newline at end of file +minecraft_version=1.20.2 +fabric_version=0.90.7+1.20.2 +fabric_loader_version=0.14.24 +terrablender_version=3.1.0.21 \ No newline at end of file diff --git a/Example/Fabric/gradle/wrapper/gradle-wrapper.jar b/Example/Fabric/gradle/wrapper/gradle-wrapper.jar index 7454180..7f93135 100644 Binary files a/Example/Fabric/gradle/wrapper/gradle-wrapper.jar and b/Example/Fabric/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Example/Fabric/gradle/wrapper/gradle-wrapper.properties b/Example/Fabric/gradle/wrapper/gradle-wrapper.properties index e750102..3fa8f86 100644 --- a/Example/Fabric/gradle/wrapper/gradle-wrapper.properties +++ b/Example/Fabric/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Example/Fabric/gradlew b/Example/Fabric/gradlew old mode 100644 new mode 100755 index c53aefa..1aa94a4 --- a/Example/Fabric/gradlew +++ b/Example/Fabric/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. @@ -32,10 +32,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 +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" \ @@ -205,6 +214,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/Example/Fabric/gradlew.bat b/Example/Fabric/gradlew.bat index 107acd3..93e3f59 100644 --- a/Example/Fabric/gradlew.bat +++ b/Example/Fabric/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,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,7 +41,7 @@ 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. @@ -75,13 +76,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/Example/Fabric/src/main/java/terrablender/example/TestBiomes.java b/Example/Fabric/src/main/java/terrablender/example/TestBiomes.java index 8f730d4..978308c 100644 --- a/Example/Fabric/src/main/java/terrablender/example/TestBiomes.java +++ b/Example/Fabric/src/main/java/terrablender/example/TestBiomes.java @@ -17,7 +17,6 @@ */ package terrablender.example; -import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/Example/Fabric/src/main/java/terrablender/example/TestRegion1.java b/Example/Fabric/src/main/java/terrablender/example/TestRegion1.java index 66462ad..338c0e6 100644 --- a/Example/Fabric/src/main/java/terrablender/example/TestRegion1.java +++ b/Example/Fabric/src/main/java/terrablender/example/TestRegion1.java @@ -54,6 +54,6 @@ public void addBiomes(Registry registry, Consumer builder.add(point, TestBiomes.COLD_BLUE)); // Add our points to the mapper - builder.build().forEach(mapper::accept); + builder.build().forEach(mapper); } } diff --git a/Example/Fabric/src/main/java/terrablender/example/TestRegion2.java b/Example/Fabric/src/main/java/terrablender/example/TestRegion2.java index 7cfd2d7..931e44b 100644 --- a/Example/Fabric/src/main/java/terrablender/example/TestRegion2.java +++ b/Example/Fabric/src/main/java/terrablender/example/TestRegion2.java @@ -27,11 +27,8 @@ import terrablender.api.Region; import terrablender.api.RegionType; -import java.util.List; import java.util.function.Consumer; -import static terrablender.api.ParameterUtils.*; - public class TestRegion2 extends Region { public TestRegion2(ResourceLocation name, int weight) diff --git a/Example/Fabric/src/main/resources/pack.mcmeta b/Example/Fabric/src/main/resources/pack.mcmeta index 6977cdd..2e0c83b 100644 --- a/Example/Fabric/src/main/resources/pack.mcmeta +++ b/Example/Fabric/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Resources used for test", - "pack_format": 8 + "pack_format": 18 } } \ No newline at end of file diff --git a/Example/Forge/build.gradle b/Example/Forge/build.gradle index bdd5ffa..2c8c194 100644 --- a/Example/Forge/build.gradle +++ b/Example/Forge/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' } } diff --git a/Example/Forge/gradle.properties b/Example/Forge/gradle.properties index c32fc05..5ab93fa 100644 --- a/Example/Forge/gradle.properties +++ b/Example/Forge/gradle.properties @@ -3,6 +3,6 @@ org.gradle.daemon=false mod_version=1.0.0 -minecraft_version=1.20.1 -forge_version=47.1.0 -terrablender_version=3.0.0.167 \ No newline at end of file +minecraft_version=1.20.2 +forge_version=48.0.40 +terrablender_version=3.1.0.21 \ No newline at end of file diff --git a/Example/Forge/gradle/wrapper/gradle-wrapper.jar b/Example/Forge/gradle/wrapper/gradle-wrapper.jar index 7454180..7f93135 100644 Binary files a/Example/Forge/gradle/wrapper/gradle-wrapper.jar and b/Example/Forge/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Example/Forge/gradle/wrapper/gradle-wrapper.properties b/Example/Forge/gradle/wrapper/gradle-wrapper.properties index e750102..3fa8f86 100644 --- a/Example/Forge/gradle/wrapper/gradle-wrapper.properties +++ b/Example/Forge/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Example/Forge/gradlew b/Example/Forge/gradlew old mode 100644 new mode 100755 index c53aefa..1aa94a4 --- a/Example/Forge/gradlew +++ b/Example/Forge/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. @@ -32,10 +32,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 +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" \ @@ -205,6 +214,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/Example/Forge/gradlew.bat b/Example/Forge/gradlew.bat index 107acd3..93e3f59 100644 --- a/Example/Forge/gradlew.bat +++ b/Example/Forge/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,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,7 +41,7 @@ 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. @@ -75,13 +76,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/Example/Forge/src/main/java/terrablender/example/TestBiomes.java b/Example/Forge/src/main/java/terrablender/example/TestBiomes.java index 8f730d4..978308c 100644 --- a/Example/Forge/src/main/java/terrablender/example/TestBiomes.java +++ b/Example/Forge/src/main/java/terrablender/example/TestBiomes.java @@ -17,7 +17,6 @@ */ package terrablender.example; -import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; diff --git a/Example/Forge/src/main/java/terrablender/example/TestRegion1.java b/Example/Forge/src/main/java/terrablender/example/TestRegion1.java index 66462ad..338c0e6 100644 --- a/Example/Forge/src/main/java/terrablender/example/TestRegion1.java +++ b/Example/Forge/src/main/java/terrablender/example/TestRegion1.java @@ -54,6 +54,6 @@ public void addBiomes(Registry registry, Consumer builder.add(point, TestBiomes.COLD_BLUE)); // Add our points to the mapper - builder.build().forEach(mapper::accept); + builder.build().forEach(mapper); } } diff --git a/Example/Forge/src/main/java/terrablender/example/TestRegion2.java b/Example/Forge/src/main/java/terrablender/example/TestRegion2.java index 7cfd2d7..931e44b 100644 --- a/Example/Forge/src/main/java/terrablender/example/TestRegion2.java +++ b/Example/Forge/src/main/java/terrablender/example/TestRegion2.java @@ -27,11 +27,8 @@ import terrablender.api.Region; import terrablender.api.RegionType; -import java.util.List; import java.util.function.Consumer; -import static terrablender.api.ParameterUtils.*; - public class TestRegion2 extends Region { public TestRegion2(ResourceLocation name, int weight) diff --git a/Example/Forge/src/main/resources/pack.mcmeta b/Example/Forge/src/main/resources/pack.mcmeta index 6977cdd..2e0c83b 100644 --- a/Example/Forge/src/main/resources/pack.mcmeta +++ b/Example/Forge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Resources used for test", - "pack_format": 8 + "pack_format": 18 } } \ No newline at end of file diff --git a/Fabric/build.gradle b/Fabric/build.gradle index e20da3d..f26323e 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.4-SNAPSHOT' id 'maven-publish' id 'idea' id "com.matthewprenger.cursegradle" version "1.4.0" @@ -14,7 +14,7 @@ dependencies { mappings loom.officialMojangMappings() modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1' + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' compileOnly project(":Common") include implementation("com.electronwill.night-config:toml:${nightconfig_version}") include implementation("com.electronwill.night-config:core:${nightconfig_version}") @@ -102,8 +102,8 @@ modrinth { versionName = mod_build_version + " for Fabric " + minecraft_version versionType = release_channel // can be release, beta, or alpha uploadFile = remapJar - gameVersions = [ minecraft_version ] - loaders = [ 'fabric' ] + gameVersions.set {minecraft_version} + loaders.set {'fabric'} if (changelog_file.exists()) { def changelog_text = changelog_file.text diff --git a/Forge/build.gradle b/Forge/build.gradle index d8f290a..c10f29a 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -140,8 +140,8 @@ modrinth { versionName = mod_build_version + " for Forge " + minecraft_version versionType = release_channel // can be release, beta, or alpha uploadFile = jar - gameVersions = [ minecraft_version ] - loaders = [ 'forge' ] + gameVersions.set {minecraft_version} + loaders.set {'forge'} if (changelog_file.exists()) { def changelog_text = changelog_file.text diff --git a/build.gradle b/build.gradle index 576b1c8..a8e31fd 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ subprojects { tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' - it.options.release = 17 + it.options.release.set(17) } // Disables Gradle's custom module metadata from being published to maven. The diff --git a/gradle.properties b/gradle.properties index d5dc8f8..32c2caf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ forge_ats_enabled=true # Fabric fabric_version=0.89.1+1.20.2 -fabric_loader_version=0.14.22 +fabric_loader_version=0.14.24 # Mod options mod_name=TerraBlender @@ -27,4 +27,4 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Dependencies -nightconfig_version=3.6.4 +nightconfig_version=3.6.7 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..c1962a7 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 37aef8d..744c64d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +141,7 @@ 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=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in