From adb3adfb8acc58e4c152bc366f78013d1b6072d6 Mon Sep 17 00:00:00 2001
From: Tropical <42101043+tropicaaal@users.noreply.github.com>
Date: Tue, 31 Mar 2026 02:05:01 -0500
Subject: [PATCH] further libjava cleanup

---
 minecraft/java/include/java/Arrays.h      | 2 +-
 minecraft/java/include/java/ByteBuffer.h  | 2 +-
 minecraft/java/include/java/FloatBuffer.h | 1 -
 minecraft/java/include/java/IntBuffer.h   | 1 -
 minecraft/java/include/java/Random.h      | 2 ++
 minecraft/java/include/java/System.h      | 4 +++-
 minecraft/java/src/JavaMath.cpp           | 9 +++++----
 7 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/minecraft/java/include/java/Arrays.h b/minecraft/java/include/java/Arrays.h
index cc0d88ba3..2992c8758 100644
--- a/minecraft/java/include/java/Arrays.h
+++ b/minecraft/java/include/java/Arrays.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
+#include <vector>
 
 class Arrays {
 public:
diff --git a/minecraft/java/include/java/ByteBuffer.h b/minecraft/java/include/java/ByteBuffer.h
index 532f466dd..8d7edb125 100644
--- a/minecraft/java/include/java/ByteBuffer.h
+++ b/minecraft/java/include/java/ByteBuffer.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <cstdint>
+#include <vector>
 
 #include "Buffer.h"
-#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
 #include "../../../Minecraft.World/ConsoleHelpers/Definitions.h" // 4jcraft TODO
 
 class IntBuffer;
diff --git a/minecraft/java/include/java/FloatBuffer.h b/minecraft/java/include/java/FloatBuffer.h
index 302992c5c..f100db768 100644
--- a/minecraft/java/include/java/FloatBuffer.h
+++ b/minecraft/java/include/java/FloatBuffer.h
@@ -2,7 +2,6 @@
 #include <vector>
 
 #include "Buffer.h"
-#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
 
 class FloatBuffer : public Buffer {
 private:
diff --git a/minecraft/java/include/java/IntBuffer.h b/minecraft/java/include/java/IntBuffer.h
index aaf34aa29..548672901 100644
--- a/minecraft/java/include/java/IntBuffer.h
+++ b/minecraft/java/include/java/IntBuffer.h
@@ -2,7 +2,6 @@
 
 #include <vector>
 
-#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
 #include "Buffer.h"
 
 class IntBuffer : public Buffer {
diff --git a/minecraft/java/include/java/Random.h b/minecraft/java/include/java/Random.h
index 8269c2421..c77d27717 100644
--- a/minecraft/java/include/java/Random.h
+++ b/minecraft/java/include/java/Random.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 class Random {
 private:
     int64_t seed;
diff --git a/minecraft/java/include/java/System.h b/minecraft/java/include/java/System.h
index c840c9419..ff3fd6746 100644
--- a/minecraft/java/include/java/System.h
+++ b/minecraft/java/include/java/System.h
@@ -5,7 +5,9 @@
 #include <algorithm>
 #include <cstring>
 #include <cassert>
-#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
+
+class Biome;
+class Node;
 
 // 4J Jev, just thought it would be easier this way.
 #define ArrayCopyFunctionDeclaration(x)                                      \
diff --git a/minecraft/java/src/JavaMath.cpp b/minecraft/java/src/JavaMath.cpp
index 0e2c50b5b..a9a2e6ef0 100644
--- a/minecraft/java/src/JavaMath.cpp
+++ b/minecraft/java/src/JavaMath.cpp
@@ -1,6 +1,7 @@
 #include "java/JavaMath.h"
 
 #include <cmath>
+#include <limits>
 
 Random Math::rand = Random();
 
@@ -41,11 +42,11 @@ int64_t Math::round(double d) {
     d = std::floor(d + 0.5);
 
     // if smaller or bigger than representable int64 than return the max
-    if (d >= (double)INT64_MAX) {
-        return INT64_MAX;
+    if (d >= (double)std::numeric_limits<int64_t>::max()) {
+        return std::numeric_limits<int64_t>::max();
 
-    } else if (d <= (double)INT64_MIN) {
-        return INT64_MIN;
+    } else if (d <= (double)std::numeric_limits<int64_t>::min()) {
+        return std::numeric_limits<int64_t>::min();
     }
 
     return (int64_t)d;