diff --git a/build.gradle b/build.gradle index 475260e..80249ee 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ subprojects { // The following line declares the mojmap mappings, you may use other mappings as well //mappings loom.officialMojangMappings() // The following line declares the yarn mappings you may select this one as well. - mappings "net.fabricmc:yarn:1.19.3+build.3:v2" + mappings "net.fabricmc:yarn:1.19.3+build.5:v2" } } @@ -47,7 +47,7 @@ allprojects { // for more information about repositories. } - tasks.withType(JavaCompile) { + tasks.withType(JavaCompile).configureEach { options.encoding = "UTF-8" options.release = 17 } diff --git a/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinRegionChunkRenderer.java b/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinRegionChunkRenderer.java index d5eca39..08fb642 100644 --- a/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinRegionChunkRenderer.java +++ b/common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinRegionChunkRenderer.java @@ -4,10 +4,10 @@ import eu.midnightdust.cullleaves.config.CullLeavesConfig; import me.jellysquid.mods.sodium.client.gl.device.RenderDevice; import me.jellysquid.mods.sodium.client.gl.util.ElementRange; import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFacing; -import me.jellysquid.mods.sodium.client.model.vertex.type.ChunkVertexType; import me.jellysquid.mods.sodium.client.render.chunk.*; import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderBounds; import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass; +import me.jellysquid.mods.sodium.client.render.vertex.type.ChunkVertexType; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/gradle.properties b/gradle.properties index f259561..61171fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ minecraft_version=1.19.3 enabled_platforms=quilt,fabric,forge archives_base_name=cullleaves -mod_version=3.0.2 +mod_version=3.0.3 maven_group=eu.midnightdust architectury_version=6.2.43 midnightlib_version=1.1.0 -sodium_version=mc1.19.2-0.4.4 +sodium_version=mc1.19.3-0.4.9 -fabric_loader_version=0.14.11 -fabric_api_version=0.69.1+1.19.3 +fabric_loader_version=0.14.14 +fabric_api_version=0.73.2+1.19.3 -forge_version=1.19.3-44.0.18 +forge_version=1.19.3-44.1.16 -quilt_loader_version=0.18.1-beta.23 -quilt_fabric_api_version=5.0.0-beta.2+0.68.1-1.19.3 +quilt_loader_version=0.18.1-beta.27 +quilt_fabric_api_version=5.0.0-beta.4+0.73.0-1.19.3 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 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 ae04661..f398c33 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -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,10 +80,10 @@ 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##*/} +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"' @@ -143,12 +143,16 @@ fi 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 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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,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%