From 0817878fe1d4325d3a0ff08f252a5e764caa3449 Mon Sep 17 00:00:00 2001
From: Tropical <42101043+tropicaaal@users.noreply.github.com>
Date: Mon, 30 Mar 2026 15:47:05 -0500
Subject: [PATCH] refactor: consistent include paths in java/nbt

---
 minecraft/java/src/Buffer.cpp                 |  2 +-
 minecraft/java/src/ByteBuffer.cpp             |  6 ++---
 minecraft/java/src/Class.cpp                  |  2 +-
 minecraft/java/src/Color.cpp                  |  2 +-
 minecraft/java/src/File.cpp                   | 10 +++----
 minecraft/java/src/FloatBuffer.cpp            |  2 +-
 .../BufferedOutputStream.cpp                  |  2 +-
 .../src/InputOutputStream/BufferedReader.cpp  |  2 +-
 .../ByteArrayInputStream.cpp                  |  2 +-
 .../ByteArrayOutputStream.cpp                 |  2 +-
 .../src/InputOutputStream/DataInputStream.cpp |  3 ++-
 .../InputOutputStream/DataOutputStream.cpp    |  4 +--
 .../src/InputOutputStream/FileInputStream.cpp |  4 +--
 .../InputOutputStream/FileOutputStream.cpp    |  6 ++---
 .../src/InputOutputStream/InputStream.cpp     |  6 ++---
 .../InputOutputStream/InputStreamReader.cpp   |  7 +++--
 minecraft/java/src/IntBuffer.cpp              |  3 +--
 minecraft/java/src/JavaMath.cpp               |  2 +-
 minecraft/java/src/Random.cpp                 |  5 ++--
 minecraft/java/src/system.cpp                 |  3 ++-
 minecraft/nbt/meson.build                     |  2 +-
 minecraft/nbt/src/NbtIo.cpp                   |  2 +-
 minecraft/nbt/src/Tag.cpp                     | 26 +++++++++----------
 23 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/minecraft/java/src/Buffer.cpp b/minecraft/java/src/Buffer.cpp
index 814f42485..c877758eb 100644
--- a/minecraft/java/src/Buffer.cpp
+++ b/minecraft/java/src/Buffer.cpp
@@ -1,4 +1,4 @@
-#include "Buffer.h"
+#include "java/Buffer.h"
 
 Buffer::Buffer(unsigned int capacity)
     : m_capacity(capacity),
diff --git a/minecraft/java/src/ByteBuffer.cpp b/minecraft/java/src/ByteBuffer.cpp
index 73417a5ea..8151b67a0 100644
--- a/minecraft/java/src/ByteBuffer.cpp
+++ b/minecraft/java/src/ByteBuffer.cpp
@@ -1,7 +1,7 @@
 
-#include "IntBuffer.h"
-#include "FloatBuffer.h"
-#include "ByteBuffer.h"
+#include "java/IntBuffer.h"
+#include "java/FloatBuffer.h"
+#include "java/ByteBuffer.h"
 
 ByteBuffer::ByteBuffer(unsigned int capacity) : Buffer(capacity) {
     hasBackingArray = false;
diff --git a/minecraft/java/src/Class.cpp b/minecraft/java/src/Class.cpp
index 40cea335a..b16d39442 100644
--- a/minecraft/java/src/Class.cpp
+++ b/minecraft/java/src/Class.cpp
@@ -1,4 +1,4 @@
-#include "Class.h"
+#include "java/Class.h"
 
 // 4J Stu - To ensure that other classes can get the _class object of it's
 // superclass, we also need the BaseObject to have that member
diff --git a/minecraft/java/src/Color.cpp b/minecraft/java/src/Color.cpp
index 9b75c2dce..2d454de2a 100644
--- a/minecraft/java/src/Color.cpp
+++ b/minecraft/java/src/Color.cpp
@@ -1,7 +1,7 @@
 #include <cassert>
 #include <cmath>
 
-#include "Color.h"
+#include "java/Color.h"
 
 // Creates an opaque sRGB color with the specified red, green, and blue values
 // in the range (0.0 - 1.0). Alpha is defaulted to 1.0. The actual color used in
diff --git a/minecraft/java/src/File.cpp b/minecraft/java/src/File.cpp
index be99fca50..f3b54958e 100644
--- a/minecraft/java/src/File.cpp
+++ b/minecraft/java/src/File.cpp
@@ -1,12 +1,12 @@
-#include "FileFilter.h"
-#include "File.h"
+#include <chrono>
+#include <filesystem>
+
+#include "java/FileFilter.h"
+#include "java/File.h"
 
 #include "../../../Minecraft.World/ConsoleHelpers/PathHelper.h" // 4jcraft TODO
 #include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO
 
-#include <chrono>
-#include <filesystem>
-
 const wchar_t File::pathSeparator = L'/';
 
 const std::wstring File::pathRoot =
diff --git a/minecraft/java/src/FloatBuffer.cpp b/minecraft/java/src/FloatBuffer.cpp
index 3cdc576f8..cc827d751 100644
--- a/minecraft/java/src/FloatBuffer.cpp
+++ b/minecraft/java/src/FloatBuffer.cpp
@@ -1,4 +1,4 @@
-#include "FloatBuffer.h"
+#include "java/FloatBuffer.h"
 
 // Allocates a new float buffer.
 // The new buffer's position will be zero, its limit will be its capacity, and
diff --git a/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp b/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp
index 9815e9541..8d22850a4 100644
--- a/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/BufferedOutputStream.cpp
@@ -1,4 +1,4 @@
-#include "InputOutputStream/BufferedOutputStream.h"
+#include "java/InputOutputStream/BufferedOutputStream.h"
 
 // Creates a new buffered output stream to write data to the specified
 // underlying output stream with the specified buffer size. Parameters: out -
diff --git a/minecraft/java/src/InputOutputStream/BufferedReader.cpp b/minecraft/java/src/InputOutputStream/BufferedReader.cpp
index f7298c461..c9794f1ec 100644
--- a/minecraft/java/src/InputOutputStream/BufferedReader.cpp
+++ b/minecraft/java/src/InputOutputStream/BufferedReader.cpp
@@ -1,4 +1,4 @@
-#include "InputOutputStream/BufferedReader.h"
+#include "java/InputOutputStream/BufferedReader.h"
 
 // Creates a buffering character-input stream that uses a default-sized input
 // buffer. Parameters: in - A Reader
diff --git a/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp b/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp
index 71edab8d6..63a49487b 100644
--- a/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/ByteArrayInputStream.cpp
@@ -1,4 +1,4 @@
-#include "InputOutputStream/InputOutputStream.h"
+#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
diff --git a/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp b/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp
index 41f8460dc..0fe530c4a 100644
--- a/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/ByteArrayOutputStream.cpp
@@ -1,4 +1,4 @@
-#include "InputOutputStream/ByteArrayOutputStream.h"
+#include "java/InputOutputStream/ByteArrayOutputStream.h"
 
 // Creates a new byte array output stream. The buffer capacity is initially 32
 // bytes, though its size increases if necessary.
diff --git a/minecraft/java/src/InputOutputStream/DataInputStream.cpp b/minecraft/java/src/InputOutputStream/DataInputStream.cpp
index 308c926d6..316cfaf7a 100644
--- a/minecraft/java/src/InputOutputStream/DataInputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/DataInputStream.cpp
@@ -1,7 +1,8 @@
-#include "InputOutputStream/DataInputStream.h"
 #include <bit>
 #include <cstdint>
 
+#include "java/InputOutputStream/DataInputStream.h"
+
 // Creates a DataInputStream that uses the specified underlying InputStream.
 // Parameters:
 // in - the specified input stream
diff --git a/minecraft/java/src/InputOutputStream/DataOutputStream.cpp b/minecraft/java/src/InputOutputStream/DataOutputStream.cpp
index c087ab108..1d27b45e1 100644
--- a/minecraft/java/src/InputOutputStream/DataOutputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/DataOutputStream.cpp
@@ -1,8 +1,8 @@
-
-#include "InputOutputStream/DataOutputStream.h"
 #include <bit>
 #include <cstdint>
 
+#include "java/InputOutputStream/DataOutputStream.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
 // underlying output stream, to be saved for later use.
diff --git a/minecraft/java/src/InputOutputStream/FileInputStream.cpp b/minecraft/java/src/InputOutputStream/FileInputStream.cpp
index 33d3325fd..c4b9d7dfd 100644
--- a/minecraft/java/src/InputOutputStream/FileInputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/FileInputStream.cpp
@@ -1,6 +1,6 @@
 
-#include "File.h"
-#include "InputOutputStream/FileInputStream.h"
+#include "java/File.h"
+#include "java/InputOutputStream/FileInputStream.h"
 #include <algorithm>
 
 #include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
diff --git a/minecraft/java/src/InputOutputStream/FileOutputStream.cpp b/minecraft/java/src/InputOutputStream/FileOutputStream.cpp
index b4ef858c6..23294e1eb 100644
--- a/minecraft/java/src/InputOutputStream/FileOutputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/FileOutputStream.cpp
@@ -1,8 +1,8 @@
-#include "File.h"
-#include "InputOutputStream/FileOutputStream.h"
-
 #include "../../../Minecraft.World/ConsoleHelpers/ArrayWithLength.h" // 4jcraft TODO
 
+#include "java/File.h"
+#include "java/InputOutputStream/FileOutputStream.h"
+
 // Creates a file output stream to write to the file represented by the
 // specified File object. A new FileDescriptor object is created to represent
 // this file connection. First, if there is a security manager, its checkWrite
diff --git a/minecraft/java/src/InputOutputStream/InputStream.cpp b/minecraft/java/src/InputOutputStream/InputStream.cpp
index d3e1ae195..80706f628 100644
--- a/minecraft/java/src/InputOutputStream/InputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/InputStream.cpp
@@ -1,6 +1,6 @@
-#include "File.h"
-#include "InputOutputStream/InputOutputStream.h"
-#include "InputOutputStream/InputStream.h"
+#include "java/File.h"
+#include "java/InputOutputStream/InputOutputStream.h"
+#include "java/InputOutputStream/InputStream.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 4255bbc5d..49cee3827 100644
--- a/minecraft/java/src/InputOutputStream/InputStreamReader.cpp
+++ b/minecraft/java/src/InputOutputStream/InputStreamReader.cpp
@@ -1,7 +1,6 @@
-
-#include "InputOutputStream/InputStream.h"
-#include "InputOutputStream/DataInputStream.h"
-#include "InputOutputStream/InputStreamReader.h"
+#include "java/InputOutputStream/InputStream.h"
+#include "java/InputOutputStream/DataInputStream.h"
+#include "java/InputOutputStream/InputStreamReader.h"
 
 // Creates an InputStreamReader that uses the default charset.
 // Parameters:
diff --git a/minecraft/java/src/IntBuffer.cpp b/minecraft/java/src/IntBuffer.cpp
index ccab18458..15b90caaa 100644
--- a/minecraft/java/src/IntBuffer.cpp
+++ b/minecraft/java/src/IntBuffer.cpp
@@ -1,5 +1,4 @@
-
-#include "IntBuffer.h"
+#include "java/IntBuffer.h"
 
 // Allocates a new int buffer.
 // The new buffer's position will be zero, its limit will be its capacity, and
diff --git a/minecraft/java/src/JavaMath.cpp b/minecraft/java/src/JavaMath.cpp
index b39020c45..0e2c50b5b 100644
--- a/minecraft/java/src/JavaMath.cpp
+++ b/minecraft/java/src/JavaMath.cpp
@@ -1,4 +1,4 @@
-#include "JavaMath.h"
+#include "java/JavaMath.h"
 
 #include <cmath>
 
diff --git a/minecraft/java/src/Random.cpp b/minecraft/java/src/Random.cpp
index 3e828db54..fd133ee81 100644
--- a/minecraft/java/src/Random.cpp
+++ b/minecraft/java/src/Random.cpp
@@ -1,7 +1,8 @@
-#include "Random.h"
 #include <ctime>
 #include <cstdint>  // for int64_t
-#include "System.h"
+
+#include "java/System.h"
+#include "java/Random.h"
 
 Random::Random() {
     // 4J - jave now uses the system nanosecond counter added to a
diff --git a/minecraft/java/src/system.cpp b/minecraft/java/src/system.cpp
index bf24d084d..5bd9b30d0 100644
--- a/minecraft/java/src/system.cpp
+++ b/minecraft/java/src/system.cpp
@@ -1,10 +1,11 @@
-#include "System.h"
 #if defined(__linux__)
 #include <sys/time.h>
 #include <time.h>
 #include <ctime>
 #endif
 
+#include "java/System.h"
+
 template <class T>
 void System::arraycopy(arrayWithLength<T> src, unsigned int srcPos,
                        arrayWithLength<T>* dst, unsigned int dstPos,
diff --git a/minecraft/nbt/meson.build b/minecraft/nbt/meson.build
index 893a82c6b..64c78e2cd 100644
--- a/minecraft/nbt/meson.build
+++ b/minecraft/nbt/meson.build
@@ -6,7 +6,7 @@ nbt_sources = files(
 lib_nbt = static_library('nbt',
   nbt_sources,
   dependencies: [java_dep],
-  include_directories : include_directories('include/nbt'),
+  include_directories : include_directories('include'),
   cpp_args : global_cpp_args + global_cpp_defs,
 )
 
diff --git a/minecraft/nbt/src/NbtIo.cpp b/minecraft/nbt/src/NbtIo.cpp
index 568b4ed3b..c26c76aa9 100644
--- a/minecraft/nbt/src/NbtIo.cpp
+++ b/minecraft/nbt/src/NbtIo.cpp
@@ -1,5 +1,5 @@
 #include "java/InputOutputStream/InputOutputStream.h"
-#include "NbtIo.h"
+#include "nbt/NbtIo.h"
 
 CompoundTag* NbtIo::readCompressed(InputStream* in) {
     // MemSect(26);
diff --git a/minecraft/nbt/src/Tag.cpp b/minecraft/nbt/src/Tag.cpp
index a7ce5f6f2..ab2264f4d 100644
--- a/minecraft/nbt/src/Tag.cpp
+++ b/minecraft/nbt/src/Tag.cpp
@@ -1,18 +1,18 @@
-#include "Tag.h"
-#include "EndTag.h"
-#include "ByteTag.h"
-#include "ByteArrayTag.h"
-#include "DoubleTag.h"
-#include "FloatTag.h"
-#include "IntTag.h"
-#include "LongTag.h"
-#include "ShortTag.h"
-#include "StringTag.h"
-#include "ListTag.h"
-#include "CompoundTag.h"
-
 #include <cstdio>
 
+#include "nbt/Tag.h"
+#include "nbt/EndTag.h"
+#include "nbt/ByteTag.h"
+#include "nbt/ByteArrayTag.h"
+#include "nbt/DoubleTag.h"
+#include "nbt/FloatTag.h"
+#include "nbt/IntTag.h"
+#include "nbt/LongTag.h"
+#include "nbt/ShortTag.h"
+#include "nbt/StringTag.h"
+#include "nbt/ListTag.h"
+#include "nbt/CompoundTag.h"
+
 Tag::Tag(const std::wstring& name) {
     if (name.empty()) {
         this->name = L"";