Updated to 1.21.8

diff --git a/build.gradle b/build.gradle
index f9c7d374b096e29fffaa51c17585c2bc67a10fde..ce046a86c8a62afdba9883fc2985de164dd5d45a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-       id 'fabric-loom' version '1.7-SNAPSHOT'
+       id 'fabric-loom' version '1.14-SNAPSHOT'
        id 'maven-publish'
 }
 

diff --git a/gradle.properties b/gradle.properties
index 7ed124242a6cabb2951cc4ff314878a11d128c55..60183098784438a56e781c9805a6fd503d81fa02 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,18 +4,18 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.9
-loader_version=0.15.11
-
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
+loader_version=0.18.1
+loom_version=1.14-SNAPSHOT
 
 # Mod Properties
-mod_version=1.1+1.21
+mod_version=1.1+1.21.8
 maven_group=modern_chunk_detector
 archives_base_name=modern_chunk_detector
 
 # Dependencies
-fabric_version=0.100.8+1.21
+fabric_version=0.136.1+1.21.8
 
-# Java
-org.gradle.java.home=C:\\Users\\Leon\\.jdks\\corretto-21.0.3
\ No newline at end of file
+# Java (You need to change this to your jdk path)
+org.gradle.java.home=/usr/lib/jvm/java-1.21.0-openjdk-amd64
\ No newline at end of file

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d4ba8a0da8d277868979cfbc8ad796..f8e1ee3125fe0768e9a76ee977ac089eb657005e 100644 (file)
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 a4413138c96c6ed29b6e2f5e147cd77426ae4409..bad7c2462f5a1ee988f37afa9b4e7b9cb7ab5949 100644 (file)
--- 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
old mode 100644 (file)
new mode 100755 (executable)
index b740cf1..adff685
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 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
+#
 
 ##############################################################################
 #
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -170,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,15 +203,14 @@ fi
 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,
+#   * DEFAULT_JVM_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 \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

diff --git a/gradlew.bat b/gradlew.bat
index 25da30dbdeee93f6eaceea674c3b635de168ce06..c4bdd3ab8e3ccd2ac3a2bc0db0f856f16b79ef39 100644 (file)
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @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
 @rem ##########################################################################
@@ -68,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/src/client/java/modern_chunk_detector/ModernChunkDetectorClient.java b/src/client/java/modern_chunk_detector/ModernChunkDetectorClient.java
index 1543466a90f9650ce744ab0d29950dd705e44e54..8c8b9014ee81ec3c6539058132483823555cea13 100644 (file)
--- a/src/client/java/modern_chunk_detector/ModernChunkDetectorClient.java
+++ b/src/client/java/modern_chunk_detector/ModernChunkDetectorClient.java
@@ -7,8 +7,6 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
-import net.fabricmc.fabric.api.renderer.v1.Renderer;
-import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
@@ -107,13 +105,13 @@ public class ModernChunkDetectorClient implements ClientModInitializer {
        }
 
        private final MinecraftClient client = MinecraftClient.getInstance();
-       private static final int DARK_CYAN = ColorHelper.Argb.getArgb(255, 0, 155, 155);
-       private static final int YELLOW = ColorHelper.Argb.getArgb(255, 255, 255, 0);
+       private static final int DARK_CYAN = ColorHelper.getArgb(255, 0, 155, 155);
+       private static final int YELLOW = ColorHelper.getArgb(255, 255, 255, 0);
 
        public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, double cameraX, double cameraY, double cameraZ, ChunkPos chunkPos) {
                Entity entity = this.client.gameRenderer.getCamera().getFocusedEntity();
                float f = (float)((double)this.client.world.getBottomY() - cameraY);
-               float g = (float)((double)this.client.world.getTopY() - cameraY);
+               float g = (float)((double)this.client.world.getHeight() - cameraY);
 
                float h = (float)((double)chunkPos.getStartX() - cameraX);
                float i = (float)((double)chunkPos.getStartZ() - cameraZ);
@@ -160,7 +158,7 @@ public class ModernChunkDetectorClient implements ClientModInitializer {
                }
 
                float l;
-               for(j = this.client.world.getBottomY(); j <= this.client.world.getTopY(); j += 2) {
+               for(j = this.client.world.getBottomY(); j <= this.client.world.getHeight(); j += 2) {
 
                        l = (float)((double)j - cameraY);
                        int m = j % 8 == 0 ? DARK_CYAN : YELLOW;
@@ -184,7 +182,7 @@ public class ModernChunkDetectorClient implements ClientModInitializer {
                        }
                }
 
-               for(j = this.client.world.getBottomY(); j <= this.client.world.getTopY(); j += 16) {
+               for(j = this.client.world.getBottomY(); j <= this.client.world.getHeight(); j += 16) {
                        l = (float)((double)j - cameraY);
                        vertexConsumer.vertex(matrix4f, h, l, i).color(1.0F, 0F, 1.0F, 0.0F);
                        vertexConsumer.vertex(matrix4f, h, l, i).color(1.0F, 0F, 1.0F, 1.0F);