From 6539e69fb0882ede4aefa5ee48a41c5b143bb791 Mon Sep 17 00:00:00 2001
From: mcrcortex <18544518+MCRcortex@users.noreply.github.com>
Date: Tue, 14 Jan 2025 19:27:48 +1000
Subject: [PATCH] added devauth Added some extra checks Made RD 1024

---
 build.gradle                                        | 12 ++++++++++++
 .../voxy/client/core/rendering/RenderService.java   | 13 +++++++++----
 .../core/rendering/hierachical/NodeManager.java     |  3 +++
 .../minecraft/MixinClientCommonNetworkHandler.java  |  8 ++++----
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index a4ef5294..f37da568 100644
--- a/build.gradle
+++ b/build.gradle
@@ -201,4 +201,16 @@ dependencies {
     include(implementation 'org.apache.commons:commons-pool2:2.12.0')
     //implementation 'org.rocksdb:rocksdbjni:8.10.0'
     //implementation 'redis.clients:jedis:5.1.0'
+}
+
+repositories {
+    maven {
+        url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1"
+    }
+}
+
+dependencies {
+    modRuntimeOnly('me.djtheredstoner:DevAuth-fabric:1.1.0') {
+        exclude group: 'net.fabricmc', module: 'fabric-loader'
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java b/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java
index 944d7ee6..fdbb2fb7 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/RenderService.java
@@ -13,6 +13,7 @@ import me.cortex.voxy.client.core.rendering.section.IUsesMeshlets;
 import me.cortex.voxy.client.core.rendering.section.MDICSectionRenderer;
 import me.cortex.voxy.client.core.rendering.util.DownloadStream;
 import me.cortex.voxy.client.core.rendering.util.UploadStream;
+import me.cortex.voxy.common.Logger;
 import me.cortex.voxy.common.util.MessageQueue;
 import me.cortex.voxy.common.world.WorldEngine;
 import me.cortex.voxy.common.thread.ServiceThreadPool;
@@ -48,7 +49,7 @@ public class RenderService<T extends AbstractSectionRenderer<J, ?>, J extends Vi
 
         //Max sections: ~500k
         //Max geometry: 1 gb
-        this.sectionRenderer = (T) createSectionRenderer(this.modelService.getStore(),1<<20, (1L<<32)-1024);
+        this.sectionRenderer = (T) createSectionRenderer(this.modelService.getStore(),1<<20, (1L<<31)-1024);
 
         //Do something incredibly hacky, we dont need to keep the reference to this around, so just connect and discard
         var router = new SectionUpdateRouter();
@@ -148,10 +149,14 @@ public class RenderService<T extends AbstractSectionRenderer<J, ?>, J extends Vi
 
     private int q = -60;
     public void setup(Camera camera) {
-        final int W = 80;
+        final int W = 32;
         final int H = 2;
-        for (int i = 0; i<32 && q<((W*2+1)*(W*2+1)*H)&&q++>=0;i++) {
-            this.nodeManager.insertTopLevelNode(WorldEngine.getWorldSectionId(4, (q%(W*2+1))-W, ((q/(W*2+1))/(W*2+1))-1, ((q/(W*2+1))%(W*2+1)))-W);
+        for (int i = 0; i<64 && q<((W*2+1)*(W*2+1)*H)&&q++>=0;i++) {
+            this.nodeManager.insertTopLevelNode(WorldEngine.getWorldSectionId(4, (q%(W*2+1))-W, ((q/(W*2+1))/(W*2+1))-1, ((q/(W*2+1))%(W*2+1))-W));
+        }
+        if (q==((W*2+1)*(W*2+1)*H)) {
+            q++;
+            Logger.info("Finished loading render distance");
         }
         this.modelService.tick();
     }
diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java
index 774ba24c..94ee5ec9 100644
--- a/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java
+++ b/src/main/java/me/cortex/voxy/client/core/rendering/hierachical/NodeManager.java
@@ -87,6 +87,9 @@ public class NodeManager {
     }
 
     public void insertTopLevelNode(long pos) {
+        if ((pos&0xF) != 0) {
+            throw new IllegalStateException("BAD POS !! YOU DID SOMETHING VERY BAD");
+        }
         if (this.activeSectionMap.containsKey(pos)) {
             Logger.error("Tried inserting top level pos " + WorldEngine.pprintPos(pos) + " but it was in active map, discarding!");
             return;
diff --git a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientCommonNetworkHandler.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientCommonNetworkHandler.java
index b87d193e..53144b18 100644
--- a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientCommonNetworkHandler.java
+++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinClientCommonNetworkHandler.java
@@ -14,11 +14,11 @@ public class MixinClientCommonNetworkHandler {
     private void handleDisconnectAsCrash(Packet<?> packet, Exception exception, CallbackInfo ci) {
         if (packet instanceof GameJoinS2CPacket) {
             ci.cancel();
-            if (exception instanceof RuntimeException re) {
-                throw re;
-            } else {
+            //if (exception instanceof RuntimeException re) {
+            //    throw re;
+            //} else {
                 throw new RuntimeException("Force crashing due to exception during on game join", exception);
-            }
+            //}
         }
     }
 }