From 50fdbeea804a64392eda71819f7950b75419f1b4 Mon Sep 17 00:00:00 2001
From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com>
Date: Wed, 8 Apr 2026 21:36:23 +1000
Subject: [PATCH] refactor: move Minecraft_Macros.h into minecraft

---
 targets/app/common/DLC/DLCFile.cpp                              | 2 +-
 targets/app/common/Game.cpp                                     | 2 +-
 targets/app/common/SkinManager.cpp                              | 2 +-
 .../common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp  | 2 +-
 targets/{app/common => minecraft}/Minecraft_Macros.h            | 0
 targets/minecraft/client/Minecraft.cpp                          | 2 +-
 .../minecraft/network/packet/TextureAndGeometryChangePacket.cpp | 2 +-
 targets/minecraft/network/packet/TextureAndGeometryPacket.cpp   | 2 +-
 targets/minecraft/world/entity/player/Player.cpp                | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename targets/{app/common => minecraft}/Minecraft_Macros.h (100%)

diff --git a/targets/app/common/DLC/DLCFile.cpp b/targets/app/common/DLC/DLCFile.cpp
index 378bb6403..ecb33974a 100644
--- a/targets/app/common/DLC/DLCFile.cpp
+++ b/targets/app/common/DLC/DLCFile.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "app/common/DLC/DLCManager.h"
 
 DLCFile::DLCFile(DLCManager::EDLCType type, const std::string& path) {
diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp
index 69dfb69b2..28eaa47bb 100644
--- a/targets/app/common/Game.cpp
+++ b/targets/app/common/Game.cpp
@@ -79,7 +79,7 @@
 #include "minecraft/locale/StringTable.h"
 #include "app/common/UI/All Platforms/ArchiveFile.h"
 #include "app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
-#include "Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "util/Timer.h"
 #include "util/StringHelpers.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
diff --git a/targets/app/common/SkinManager.cpp b/targets/app/common/SkinManager.cpp
index c5c2e0282..851f2f70b 100644
--- a/targets/app/common/SkinManager.cpp
+++ b/targets/app/common/SkinManager.cpp
@@ -9,7 +9,7 @@
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/DLC/DLCSkinFile.h"
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "app/linux/LinuxGame.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/model/geom/Model.h"
diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
index 2312fda10..2d8b03101 100644
--- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
@@ -8,7 +8,7 @@
 #include "platform/profile/profile.h"
 #include "platform/renderer/renderer.h"
 #include "platform/profile/ProfileConstants.h"
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/DLC/DLCSkinFile.h"
diff --git a/targets/app/common/Minecraft_Macros.h b/targets/minecraft/Minecraft_Macros.h
similarity index 100%
rename from targets/app/common/Minecraft_Macros.h
rename to targets/minecraft/Minecraft_Macros.h
diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp
index 04621cdfe..fb6bac1d1 100644
--- a/targets/minecraft/client/Minecraft.cpp
+++ b/targets/minecraft/client/Minecraft.cpp
@@ -107,7 +107,7 @@
 #include "minecraft/client/resources/Colours/ColourTable.h"
 #include "app/common/ConsoleGameMode.h"
 #include "app/common/DLC/DLCPack.h"
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "app/common/Tutorial/FullTutorialMode.h"
 #include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "app/common/UI/UIFontData.h"
diff --git a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp
index 65066922f..8b0834ed3 100644
--- a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp
+++ b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp
index 40cb83761..3fe50e8b3 100644
--- a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp
+++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <vector>
 
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "app/common/DLC/DLCSkinFile.h"
 #include "PacketListener.h"
 #include "java/InputOutputStream/DataInputStream.h"
diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp
index e6477a1c3..319462fb7 100644
--- a/targets/minecraft/world/entity/player/Player.cpp
+++ b/targets/minecraft/world/entity/player/Player.cpp
@@ -24,7 +24,7 @@
 #include "Inventory.h"
 #include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
-#include "app/common/Minecraft_Macros.h"
+#include "minecraft/Minecraft_Macros.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCSkinFile.h"
 #include "app/linux/LinuxGame.h"