From a3b8adeb5a156a3378db5f0a1a1bbe5cd300dc76 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Wed, 8 Apr 2026 21:22:09 +1000 Subject: [PATCH] refactor: move Console_Debug_enum.h into minecraft --- targets/app/common/DLC/DLCPack.cpp | 2 +- targets/app/common/DebugOptions.h | 2 +- targets/app/common/Game.cpp | 2 +- targets/app/common/GameSettingsManager.cpp | 2 +- targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp | 2 +- targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp | 2 +- targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h | 2 +- .../Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp | 2 +- .../UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp | 2 +- targets/{app/common => minecraft}/Console_Debug_enum.h | 0 targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp | 2 +- targets/minecraft/client/renderer/LevelRenderer.cpp | 2 +- targets/minecraft/server/MinecraftServer.cpp | 2 +- targets/minecraft/server/level/ServerLevel.cpp | 2 +- targets/minecraft/server/level/ServerPlayer.cpp | 2 +- targets/minecraft/server/network/PlayerConnection.cpp | 2 +- targets/minecraft/world/item/PlanterTileItem.cpp | 2 +- targets/minecraft/world/item/TileItem.cpp | 2 +- targets/minecraft/world/level/Level.cpp | 2 +- targets/minecraft/world/level/biome/BiomeSource.cpp | 2 +- .../world/level/chunk/storage/McRegionChunkStorage.cpp | 2 +- targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp | 2 +- targets/minecraft/world/level/dimension/Dimension.cpp | 2 +- targets/minecraft/world/level/dimension/HellDimension.cpp | 2 +- targets/minecraft/world/level/newbiome/layer/Layer.cpp | 2 +- targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp | 2 +- 27 files changed, 26 insertions(+), 26 deletions(-) rename targets/{app/common => minecraft}/Console_Debug_enum.h (100%) diff --git a/targets/app/common/DLC/DLCPack.cpp b/targets/app/common/DLC/DLCPack.cpp index 4660e6b0a..15b1a6c81 100644 --- a/targets/app/common/DLC/DLCPack.cpp +++ b/targets/app/common/DLC/DLCPack.cpp @@ -15,7 +15,7 @@ #include "DLCLocalisationFile.h" #include "DLCTextureFile.h" #include "DLCUIDataFile.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/DLC/DLCFile.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCSkinFile.h" diff --git a/targets/app/common/DebugOptions.h b/targets/app/common/DebugOptions.h index de437d650..b8a922145 100644 --- a/targets/app/common/DebugOptions.h +++ b/targets/app/common/DebugOptions.h @@ -1,6 +1,6 @@ #pragma once -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" class DebugOptions { public: diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 9125722d3..69dfb69b2 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -8,7 +8,7 @@ #include "minecraft/GameTypes.h" #include "minecraft/GameEnums.h" #include "app/common/App_structs.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCSkinFile.h" #include "app/common/GameRules/GameRuleManager.h" diff --git a/targets/app/common/GameSettingsManager.cpp b/targets/app/common/GameSettingsManager.cpp index 1e09c6770..4b7cd0db1 100644 --- a/targets/app/common/GameSettingsManager.cpp +++ b/targets/app/common/GameSettingsManager.cpp @@ -5,7 +5,7 @@ #include "minecraft/GameTypes.h" #include "platform/profile/ProfileConstants.h" #include "minecraft/GameEnums.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "app/linux/LinuxGame.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp index 7cafffa2b..1b8bc6270 100644 --- a/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -7,7 +7,7 @@ #include #include -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/LinuxGame.h" diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 673ff8e1a..47b5fc4cb 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,6 +1,6 @@ #include "UIScene_DebugOptions.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/UI/UIScene.h" #include "app/linux/Iggy/include/iggy.h" #ifndef _ENABLEIGGY diff --git a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h index 6aedef022..f29aa978a 100644 --- a/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/targets/app/common/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -2,7 +2,7 @@ #include -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/Controls/UIControl_CheckBox.h" #include "app/common/UI/UIScene.h" diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index ed50aee4d..16f22f310 100644 --- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -9,7 +9,7 @@ #include #include "platform/profile/profile.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Leaderboards/LeaderboardInterface.h" #include "app/common/Leaderboards/LeaderboardManager.h" #include "app/common/UI/Controls/UIControl_Label.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 23af36775..482caabdf 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -5,7 +5,7 @@ #include "platform/PlatformTypes.h" #include "platform/profile/profile.h" #include "minecraft/GameEnums.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index e19845312..3ebc242d5 100644 --- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -3,7 +3,7 @@ #include -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/Console_Debug_enum.h b/targets/minecraft/Console_Debug_enum.h similarity index 100% rename from targets/app/common/Console_Debug_enum.h rename to targets/minecraft/Console_Debug_enum.h diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index fa7482299..771015f2f 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -14,7 +14,7 @@ #include "platform/input/input.h" #include "ClientConnection.h" #include "app/common/Audio/SoundEngine.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "MultiPlayerChunkCache.h" #include "MultiPlayerLocalPlayer.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 018a07052..1ae7c5c87 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -24,7 +24,7 @@ #include "minecraft/GameEnums.h" #include "app/common/Audio/SoundEngine.h" #include "minecraft/client/resources/Colours/ColourTable.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "util/FrameProfiler.h" #include "minecraft/client/renderer/MobSkinMemTextureProcessor.h" #include "Tesselator.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index a23f12d2e..1d0509dfd 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -67,7 +67,7 @@ #endif #include "platform/input/input.h" #include "platform/ShutdownManager.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "app/common/Network/Socket.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 6b52b602e..f0a1cc5a0 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -11,7 +11,7 @@ #include "platform/storage/storage.h" #include "EntityTracker.h" #include "platform/ShutdownManager.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCPack.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index 97af1a433..c9fe80436 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -12,7 +12,7 @@ #include "platform/input/input.h" #include "EntityTracker.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "app/common/Network/GameNetworkManager.h" #include "minecraft/network/platform/NetworkPlayerInterface.h" diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index af89390d2..185ad999b 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -12,7 +12,7 @@ #include #include "minecraft/GameEnums.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCSkinFile.h" #include "app/common/Network/GameNetworkManager.h" diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp index 3008d77c5..82eed36fb 100644 --- a/targets/minecraft/world/item/PlanterTileItem.cpp +++ b/targets/minecraft/world/item/PlanterTileItem.cpp @@ -3,7 +3,7 @@ #include -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index c5421886a..735064e40 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -6,7 +6,7 @@ #include -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "java/Class.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index 42512fc21..88f11375b 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -19,7 +19,7 @@ #include "LevelListener.h" #include "minecraft/GameEnums.h" #include "minecraft/client/resources/Colours/ColourTable.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/Network/GameNetworkManager.h" #include "util/FrameProfiler.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index e43e9d730..3d5ac8dc3 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -7,7 +7,7 @@ #include #include "platform/input/input.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "java/Random.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 1df454504..6ec930a2e 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -11,7 +11,7 @@ #include #include "platform/input/input.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "platform/C4JThread.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index 0f31e795e..edab83d55 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -13,7 +13,7 @@ #include #include "platform/input/input.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "util/Definitions.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index 12ac98d46..7fba66a4f 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -9,7 +9,7 @@ #include "platform/input/input.h" #include "minecraft/GameEnums.h" #include "minecraft/client/resources/Colours/ColourTable.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "NormalDimension.h" #include "TheEndDimension.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index abc2a17e8..aeb72fc0d 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -6,7 +6,7 @@ #include "platform/input/input.h" #include "minecraft/GameEnums.h" #include "minecraft/client/resources/Colours/ColourTable.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelType.h" diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index b7cb4c1c0..2260891db 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -8,7 +8,7 @@ #include "BiomeOverrideLayer.h" #include "platform/input/input.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/newbiome/layer/AddIslandLayer.h" #include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index f4910edbd..050851a20 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -14,7 +14,7 @@ #include "platform/input/input.h" #include "LevelData.h" -#include "app/common/Console_Debug_enum.h" +#include "minecraft/Console_Debug_enum.h" #include "app/common/GameRules/GameRuleManager.h" #include "util/StringHelpers.h" #include "java/File.h"