further libjava cleanup

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:

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;

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:

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 {

minecraft/java/include/java/Random.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 class Random {
 private:
     int64_t seed;

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)                                      \

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;