updated to 1.20.6

build.gradle

@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -99,20 +99,22 @@ tasks.withType(Jar).configureEach {
 	from sourceSets.api.output
 }
 
-task apiJar(type: Jar) {
+tasks.register('apiJar', Jar) {
 	archiveClassifier.set("api-dev")
 
 	from sourceSets.api.output
 }
 
-task remapApiJar(type: RemapJarTask) {
+tasks.register('remapApiJar', RemapJarTask) {
 	archiveClassifier.set("api")
 
 	input = apiJar.archiveFile.get().asFile
 	addNestedDependencies = false
+
+	dependsOn(apiJar)
 }
 
-prepareRemapApiJar.dependsOn(apiJar)
+build.dependsOn remapApiJar
 
 publishing {
 	publications {
@@ -171,6 +173,4 @@ publishing {
 			url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
 		}
 	}
-}
-
-build.dependsOn remapApiJar
+}

gradle.properties

@@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://fabricmc.net/use
 
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.1
-loader_version=0.15.0
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+loader_version=0.15.11
 
 # Mod Properties
-mod_version = 2.14.6
+mod_version = 2.14.7
 maven_group = kaptainwutax
 archives_base_name = seedcrackerX
 
 # Dependencies
-fabric_version=0.91.1+1.20.4
-fabric_api_base=0.4.34+f31bf88132
-command_api_version=2.2.18+23e8616e32
-resource_loader_version=0.11.14+f31bf88132
-modmenu_version=9.0.0
-cloth_config_version=13.0.121
+fabric_version=0.98.0+1.20.6
+fabric_api_base=0.4.40+80f8cf51b0
+command_api_version=2.2.24+80f8cf51b0
+resource_loader_version=1.1.0+c0e5481fb0
+modmenu_version=10.0.0-beta.1
+cloth_config_version=14.0.126

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

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,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" \
@@ -237,4 +246,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

jitpack.yml

@@ -3,5 +3,5 @@ before_install:
   # Fix: https://github.com/jitpack/jitpack.io/issues/4506#issuecomment-864562270
   - source "$HOME/.sdkman/bin/sdkman-init.sh"
   - sdk update
-  - sdk install java 17.0.1-zulu
-  - sdk use java 17.0.1-zulu
+  - sdk install java 21.34.19-zulu
+  - sdk use java 21.34.19-zulu

src/main/java/kaptainwutax/seedcrackerX/finder/Finder.java

@@ -9,12 +9,12 @@
 import kaptainwutax.seedcrackerX.util.HeightContext;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraft.world.dimension.DimensionType;
+import org.joml.Matrix4f;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -88,8 +88,8 @@ public boolean shouldRender() {
         return false;
     }
 
-    public void render(MatrixStack matrixStack, VertexConsumer vertexConsumer, Vec3d cameraPos) {
-        this.renderers.forEach(renderer -> renderer.render(matrixStack, vertexConsumer, cameraPos));
+    public void render(Matrix4f matrix4f, VertexConsumer vertexConsumer, Vec3d cameraPos) {
+        this.renderers.forEach(renderer -> renderer.render(matrix4f, vertexConsumer, cameraPos));
     }
 
     public boolean isUseless() {

src/main/java/kaptainwutax/seedcrackerX/finder/FinderQueue.java

@@ -4,10 +4,10 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import kaptainwutax.seedcrackerX.config.Config;
 import net.minecraft.client.render.*;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
+import org.joml.Matrix4f;
 
 import java.util.Arrays;
 import java.util.List;
@@ -51,11 +51,9 @@ public void onChunkData(World world, ChunkPos chunkPos) {
         });
     }
 
-    public void renderFinders(MatrixStack matrixStack, Camera camera) {
+    public void renderFinders(Matrix4f matrix4f, Camera camera) {
         if (Config.get().render == Config.RenderType.OFF) return;
 
-        matrixStack.push();
-
         Vec3d camPos = camera.getPos();
 
         Tessellator tessellator = Tessellator.getInstance();
@@ -73,7 +71,7 @@ public void renderFinders(MatrixStack matrixStack, Camera camera) {
 
         this.finderControl.getActiveFinders().forEach(finder -> {
             if (finder.shouldRender()) {
-                finder.render(matrixStack, buffer, camPos);
+                finder.render(matrix4f, buffer, camPos);
             }
         });
 
@@ -83,7 +81,6 @@ public void renderFinders(MatrixStack matrixStack, Camera camera) {
         RenderSystem.enableDepthTest();
         RenderSystem.disableBlend();
 
-        matrixStack.pop();
         RenderSystem.applyModelViewMatrix();
     }
 

src/main/java/kaptainwutax/seedcrackerX/mixin/GameRendererMixin.java

@@ -4,12 +4,15 @@
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
+import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(GameRenderer.class)
 public abstract class GameRendererMixin {
@@ -18,9 +21,9 @@ public abstract class GameRendererMixin {
     @Final
     private Camera camera;
 
-    @Inject(method = "renderWorld", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", args = {"ldc=hand"}))
-    private void renderWorldHand(float delta, long time, MatrixStack matrixStack, CallbackInfo ci) {
-        FinderQueue.get().renderFinders(matrixStack, camera);
+    @Inject(method = "renderWorld", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", args = {"ldc=hand"}), locals = LocalCapture.CAPTURE_FAILHARD)
+    private void renderWorldHand(float tickDelta, long limitTime, CallbackInfo ci, boolean bl, Camera camera, Entity entity, double d, Matrix4f matrix4f, MatrixStack matrixStack, float f, float g, Matrix4f matrix4f2) {
+        FinderQueue.get().renderFinders(matrix4f2, camera);
     }
 
 }

src/main/java/kaptainwutax/seedcrackerX/render/Cuboid.java

@@ -1,11 +1,11 @@
 package kaptainwutax.seedcrackerX.render;
 
 import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockBox;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
+import org.joml.Matrix4f;
 
 public class Cuboid extends Renderer {
 
@@ -49,12 +49,12 @@ public Cuboid(BlockPos start, Vec3i size, Color color) {
     }
 
     @Override
-    public void render(MatrixStack matrixStack, VertexConsumer vertexConsumer, Vec3d cameraPos) {
+    public void render(Matrix4f matrix4f, VertexConsumer vertexConsumer, Vec3d cameraPos) {
         if (this.start == null || this.size == null || this.edges == null) return;
 
         for (Line edge : this.edges) {
             if (edge == null) continue;
-            edge.render(matrixStack, vertexConsumer, cameraPos);
+            edge.render(matrix4f, vertexConsumer, cameraPos);
         }
     }
 

src/main/java/kaptainwutax/seedcrackerX/render/Line.java

@@ -1,9 +1,9 @@
 package kaptainwutax.seedcrackerX.render;
 
 import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import org.joml.Matrix4f;
 
 public class Line extends Renderer {
 
@@ -26,14 +26,14 @@ public Line(Vec3d start, Vec3d end, Color color) {
     }
 
     @Override
-    public void render(MatrixStack matrixStack, VertexConsumer vertexConsumer, Vec3d cameraPos) {
-        this.putVertex(vertexConsumer, matrixStack, this.start, cameraPos);
-        this.putVertex(vertexConsumer, matrixStack, this.end, cameraPos);
+    public void render(Matrix4f matrix4f, VertexConsumer vertexConsumer, Vec3d cameraPos) {
+        this.putVertex(vertexConsumer, matrix4f, this.start, cameraPos);
+        this.putVertex(vertexConsumer, matrix4f, this.end, cameraPos);
     }
 
-    protected void putVertex(VertexConsumer vertexConsumer, MatrixStack matrixStack, Vec3d pos, Vec3d cameraPos) {
+    protected void putVertex(VertexConsumer vertexConsumer, Matrix4f matrix4f, Vec3d pos, Vec3d cameraPos) {
         vertexConsumer.vertex(
-                matrixStack.peek().getPositionMatrix(),
+                matrix4f,
                 (float) (pos.x - cameraPos.x),
                 (float) (pos.y - cameraPos.y),
                 (float) (pos.z - cameraPos.z)

src/main/java/kaptainwutax/seedcrackerX/render/Renderer.java

@@ -1,16 +1,13 @@
 package kaptainwutax.seedcrackerX.render;
 
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import org.joml.Matrix4f;
 
 public abstract class Renderer {
 
-    protected MinecraftClient mc = MinecraftClient.getInstance();
-
-    public abstract void render(MatrixStack matrixStack, VertexConsumer vertexConsumer, Vec3d cameraPos);
+    public abstract void render(Matrix4f matrix, VertexConsumer vertexConsumer, Vec3d cameraPos);
 
     public abstract BlockPos getPos();
 

src/main/resources/fabric.mod.json

@@ -28,7 +28,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.0",
-    "minecraft": ">=1.20.2"
+    "minecraft": "1.20.6"
   },
   "suggests": {
     "flamingo": "*"

src/main/resources/seedcracker.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "kaptainwutax.seedcrackerX.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [