From ea539a7e588e3bf7a1853853207524206b2b5dfd Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 31 Mar 2026 02:00:20 -0500 Subject: [PATCH] clean up libjava includes --- minecraft/java/include/java/FloatBuffer.h | 2 ++ .../java/InputOutputStream/BufferedOutputStream.h | 6 +++++- .../include/java/InputOutputStream/BufferedReader.h | 2 ++ .../java/InputOutputStream/ByteArrayInputStream.h | 4 +++- .../java/InputOutputStream/ByteArrayOutputStream.h | 4 +++- .../java/include/java/InputOutputStream/DataInput.h | 4 +++- .../include/java/InputOutputStream/DataInputStream.h | 3 +-- .../java/include/java/InputOutputStream/DataOutput.h | 4 +++- .../include/java/InputOutputStream/DataOutputStream.h | 3 --- .../include/java/InputOutputStream/FileInputStream.h | 2 -- .../include/java/InputOutputStream/FileOutputStream.h | 2 -- .../include/java/InputOutputStream/GZIPInputStream.h | 2 -- .../include/java/InputOutputStream/GZIPOutputStream.h | 2 -- .../java/include/java/InputOutputStream/InputStream.h | 3 +-- .../java/include/java/InputOutputStream/OutputStream.h | 2 -- minecraft/java/include/java/IntBuffer.h | 3 ++- minecraft/java/src/Buffer.cpp | 1 + minecraft/java/src/ByteBuffer.cpp | 8 ++++++++ minecraft/java/src/File.cpp | 7 ++++++- minecraft/java/src/FloatBuffer.cpp | 5 +++++ .../src/InputOutputStream/BufferedOutputStream.cpp | 4 ++++ .../java/src/InputOutputStream/BufferedReader.cpp | 3 +++ .../src/InputOutputStream/ByteArrayInputStream.cpp | 8 +++++++- .../src/InputOutputStream/ByteArrayOutputStream.cpp | 4 ++++ .../java/src/InputOutputStream/DataInputStream.cpp | 4 ++++ .../java/src/InputOutputStream/DataOutputStream.cpp | 4 ++++ .../java/src/InputOutputStream/FileInputStream.cpp | 10 ++++++++-- minecraft/java/src/InputOutputStream/InputStream.cpp | 4 +++- .../java/src/InputOutputStream/InputStreamReader.cpp | 3 ++- minecraft/java/src/IntBuffer.cpp | 6 ++++++ minecraft/java/src/system.cpp | 10 +++++++++- minecraft/nbt/include/nbt/ListTag.h | 1 + 32 files changed, 100 insertions(+), 30 deletions(-) diff --git a/minecraft/java/include/java/FloatBuffer.h b/minecraft/java/include/java/FloatBuffer.h index 05e6a2b05..302992c5c 100644 --- a/minecraft/java/include/java/FloatBuffer.h +++ b/minecraft/java/include/java/FloatBuffer.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Buffer.h" #include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO diff --git a/minecraft/java/include/java/InputOutputStream/BufferedOutputStream.h b/minecraft/java/include/java/InputOutputStream/BufferedOutputStream.h index 5d39bab29..c6075b146 100644 --- a/minecraft/java/include/java/InputOutputStream/BufferedOutputStream.h +++ b/minecraft/java/include/java/InputOutputStream/BufferedOutputStream.h @@ -1,7 +1,11 @@ #pragma once +#include +#include +#include +#include + #include "OutputStream.h" -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO class BufferedOutputStream : public OutputStream { private: diff --git a/minecraft/java/include/java/InputOutputStream/BufferedReader.h b/minecraft/java/include/java/InputOutputStream/BufferedReader.h index 85f004af2..88e877806 100644 --- a/minecraft/java/include/java/InputOutputStream/BufferedReader.h +++ b/minecraft/java/include/java/InputOutputStream/BufferedReader.h @@ -2,6 +2,8 @@ #include "Reader.h" +#include + class BufferedReader : public Reader { private: Reader* reader; diff --git a/minecraft/java/include/java/InputOutputStream/ByteArrayInputStream.h b/minecraft/java/include/java/InputOutputStream/ByteArrayInputStream.h index 467286eee..d796aaeb2 100644 --- 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 +#include + #include "InputStream.h" -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO class ByteArrayInputStream : public InputStream { protected: diff --git a/minecraft/java/include/java/InputOutputStream/ByteArrayOutputStream.h b/minecraft/java/include/java/InputOutputStream/ByteArrayOutputStream.h index 7871b34b9..befa23423 100644 --- 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 +#include class ByteArrayOutputStream : public OutputStream { // Note - when actually implementing, std::vector will need to grow as data is diff --git a/minecraft/java/include/java/InputOutputStream/DataInput.h b/minecraft/java/include/java/InputOutputStream/DataInput.h index dd7c46ca1..cff082cf8 100644 --- 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 +#include +#include class DataInput { public: diff --git a/minecraft/java/include/java/InputOutputStream/DataInputStream.h b/minecraft/java/include/java/InputOutputStream/DataInputStream.h index c1ee1ed00..90d94313a 100644 --- 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 +#include #include "InputStream.h" #include "DataInput.h" -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO - class DataInputStream : public InputStream, public DataInput { private: InputStream* stream; diff --git a/minecraft/java/include/java/InputOutputStream/DataOutput.h b/minecraft/java/include/java/InputOutputStream/DataOutput.h index 8071f4a25..b0d61072d 100644 --- 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 +#include +#include class DataOutput { public: diff --git a/minecraft/java/include/java/InputOutputStream/DataOutputStream.h b/minecraft/java/include/java/InputOutputStream/DataOutputStream.h index 6b93c7aef..72568ca08 100644 --- a/minecraft/java/include/java/InputOutputStream/DataOutputStream.h +++ b/minecraft/java/include/java/InputOutputStream/DataOutputStream.h @@ -4,9 +4,6 @@ #include -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO - - #include "OutputStream.h" #include "DataOutput.h" diff --git a/minecraft/java/include/java/InputOutputStream/FileInputStream.h b/minecraft/java/include/java/InputOutputStream/FileInputStream.h index 7e41996ab..b474044b5 100644 --- a/minecraft/java/include/java/InputOutputStream/FileInputStream.h +++ b/minecraft/java/include/java/InputOutputStream/FileInputStream.h @@ -4,8 +4,6 @@ #include #include -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO - #include "InputStream.h" class File; diff --git a/minecraft/java/include/java/InputOutputStream/FileOutputStream.h b/minecraft/java/include/java/InputOutputStream/FileOutputStream.h index 1ceb3cbc1..52b349db0 100644 --- a/minecraft/java/include/java/InputOutputStream/FileOutputStream.h +++ b/minecraft/java/include/java/InputOutputStream/FileOutputStream.h @@ -3,8 +3,6 @@ #include -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO - #include "OutputStream.h" class File; diff --git a/minecraft/java/include/java/InputOutputStream/GZIPInputStream.h b/minecraft/java/include/java/InputOutputStream/GZIPInputStream.h index 0c5887d39..c1179cafb 100644 --- a/minecraft/java/include/java/InputOutputStream/GZIPInputStream.h +++ b/minecraft/java/include/java/InputOutputStream/GZIPInputStream.h @@ -4,8 +4,6 @@ #include -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO - #include "InputStream.h" class GZIPInputStream : public InputStream { diff --git a/minecraft/java/include/java/InputOutputStream/GZIPOutputStream.h b/minecraft/java/include/java/InputOutputStream/GZIPOutputStream.h index 64bd9d814..988475484 100644 --- 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 { diff --git a/minecraft/java/include/java/InputOutputStream/InputStream.h b/minecraft/java/include/java/InputOutputStream/InputStream.h index c10940f91..ce91ba661 100644 --- a/minecraft/java/include/java/InputOutputStream/InputStream.h +++ b/minecraft/java/include/java/InputOutputStream/InputStream.h @@ -1,10 +1,9 @@ #pragma once +#include #include #include -#include "../../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO - // 4J Stu - Represents Java standard lib abstract class InputStream { diff --git a/minecraft/java/include/java/InputOutputStream/OutputStream.h b/minecraft/java/include/java/InputOutputStream/OutputStream.h index 78435a7a4..b56c1443d 100644 --- 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 { diff --git a/minecraft/java/include/java/IntBuffer.h b/minecraft/java/include/java/IntBuffer.h index 24aa80185..aaf34aa29 100644 --- 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 +#include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO #include "Buffer.h" class IntBuffer : public Buffer { diff --git a/minecraft/java/src/Buffer.cpp b/minecraft/java/src/Buffer.cpp index c877758eb..97113de22 100644 --- a/minecraft/java/src/Buffer.cpp +++ b/minecraft/java/src/Buffer.cpp @@ -1,4 +1,5 @@ #include "java/Buffer.h" +#include Buffer::Buffer(unsigned int capacity) : m_capacity(capacity), diff --git a/minecraft/java/src/ByteBuffer.cpp b/minecraft/java/src/ByteBuffer.cpp index 8da4c0d3c..3523173a5 100644 --- a/minecraft/java/src/ByteBuffer.cpp +++ b/minecraft/java/src/ByteBuffer.cpp @@ -1,7 +1,15 @@ +#include +#include +#include +#include +#include + #include "java/IntBuffer.h" #include "java/FloatBuffer.h" #include "java/ByteBuffer.h" +#include "/home/tropical/Documents/GitHub/4jcraft/minecraft/Minecraft.World/ConsoleHelpers/Definitions.h" +#include "java/Buffer.h" ByteBuffer::ByteBuffer(unsigned int capacity) : Buffer(capacity) { hasBackingArray = false; diff --git a/minecraft/java/src/File.cpp b/minecraft/java/src/File.cpp index d627aea4b..bc5f31e97 100644 --- a/minecraft/java/src/File.cpp +++ b/minecraft/java/src/File.cpp @@ -1,9 +1,14 @@ +#include +#include +#include #include #include +#include +#include +#include #include "java/FileFilter.h" #include "java/File.h" - #include "../../Minecraft.World/ConsoleHelpers/PathHelper.h" // 4jcraft TODO #include "../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO diff --git a/minecraft/java/src/FloatBuffer.cpp b/minecraft/java/src/FloatBuffer.cpp index 4e22783df..fbe3cdf0f 100644 --- a/minecraft/java/src/FloatBuffer.cpp +++ b/minecraft/java/src/FloatBuffer.cpp @@ -1,5 +1,10 @@ #include "java/FloatBuffer.h" +#include +#include + +#include "java/Buffer.h" + // Allocates a new float buffer. // The new buffer's position will be zero, its limit will be its capacity, and // its mark will be undefined. It will have a backing array, and its array diff --git a/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp b/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp index 2d5657cbd..fa867d963 100644 --- a/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp +++ b/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp @@ -1,5 +1,9 @@ #include "java/InputOutputStream/BufferedOutputStream.h" +#include + +#include "java/InputOutputStream/OutputStream.h" + // Creates a new buffered output stream to write data to the specified // underlying output stream with the specified buffer size. Parameters: out - // the underlying output stream. size - the buffer size. diff --git a/minecraft/java/src/InputOutputStream/BufferedReader.cpp b/minecraft/java/src/InputOutputStream/BufferedReader.cpp index c9794f1ec..986dbe466 100644 --- a/minecraft/java/src/InputOutputStream/BufferedReader.cpp +++ b/minecraft/java/src/InputOutputStream/BufferedReader.cpp @@ -1,5 +1,8 @@ #include "java/InputOutputStream/BufferedReader.h" +#include +#include + // Creates a buffering character-input stream that uses a default-sized input // buffer. Parameters: in - A Reader BufferedReader::BufferedReader(Reader* in) diff --git a/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp b/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp index 9e9d833d7..b2b62b3f3 100644 --- a/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp +++ b/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp @@ -1,4 +1,3 @@ -#include "java/InputOutputStream/InputOutputStream.h" // Creates ByteArrayInputStream that uses buf as its buffer array. The initial // value of pos is offset and the initial value of count is the minimum of @@ -6,6 +5,13 @@ // mark is set to the specified offset. Parameters: buf - the input buffer. // offset - the offset in the buffer of the first byte to read. // length - the maximum number of bytes to read from the buffer. +#include +#include +#include +#include + +#include "java/InputOutputStream/ByteArrayInputStream.h" + ByteArrayInputStream::ByteArrayInputStream(std::vector& buf, unsigned int offset, unsigned int length) : pos(offset), count(std::min(offset + length, (unsigned int)buf.size())), mark(offset) { diff --git a/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp b/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp index ff19d469c..2d5b77c35 100644 --- a/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp +++ b/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp @@ -1,5 +1,9 @@ #include "java/InputOutputStream/ByteArrayOutputStream.h" +#include +#include +#include + // Creates a new byte array output stream. The buffer capacity is initially 32 // bytes, though its size increases if necessary. ByteArrayOutputStream::ByteArrayOutputStream() { diff --git a/minecraft/java/src/InputOutputStream/DataInputStream.cpp b/minecraft/java/src/InputOutputStream/DataInputStream.cpp index ccf52e35c..4060db9b2 100644 --- a/minecraft/java/src/InputOutputStream/DataInputStream.cpp +++ b/minecraft/java/src/InputOutputStream/DataInputStream.cpp @@ -1,7 +1,11 @@ +#include #include #include +#include +#include #include "java/InputOutputStream/DataInputStream.h" +#include "java/InputOutputStream/InputStream.h" // Creates a DataInputStream that uses the specified underlying InputStream. // Parameters: diff --git a/minecraft/java/src/InputOutputStream/DataOutputStream.cpp b/minecraft/java/src/InputOutputStream/DataOutputStream.cpp index 1c80338b2..3b45c5570 100644 --- a/minecraft/java/src/InputOutputStream/DataOutputStream.cpp +++ b/minecraft/java/src/InputOutputStream/DataOutputStream.cpp @@ -1,7 +1,11 @@ +#include #include #include +#include +#include #include "java/InputOutputStream/DataOutputStream.h" +#include "java/InputOutputStream/OutputStream.h" // Creates a new data output stream to write data to the specified underlying // output stream. The counter written is set to zero. Parameters: out - the diff --git a/minecraft/java/src/InputOutputStream/FileInputStream.cpp b/minecraft/java/src/InputOutputStream/FileInputStream.cpp index 12c74e654..c923299b2 100644 --- a/minecraft/java/src/InputOutputStream/FileInputStream.cpp +++ b/minecraft/java/src/InputOutputStream/FileInputStream.cpp @@ -1,8 +1,14 @@ +#include +#include +#include +#include +#include +#include +#include + #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" -#include - #include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h" namespace { diff --git a/minecraft/java/src/InputOutputStream/InputStream.cpp b/minecraft/java/src/InputOutputStream/InputStream.cpp index 80706f628..a6ef244ca 100644 --- a/minecraft/java/src/InputOutputStream/InputStream.cpp +++ b/minecraft/java/src/InputOutputStream/InputStream.cpp @@ -1,6 +1,8 @@ +#include + #include "java/File.h" -#include "java/InputOutputStream/InputOutputStream.h" #include "java/InputOutputStream/InputStream.h" +#include "java/InputOutputStream/FileInputStream.h" InputStream* InputStream::getResourceAsStream(const std::wstring& fileName) { File file(fileName); diff --git a/minecraft/java/src/InputOutputStream/InputStreamReader.cpp b/minecraft/java/src/InputOutputStream/InputStreamReader.cpp index 49cee3827..74bba0c12 100644 --- a/minecraft/java/src/InputOutputStream/InputStreamReader.cpp +++ b/minecraft/java/src/InputOutputStream/InputStreamReader.cpp @@ -1,7 +1,8 @@ -#include "java/InputOutputStream/InputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/InputStreamReader.h" +class InputStream; + // Creates an InputStreamReader that uses the default charset. // Parameters: // in - An InputStream diff --git a/minecraft/java/src/IntBuffer.cpp b/minecraft/java/src/IntBuffer.cpp index b96570be0..88007731d 100644 --- a/minecraft/java/src/IntBuffer.cpp +++ b/minecraft/java/src/IntBuffer.cpp @@ -1,5 +1,11 @@ #include "java/IntBuffer.h" +#include +#include +#include + +#include "java/Buffer.h" + // Allocates a new int buffer. // The new buffer's position will be zero, its limit will be its capacity, and // its mark will be undefined. It will have a backing array, and its array diff --git a/minecraft/java/src/system.cpp b/minecraft/java/src/system.cpp index 6bd41260f..584b354c9 100644 --- a/minecraft/java/src/system.cpp +++ b/minecraft/java/src/system.cpp @@ -1,11 +1,19 @@ #if defined(__linux__) #include #include -#include #endif +#include +#include +#include +#include +#include + #include "java/System.h" +class Biome; +class Node; + template void System::arraycopy(const std::vector& src, unsigned int srcPos, std::vector* dst, unsigned int dstPos, diff --git a/minecraft/nbt/include/nbt/ListTag.h b/minecraft/nbt/include/nbt/ListTag.h index 62a2e193e..073d7be8e 100644 --- a/minecraft/nbt/include/nbt/ListTag.h +++ b/minecraft/nbt/include/nbt/ListTag.h @@ -3,6 +3,7 @@ #include #include +#include template class ListTag : public Tag {