From dc2b36e911dd8763c6693b0432ddd01e9648bc85 Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Wed, 8 Apr 2026 19:59:26 +1000 Subject: [PATCH] refactor: move StringTable.h into minecraft (impl stays for now) --- targets/app/common/DLC/DLCLocalisationFile.cpp | 2 +- targets/app/common/DLC/DLCPack.cpp | 2 +- targets/app/common/Game.cpp | 2 +- targets/app/common/Game.h | 2 +- targets/app/common/GameRules/GameRuleManager.cpp | 2 +- .../common/GameRules/LevelGeneration/LevelGenerationOptions.cpp | 2 +- .../common/GameRules/LevelGeneration/LevelGenerationOptions.h | 2 +- .../GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp | 2 +- targets/app/common/Localisation/StringTable.cpp | 2 +- targets/app/common/LocalizationManager.cpp | 2 +- targets/minecraft/client/skins/DLCTexturePack.cpp | 2 +- targets/minecraft/client/skins/DLCTexturePack.h | 2 +- .../{app/common/Localisation => minecraft/locale}/StringTable.h | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename targets/{app/common/Localisation => minecraft/locale}/StringTable.h (100%) diff --git a/targets/app/common/DLC/DLCLocalisationFile.cpp b/targets/app/common/DLC/DLCLocalisationFile.cpp index 2c79dca26..2a66aaafd 100644 --- a/targets/app/common/DLC/DLCLocalisationFile.cpp +++ b/targets/app/common/DLC/DLCLocalisationFile.cpp @@ -2,7 +2,7 @@ #include "DLCManager.h" #include "app/common/DLC/DLCFile.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const std::string& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { diff --git a/targets/app/common/DLC/DLCPack.cpp b/targets/app/common/DLC/DLCPack.cpp index 27630c9e6..4660e6b0a 100644 --- a/targets/app/common/DLC/DLCPack.cpp +++ b/targets/app/common/DLC/DLCPack.cpp @@ -19,7 +19,7 @@ #include "app/common/DLC/DLCFile.h" #include "app/common/DLC/DLCManager.h" #include "app/common/DLC/DLCSkinFile.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "util/StringHelpers.h" diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp index 68aaa8b6a..8d7a67455 100644 --- a/targets/app/common/Game.cpp +++ b/targets/app/common/Game.cpp @@ -76,7 +76,7 @@ #include "app/common/Audio/SoundEngine.h" #include "app/common/Colours/ColourTable.h" #include "app/common/DLC/DLCPack.h" -#include "app/common/Localisation/StringTable.h" +#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" diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h index 0a19a83b0..9e7be771b 100644 --- a/targets/app/common/Game.h +++ b/targets/app/common/Game.h @@ -26,7 +26,7 @@ #include "app/common/DLC/DLCManager.h" #include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "app/common/GameRules/GameRuleManager.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "app/common/Tutorial/TutorialEnum.h" #include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/common/UI/All Platforms/UIStructs.h" diff --git a/targets/app/common/GameRules/GameRuleManager.cpp b/targets/app/common/GameRules/GameRuleManager.cpp index 9994fbd10..29c31bf94 100644 --- a/targets/app/common/GameRules/GameRuleManager.cpp +++ b/targets/app/common/GameRules/GameRuleManager.cpp @@ -18,7 +18,7 @@ #include "app/common/GameRules/LevelRules/LevelRules.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "app/linux/LinuxGame.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h" #include "java/File.h" diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 8abce74f1..76fc4aa4f 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -17,7 +17,7 @@ #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "app/common/GameRules/LevelGeneration/StartFeature.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "app/linux/LinuxGame.h" #include "app/linux/Stubs/winapi_stubs.h" #include "java/File.h" diff --git a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h index 0c0fdbfa3..d197644a3 100644 --- a/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -11,7 +11,7 @@ #include "app/common/DLC/DLCPack.h" #include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" class ApplySchematicRuleDefinition; diff --git a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index fe50e6dff..c103bbaa4 100644 --- a/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/targets/app/common/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -3,7 +3,7 @@ #include "app/common/GameRules/ConsoleGameRulesConstants.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" #include "app/common/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" class AABB; diff --git a/targets/app/common/Localisation/StringTable.cpp b/targets/app/common/Localisation/StringTable.cpp index 2c14c763b..beb418cbc 100644 --- a/targets/app/common/Localisation/StringTable.cpp +++ b/targets/app/common/Localisation/StringTable.cpp @@ -1,4 +1,4 @@ -#include "StringTable.h" +#include "minecraft/locale/StringTable.h" #include #include diff --git a/targets/app/common/LocalizationManager.cpp b/targets/app/common/LocalizationManager.cpp index 761d1c628..85bb26c4f 100644 --- a/targets/app/common/LocalizationManager.cpp +++ b/targets/app/common/LocalizationManager.cpp @@ -8,7 +8,7 @@ #include "minecraft/GameEnums.h" #include "app/common/App_structs.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "app/common/Colours/ColourTable.h" #include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/linux/LinuxGame.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index 741d2ade0..aca47c4dd 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -23,7 +23,7 @@ #include "app/common/DLC/DLCUIDataFile.h" #include "app/common/GameRules/GameRuleManager.h" #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" #include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/linux/Linux_UIController.h" #include "app/linux/Stubs/winapi_stubs.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h index 29914cddc..a7d8c067b 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.h +++ b/targets/minecraft/client/skins/DLCTexturePack.h @@ -5,7 +5,7 @@ #include "platform/PlatformTypes.h" #include "AbstractTexturePack.h" -#include "app/common/Localisation/StringTable.h" +#include "minecraft/locale/StringTable.h" class DLCPack; class StringTable; diff --git a/targets/app/common/Localisation/StringTable.h b/targets/minecraft/locale/StringTable.h similarity index 100% rename from targets/app/common/Localisation/StringTable.h rename to targets/minecraft/locale/StringTable.h