From 69c418213e0d0f92bafcbc07e76dd15b55d1c0ea Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Thu, 9 Apr 2026 23:39:33 -0500 Subject: [PATCH] nuke util/Definitions.h --- targets/minecraft/client/renderer/LevelRenderer.h | 1 - targets/minecraft/world/level/chunk/CompressedTileStorage.cpp | 1 - .../minecraft/world/level/chunk/storage/OldChunkStorage.cpp | 3 ++- .../level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h | 1 - .../level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h | 1 - .../world/level/storage/ConsoleSaveFileIO/FileHeader.cpp | 1 - targets/util/Definitions.h | 3 --- 7 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 targets/util/Definitions.h diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index aa5baa062..233cd38bd 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -8,7 +8,6 @@ #include "minecraft/world/phys/AABB.h" #include "platform/C4JThread.h" #include "platform/network/NetTypes.h" -#include "util/Definitions.h" class ClipChunk; class HitResult; diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp index 32f9081c2..0e3285bfc 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -12,7 +12,6 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" #include "platform/network/NetTypes.h" -#include "util/Definitions.h" // Note: See header for an overview of this class diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index 87a467c7c..9105ad805 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -31,7 +31,6 @@ #include "nbt/ListTag.h" #include "nbt/NbtIo.h" #include "platform/input/input.h" -#include "util/Definitions.h" thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage = nullptr; @@ -97,6 +96,8 @@ void to_base36(int value, char* buf) { } File OldChunkStorage::getFile(int x, int z) { + inline constexpr int MAX_PATH_SIZE = 256; + char name[MAX_PATH_SIZE]; char path1[MAX_PATH_SIZE]; char path2[MAX_PATH_SIZE]; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h index af1771527..aac482dea 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h @@ -7,7 +7,6 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "util/Definitions.h" class ConsoleSaveFileOriginal : public ConsoleSaveFile { private: diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h index a62d12407..cb7e635a6 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h @@ -8,7 +8,6 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "util/Definitions.h" class ProgressRenderer; class ProgressListener; diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 8d00295ad..cbac4d7de 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -12,7 +12,6 @@ #include "java/System.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" -#include "util/Definitions.h" FileHeader::FileHeader() { lastFile = nullptr; diff --git a/targets/util/Definitions.h b/targets/util/Definitions.h deleted file mode 100644 index b02596765..000000000 --- a/targets/util/Definitions.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -inline constexpr int MAX_PATH_SIZE = 256;