From aa83320be80bccd44cc7bf9fe013eab09394f471 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Thu, 9 Apr 2026 15:49:31 +1000 Subject: [PATCH] chore: drop a few more dead app/ includes from minecraft --- targets/minecraft/client/gui/CreateWorldScreen.cpp | 1 - targets/minecraft/client/gui/achievement/StatsScreen.cpp | 1 - targets/minecraft/client/multiplayer/ClientConnection.cpp | 2 -- .../minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp | 1 - targets/minecraft/client/player/LocalPlayer.cpp | 1 - targets/minecraft/client/skins/DLCTexturePack.cpp | 4 ---- targets/minecraft/server/PlayerList.cpp | 1 - 7 files changed, 11 deletions(-) diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index 0b66a378e..f200034ac 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -18,7 +18,6 @@ // below. Static thread procs can't be virtual; this one consumer keeps the // concrete type include. #include "app/common/Network/GameNetworkManager.h" -#include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/linux/Linux_UIController.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index cca45430e..512450ca1 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -1,5 +1,4 @@ #include "StatsScreen.h" - #include "app/common/Audio/SoundEngine.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 7b47701f3..dee511bc8 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -20,9 +20,7 @@ #include "app/common/Network/Socket.h" #include "app/common/Tutorial/FullTutorialMode.h" #include "app/common/Tutorial/Tutorial.h" -#include "app/common/Tutorial/TutorialEnum.h" #include "app/common/Tutorial/TutorialMode.h" -#include "app/common/UI/All Platforms/UIEnums.h" #include "app/common/UI/All Platforms/UIStructs.h" #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" #include "app/linux/Linux_UIController.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 81a8256e3..36ee02001 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -6,7 +6,6 @@ #include "ClientConnection.h" #include "app/common/Tutorial/Tutorial.h" -#include "app/common/Tutorial/TutorialEnum.h" #include "app/common/Tutorial/TutorialMode.h" #include "minecraft/IGameServices.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index cd27e3bf6..f24cf33af 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -34,7 +34,6 @@ #include "app/common/Audio/SoundEngine.h" #include "app/common/Tutorial/Tutorial.h" #include "app/common/Tutorial/TutorialMode.h" -#include "app/common/UI/All Platforms/UIEnums.h" #include "app/linux/Linux_UIController.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index bf187631a..24cdae7cd 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -5,11 +5,9 @@ #include #include #include - #include "app/common/Audio/SoundEngine.h" #include "app/common/DLC/DLCAudioFile.h" #include "app/common/DLC/DLCColourTableFile.h" -#include "app/common/DLC/DLCFile.h" #include "app/common/DLC/DLCGameRulesHeader.h" #include "app/common/DLC/DLCLocalisationFile.h" #include "app/common/DLC/DLCManager.h" @@ -35,8 +33,6 @@ #include "platform/storage/storage.h" #if defined(_WINDOWS64) -#include "app/windows/XML/ATGXmlParser.h" -#include "app/windows/XML/xmlFilesCallback.h" #endif namespace { diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 2cd52e4fb..1cfb4c557 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -13,7 +13,6 @@ #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" #include "app/common/Network/Socket.h" #include "app/common/Tutorial/Tutorial.h" -#include "app/common/Tutorial/TutorialEnum.h" #include "java/Class.h" #include "java/JavaMath.h" #include "minecraft/GameEnums.h"