clean up libjava includes

2026-06-22 08:35:39 +00:00 · 2026-03-31 02:00:20 -05:00
parent bed181cd59
commit ea539a7e58
32 changed files with 100 additions and 30 deletions
--- a/minecraft/java/include/java/FloatBuffer.h
+++ b/minecraft/java/include/java/FloatBuffer.h
@@ -1,4 +1,6 @@
 #pragma once
+#include <vector>
+
 #include "Buffer.h"
 #include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO

--- a/minecraft/java/include/java/InputOutputStream/BufferedOutputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/BufferedOutputStream.h
@@ -1,7 +1,11 @@
 #pragma once

+#include <stdint.h>
+#include <vector>
+#include <cstdint>
+#include <vector>
+
 #include "OutputStream.h"
-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO

 class BufferedOutputStream : public OutputStream {
 private:
--- a/minecraft/java/include/java/InputOutputStream/BufferedReader.h
+++ b/minecraft/java/include/java/InputOutputStream/BufferedReader.h
@@ -2,6 +2,8 @@

 #include "Reader.h"

+#include <string>
+
 class BufferedReader : public Reader {
 private:
    Reader* reader;
--- a/minecraft/java/include/java/InputOutputStream/ByteArrayInputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/ByteArrayInputStream.h
@@ -1,8 +1,10 @@
 #pragma once
 // 4J Stu - Represents Java standard library class

+#include <vector>
+#include <cstdint>
+
 #include "InputStream.h"
-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO

 class ByteArrayInputStream : public InputStream {
 protected:
--- a/minecraft/java/include/java/InputOutputStream/ByteArrayOutputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/ByteArrayOutputStream.h
@@ -1,7 +1,9 @@
 #pragma once

 #include "OutputStream.h"
-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
+
+#include <vector>
+#include <cstdint>

 class ByteArrayOutputStream : public OutputStream {
    // Note - when actually implementing, std::vector<uint8_t> will need to grow as data is
--- a/minecraft/java/include/java/InputOutputStream/DataInput.h
+++ b/minecraft/java/include/java/InputOutputStream/DataInput.h
@@ -1,6 +1,8 @@
 #pragma once

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
+#include <vector>
+#include <string>
+#include <cstdint>

 class DataInput {
 public:
--- a/minecraft/java/include/java/InputOutputStream/DataInputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/DataInputStream.h
@@ -3,12 +3,11 @@
 // intermediate inheritance class that we don't care about)

 #include <string>
+#include <cstdint>

 #include "InputStream.h"
 #include "DataInput.h"

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 class DataInputStream : public InputStream, public DataInput {
 private:
    InputStream* stream;
--- a/minecraft/java/include/java/InputOutputStream/DataOutput.h
+++ b/minecraft/java/include/java/InputOutputStream/DataOutput.h
@@ -1,6 +1,8 @@
 #pragma once

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
+#include <vector>
+#include <string>
+#include <cstdint>

 class DataOutput {
 public:
--- a/minecraft/java/include/java/InputOutputStream/DataOutputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/DataOutputStream.h
@@ -4,9 +4,6 @@

 #include <string>

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
-
 #include "OutputStream.h"
 #include "DataOutput.h"

--- a/minecraft/java/include/java/InputOutputStream/FileInputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/FileInputStream.h
@@ -4,8 +4,6 @@
 #include <cstdio>
 #include <cstdint>

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 #include "InputStream.h"

 class File;
--- a/minecraft/java/include/java/InputOutputStream/FileOutputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/FileOutputStream.h
@@ -3,8 +3,6 @@

 #include <cstdio>

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 #include "OutputStream.h"

 class File;
--- a/minecraft/java/include/java/InputOutputStream/GZIPInputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/GZIPInputStream.h
@@ -4,8 +4,6 @@

 #include <cstdint>

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 #include "InputStream.h"

 class GZIPInputStream : public InputStream {
--- a/minecraft/java/include/java/InputOutputStream/GZIPOutputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/GZIPOutputStream.h
@@ -2,8 +2,6 @@
 // 4J Stu - We are not using GZIP compression, so this is just a pass through
 // class

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 #include "OutputStream.h"

 class GZIPOutputStream : public OutputStream {
--- a/minecraft/java/include/java/InputOutputStream/InputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/InputStream.h
@@ -1,10 +1,9 @@
 #pragma once

+#include <vector>
 #include <cstdint>
 #include <string>

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 // 4J Stu - Represents Java standard lib abstract

 class InputStream {
--- a/minecraft/java/include/java/InputOutputStream/OutputStream.h
+++ b/minecraft/java/include/java/InputOutputStream/OutputStream.h
@@ -1,7 +1,5 @@
 #pragma once

-#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
-
 // 4J Stu - Represents Java standard lib abstract

 class OutputStream {
--- a/minecraft/java/include/java/IntBuffer.h
+++ b/minecraft/java/include/java/IntBuffer.h
@@ -1,7 +1,8 @@
 #pragma once

-#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
+#include <vector>

+#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
 #include "Buffer.h"

 class IntBuffer : public Buffer {