refactor: decouple minecraft/ from app/ via IGameServices virtual interface

targets/app/common/AppGameServices.cpp

@@ -0,0 +1,463 @@
+#include "app/common/AppGameServices.h"
+
+#include "app/common/Game.h"
+#include "java/Class.h"  // eINSTANCEOF
+
+AppGameServices::AppGameServices(Game& game, IMenuService& menus)
+    : game_(game), menus_(menus) {}
+
+// -- Strings --
+
+const wchar_t* AppGameServices::getString(int id) {
+    return Game::GetString(id);
+}
+
+// -- Debug settings --
+
+bool AppGameServices::debugSettingsOn() {
+    return game_.DebugSettingsOn();
+}
+
+bool AppGameServices::debugArtToolsOn() {
+    return game_.DebugArtToolsOn();
+}
+
+unsigned int AppGameServices::debugGetMask(int iPad, bool overridePlayer) {
+    return game_.GetGameSettingsDebugMask(iPad, overridePlayer);
+}
+
+bool AppGameServices::debugMobsDontAttack() {
+    return game_.GetMobsDontAttackEnabled();
+}
+
+bool AppGameServices::debugMobsDontTick() {
+    return game_.GetMobsDontTickEnabled();
+}
+
+bool AppGameServices::debugFreezePlayers() {
+    return game_.GetFreezePlayers();
+}
+
+// -- Game host options --
+
+unsigned int AppGameServices::getGameHostOption(eGameHostOption option) {
+    return game_.GetGameHostOption(option);
+}
+
+void AppGameServices::setGameHostOption(eGameHostOption option,
+                                        unsigned int value) {
+    game_.SetGameHostOption(option, value);
+}
+
+// -- Level generation --
+
+LevelGenerationOptions* AppGameServices::getLevelGenerationOptions() {
+    return game_.getLevelGenerationOptions();
+}
+
+LevelRuleset* AppGameServices::getGameRuleDefinitions() {
+    return game_.getGameRuleDefinitions();
+}
+
+// -- Texture cache --
+
+void AppGameServices::addMemoryTextureFile(const std::wstring& name,
+                                           std::uint8_t* data,
+                                           unsigned int size) {
+    game_.AddMemoryTextureFile(name, data, size);
+}
+
+void AppGameServices::removeMemoryTextureFile(const std::wstring& name) {
+    game_.RemoveMemoryTextureFile(name);
+}
+
+void AppGameServices::getMemFileDetails(const std::wstring& name,
+                                        std::uint8_t** data,
+                                        unsigned int* size) {
+    game_.GetMemFileDetails(name, data, size);
+}
+
+bool AppGameServices::isFileInMemoryTextures(const std::wstring& name) {
+    return game_.IsFileInMemoryTextures(name);
+}
+
+// -- Player settings --
+
+unsigned char AppGameServices::getGameSettings(int iPad, int setting) {
+    return game_.GetGameSettings(iPad, static_cast<eGameSetting>(setting));
+}
+
+unsigned char AppGameServices::getGameSettings(int setting) {
+    return game_.GetGameSettings(static_cast<eGameSetting>(setting));
+}
+
+// -- App time --
+
+float AppGameServices::getAppTime() {
+    return game_.getAppTime();
+}
+
+// -- Game state --
+
+bool AppGameServices::getGameStarted() { return game_.GetGameStarted(); }
+void AppGameServices::setGameStarted(bool val) { game_.SetGameStarted(val); }
+bool AppGameServices::getTutorialMode() { return game_.GetTutorialMode(); }
+void AppGameServices::setTutorialMode(bool val) { game_.SetTutorialMode(val); }
+bool AppGameServices::isAppPaused() { return game_.IsAppPaused(); }
+int AppGameServices::getLocalPlayerCount() { return game_.GetLocalPlayerCount(); }
+bool AppGameServices::autosaveDue() { return game_.AutosaveDue(); }
+void AppGameServices::setAutosaveTimerTime() { game_.SetAutosaveTimerTime(); }
+int64_t AppGameServices::secondsToAutosave() { return game_.SecondsToAutosave(); }
+
+void AppGameServices::setDisconnectReason(
+    DisconnectPacket::eDisconnectReason reason) {
+    game_.SetDisconnectReason(reason);
+}
+
+void AppGameServices::lockSaveNotification() { game_.lockSaveNotification(); }
+void AppGameServices::unlockSaveNotification() { game_.unlockSaveNotification(); }
+bool AppGameServices::getResetNether() { return game_.GetResetNether(); }
+bool AppGameServices::getUseDPadForDebug() { return game_.GetUseDPadForDebug(); }
+
+bool AppGameServices::getWriteSavesToFolderEnabled() {
+    return game_.GetWriteSavesToFolderEnabled();
+}
+
+bool AppGameServices::isLocalMultiplayerAvailable() {
+    return game_.IsLocalMultiplayerAvailable();
+}
+
+bool AppGameServices::dlcInstallPending() {
+    return game_.DLCInstallPending();
+}
+
+bool AppGameServices::dlcInstallProcessCompleted() {
+    return game_.DLCInstallProcessCompleted();
+}
+
+bool AppGameServices::canRecordStatsAndAchievements() {
+    return game_.CanRecordStatsAndAchievements();
+}
+
+bool AppGameServices::getTMSGlobalFileListRead() {
+    return game_.GetTMSGlobalFileListRead();
+}
+
+void AppGameServices::setRequiredTexturePackID(std::uint32_t id) {
+    game_.SetRequiredTexturePackID(id);
+}
+
+void AppGameServices::setSpecialTutorialCompletionFlag(int iPad, int index) {
+    game_.SetSpecialTutorialCompletionFlag(iPad, index);
+}
+
+void AppGameServices::setBanListCheck(int iPad, bool val) {
+    game_.SetBanListCheck(iPad, val);
+}
+
+bool AppGameServices::getBanListCheck(int iPad) {
+    return game_.GetBanListCheck(iPad);
+}
+
+unsigned int AppGameServices::getGameNewWorldSize() {
+    return game_.GetGameNewWorldSize();
+}
+
+unsigned int AppGameServices::getGameNewWorldSizeUseMoat() {
+    return game_.GetGameNewWorldSizeUseMoat();
+}
+
+unsigned int AppGameServices::getGameNewHellScale() {
+    return game_.GetGameNewHellScale();
+}
+
+// -- UI dispatch --
+
+void AppGameServices::setAction(int iPad, eXuiAction action, void* param) {
+    game_.SetAction(iPad, action, param);
+}
+
+void AppGameServices::setXuiServerAction(int iPad, eXuiServerAction action,
+                                         void* param) {
+    game_.SetXuiServerAction(iPad, action, param);
+}
+
+eXuiAction AppGameServices::getXuiAction(int iPad) {
+    return game_.GetXuiAction(iPad);
+}
+
+eXuiServerAction AppGameServices::getXuiServerAction(int iPad) {
+    return game_.GetXuiServerAction(iPad);
+}
+
+void* AppGameServices::getXuiServerActionParam(int iPad) {
+    return game_.GetXuiServerActionParam(iPad);
+}
+
+void AppGameServices::setGlobalXuiAction(eXuiAction action) {
+    game_.SetGlobalXuiAction(action);
+}
+
+void AppGameServices::handleButtonPresses() {
+    game_.HandleButtonPresses();
+}
+
+void AppGameServices::setTMSAction(int iPad, eTMSAction action) {
+    game_.SetTMSAction(iPad, action);
+}
+
+// -- Skin / cape / animation --
+
+std::wstring AppGameServices::getPlayerSkinName(int iPad) {
+    return game_.GetPlayerSkinName(iPad);
+}
+
+std::uint32_t AppGameServices::getPlayerSkinId(int iPad) {
+    return game_.GetPlayerSkinId(iPad);
+}
+
+std::wstring AppGameServices::getPlayerCapeName(int iPad) {
+    return game_.GetPlayerCapeName(iPad);
+}
+
+std::uint32_t AppGameServices::getPlayerCapeId(int iPad) {
+    return game_.GetPlayerCapeId(iPad);
+}
+
+std::uint32_t AppGameServices::getAdditionalModelPartsForPad(int iPad) {
+    return game_.GetAdditionalModelParts(iPad);
+}
+
+void AppGameServices::setAdditionalSkinBoxes(std::uint32_t dwSkinID,
+                                             SKIN_BOX* boxA,
+                                             unsigned int boxC) {
+    game_.SetAdditionalSkinBoxes(dwSkinID, boxA, boxC);
+}
+
+std::vector<SKIN_BOX*>* AppGameServices::getAdditionalSkinBoxes(
+    std::uint32_t dwSkinID) {
+    return game_.GetAdditionalSkinBoxes(dwSkinID);
+}
+
+std::vector<ModelPart*>* AppGameServices::getAdditionalModelParts(
+    std::uint32_t dwSkinID) {
+    return game_.GetAdditionalModelParts(dwSkinID);
+}
+
+std::vector<ModelPart*>* AppGameServices::setAdditionalSkinBoxesFromVec(
+    std::uint32_t dwSkinID, std::vector<SKIN_BOX*>* pvSkinBoxA) {
+    return game_.SetAdditionalSkinBoxes(dwSkinID, pvSkinBoxA);
+}
+
+void AppGameServices::setAnimOverrideBitmask(std::uint32_t dwSkinID,
+                                             unsigned int bitmask) {
+    game_.SetAnimOverrideBitmask(dwSkinID, bitmask);
+}
+
+unsigned int AppGameServices::getAnimOverrideBitmask(
+    std::uint32_t dwSkinID) {
+    return game_.GetAnimOverrideBitmask(dwSkinID);
+}
+
+std::uint32_t AppGameServices::getSkinIdFromPath(const std::wstring& skin) {
+    return Game::getSkinIdFromPath(skin);
+}
+
+std::wstring AppGameServices::getSkinPathFromId(std::uint32_t skinId) {
+    return Game::getSkinPathFromId(skinId);
+}
+
+bool AppGameServices::defaultCapeExists() {
+    return game_.DefaultCapeExists();
+}
+
+bool AppGameServices::isXuidNotch(PlayerUID xuid) {
+    return game_.isXuidNotch(xuid);
+}
+
+bool AppGameServices::isXuidDeadmau5(PlayerUID xuid) {
+    return game_.isXuidDeadmau5(xuid);
+}
+
+// -- Platform features --
+
+void AppGameServices::fatalLoadError() { game_.FatalLoadError(); }
+
+void AppGameServices::setRichPresenceContext(int iPad, int contextId) {
+    game_.SetRichPresenceContext(iPad, contextId);
+}
+
+void AppGameServices::captureSaveThumbnail() { game_.CaptureSaveThumbnail(); }
+
+void AppGameServices::getSaveThumbnail(std::uint8_t** data,
+                                       unsigned int* size) {
+    game_.GetSaveThumbnail(data, size);
+}
+
+void AppGameServices::readBannedList(int iPad, eTMSAction action,
+                                     bool bCallback) {
+    game_.ReadBannedList(iPad, action, bCallback);
+}
+
+void AppGameServices::updatePlayerInfo(std::uint8_t networkSmallId,
+                                       int16_t playerColourIndex,
+                                       unsigned int playerPrivileges) {
+    game_.UpdatePlayerInfo(networkSmallId, playerColourIndex, playerPrivileges);
+}
+
+unsigned int AppGameServices::getPlayerPrivileges(
+    std::uint8_t networkSmallId) {
+    return game_.GetPlayerPrivileges(networkSmallId);
+}
+
+void AppGameServices::setGameSettingsDebugMask(int iPad, unsigned int uiVal) {
+    game_.SetGameSettingsDebugMask(iPad, uiVal);
+}
+
+// -- Schematics / terrain --
+
+void AppGameServices::processSchematics(LevelChunk* chunk) {
+    game_.processSchematics(chunk);
+}
+
+void AppGameServices::processSchematicsLighting(LevelChunk* chunk) {
+    game_.processSchematicsLighting(chunk);
+}
+
+void AppGameServices::addTerrainFeaturePosition(_eTerrainFeatureType type,
+                                                int x, int z) {
+    game_.AddTerrainFeaturePosition(type, x, z);
+}
+
+bool AppGameServices::getTerrainFeaturePosition(_eTerrainFeatureType type,
+                                                int* pX, int* pZ) {
+    return game_.GetTerrainFeaturePosition(type, pX, pZ);
+}
+
+void AppGameServices::loadDefaultGameRules() {
+    game_.loadDefaultGameRules();
+}
+
+// -- Archive / resources --
+
+bool AppGameServices::hasArchiveFile(const std::wstring& filename) {
+    return game_.hasArchiveFile(filename);
+}
+
+std::vector<std::uint8_t> AppGameServices::getArchiveFile(
+    const std::wstring& filename) {
+    return game_.getArchiveFile(filename);
+}
+
+// -- Strings / formatting / misc queries --
+
+int AppGameServices::getHTMLColour(eMinecraftColour colour) {
+    return game_.GetHTMLColour(colour);
+}
+
+std::wstring AppGameServices::getEntityName(EntityTypeId type) {
+    return game_.getEntityName(static_cast<eINSTANCEOF>(type));
+}
+
+const wchar_t* AppGameServices::getGameRulesString(const std::wstring& key) {
+    return game_.GetGameRulesString(key);
+}
+
+unsigned int AppGameServices::createImageTextData(std::uint8_t* textMetadata,
+                                                  int64_t seed, bool hasSeed,
+                                                  unsigned int uiHostOptions,
+                                                  unsigned int uiTexturePackId) {
+    return game_.CreateImageTextData(textMetadata, seed, hasSeed,
+                                     uiHostOptions, uiTexturePackId);
+}
+
+std::wstring AppGameServices::getFilePath(std::uint32_t packId,
+                                          std::wstring filename,
+                                          bool bAddDataFolder,
+                                          std::wstring mountPoint) {
+    return game_.getFilePath(packId, filename, bAddDataFolder, mountPoint);
+}
+
+char* AppGameServices::getUniqueMapName() {
+    return game_.GetUniqueMapName();
+}
+
+void AppGameServices::setUniqueMapName(char* name) {
+    game_.SetUniqueMapName(name);
+}
+
+unsigned int AppGameServices::getOpacityTimer(int iPad) {
+    return game_.GetOpacityTimer(iPad);
+}
+
+void AppGameServices::setOpacityTimer(int iPad) {
+    game_.SetOpacityTimer(iPad);
+}
+
+void AppGameServices::tickOpacityTimer(int iPad) {
+    game_.TickOpacityTimer(iPad);
+}
+
+bool AppGameServices::isInBannedLevelList(int iPad, PlayerUID xuid,
+                                          char* levelName) {
+    return game_.IsInBannedLevelList(iPad, xuid, levelName);
+}
+
+MOJANG_DATA* AppGameServices::getMojangDataForXuid(PlayerUID xuid) {
+    return game_.GetMojangDataForXuid(xuid);
+}
+
+void AppGameServices::debugPrintf(const char* msg) {
+    game_.DebugPrintf("%s", msg);
+}
+
+// -- DLC --
+
+DLCSkinFile* AppGameServices::getDLCSkinFile(const std::wstring& name) {
+    return game_.m_dlcManager.getSkinFile(name);
+}
+bool AppGameServices::dlcNeedsCorruptCheck() {
+    return game_.m_dlcManager.NeedsCorruptCheck();
+}
+unsigned int AppGameServices::dlcCheckForCorrupt(bool showMessage) {
+    return game_.m_dlcManager.checkForCorruptDLCAndAlert(showMessage);
+}
+bool AppGameServices::dlcReadDataFile(unsigned int& filesProcessed,
+                                       const std::wstring& path,
+                                       DLCPack* pack, bool fromArchive) {
+    return game_.m_dlcManager.readDLCDataFile(filesProcessed, path, pack,
+                                              fromArchive);
+}
+void AppGameServices::dlcRemovePack(DLCPack* pack) {
+    game_.m_dlcManager.removePack(pack);
+}
+
+// -- Game rules --
+
+LevelGenerationOptions* AppGameServices::loadGameRules(std::uint8_t* data,
+                                                         unsigned int size) {
+    return game_.m_gameRules.loadGameRules(data, size);
+}
+void AppGameServices::saveGameRules(std::uint8_t** data, unsigned int* size) {
+    game_.m_gameRules.saveGameRules(data, size);
+}
+void AppGameServices::unloadCurrentGameRules() {
+    game_.m_gameRules.unloadCurrentGameRules();
+}
+void AppGameServices::setLevelGenerationOptions(LevelGenerationOptions* levelGen) {
+    game_.m_gameRules.setLevelGenerationOptions(levelGen);
+}
+
+// -- Shared data --
+
+std::vector<std::wstring>& AppGameServices::getSkinNames() {
+    return game_.vSkinNames;
+}
+
+std::vector<FEATURE_DATA*>& AppGameServices::getTerrainFeatures() {
+    return *game_.m_terrainFeatureManager.features();
+}
+
+// -- Menu service --
+
+IMenuService& AppGameServices::menus() { return menus_; }

targets/app/common/AppGameServices.h

@@ -0,0 +1,185 @@
+#pragma once
+
+#include "minecraft/IGameServices.h"
+
+class Game;
+class IMenuService;
+
+class AppGameServices : public IGameServices {
+public:
+    AppGameServices(Game& game, IMenuService& menus);
+
+    // -- Strings --
+    const wchar_t* getString(int id) override;
+
+    // -- Debug settings --
+    bool debugSettingsOn() override;
+    bool debugArtToolsOn() override;
+    unsigned int debugGetMask(int iPad, bool overridePlayer) override;
+    bool debugMobsDontAttack() override;
+    bool debugMobsDontTick() override;
+    bool debugFreezePlayers() override;
+
+    // -- Game host options --
+    unsigned int getGameHostOption(eGameHostOption option) override;
+    void setGameHostOption(eGameHostOption option,
+                           unsigned int value) override;
+
+    // -- Level generation --
+    LevelGenerationOptions* getLevelGenerationOptions() override;
+    LevelRuleset* getGameRuleDefinitions() override;
+
+    // -- Texture cache --
+    void addMemoryTextureFile(const std::wstring& name, std::uint8_t* data,
+                              unsigned int size) override;
+    void removeMemoryTextureFile(const std::wstring& name) override;
+    void getMemFileDetails(const std::wstring& name, std::uint8_t** data,
+                           unsigned int* size) override;
+    bool isFileInMemoryTextures(const std::wstring& name) override;
+
+    // -- Player settings --
+    unsigned char getGameSettings(int iPad, int setting) override;
+    unsigned char getGameSettings(int setting) override;
+
+    // -- App time --
+    float getAppTime() override;
+
+    // -- Game state --
+    bool getGameStarted() override;
+    void setGameStarted(bool val) override;
+    bool getTutorialMode() override;
+    void setTutorialMode(bool val) override;
+    bool isAppPaused() override;
+    int getLocalPlayerCount() override;
+    bool autosaveDue() override;
+    void setAutosaveTimerTime() override;
+    int64_t secondsToAutosave() override;
+    void setDisconnectReason(
+        DisconnectPacket::eDisconnectReason reason) override;
+    void lockSaveNotification() override;
+    void unlockSaveNotification() override;
+    bool getResetNether() override;
+    bool getUseDPadForDebug() override;
+    bool getWriteSavesToFolderEnabled() override;
+    bool isLocalMultiplayerAvailable() override;
+    bool dlcInstallPending() override;
+    bool dlcInstallProcessCompleted() override;
+    bool canRecordStatsAndAchievements() override;
+    bool getTMSGlobalFileListRead() override;
+    void setRequiredTexturePackID(std::uint32_t id) override;
+    void setSpecialTutorialCompletionFlag(int iPad, int index) override;
+    void setBanListCheck(int iPad, bool val) override;
+    bool getBanListCheck(int iPad) override;
+    unsigned int getGameNewWorldSize() override;
+    unsigned int getGameNewWorldSizeUseMoat() override;
+    unsigned int getGameNewHellScale() override;
+
+    // -- UI dispatch --
+    void setAction(int iPad, eXuiAction action, void* param) override;
+    void setXuiServerAction(int iPad, eXuiServerAction action,
+                            void* param) override;
+    eXuiAction getXuiAction(int iPad) override;
+    eXuiServerAction getXuiServerAction(int iPad) override;
+    void* getXuiServerActionParam(int iPad) override;
+    void setGlobalXuiAction(eXuiAction action) override;
+    void handleButtonPresses() override;
+    void setTMSAction(int iPad, eTMSAction action) override;
+
+    // -- Skin / cape / animation --
+    std::wstring getPlayerSkinName(int iPad) override;
+    std::uint32_t getPlayerSkinId(int iPad) override;
+    std::wstring getPlayerCapeName(int iPad) override;
+    std::uint32_t getPlayerCapeId(int iPad) override;
+    std::uint32_t getAdditionalModelPartsForPad(int iPad) override;
+    void setAdditionalSkinBoxes(std::uint32_t dwSkinID, SKIN_BOX* boxA,
+                                unsigned int boxC) override;
+    std::vector<SKIN_BOX*>* getAdditionalSkinBoxes(
+        std::uint32_t dwSkinID) override;
+    std::vector<ModelPart*>* getAdditionalModelParts(
+        std::uint32_t dwSkinID) override;
+    std::vector<ModelPart*>* setAdditionalSkinBoxesFromVec(
+        std::uint32_t dwSkinID, std::vector<SKIN_BOX*>* pvSkinBoxA) override;
+    void setAnimOverrideBitmask(std::uint32_t dwSkinID,
+                                unsigned int bitmask) override;
+    unsigned int getAnimOverrideBitmask(std::uint32_t dwSkinID) override;
+    std::uint32_t getSkinIdFromPath(const std::wstring& skin) override;
+    std::wstring getSkinPathFromId(std::uint32_t skinId) override;
+    bool defaultCapeExists() override;
+    bool isXuidNotch(PlayerUID xuid) override;
+    bool isXuidDeadmau5(PlayerUID xuid) override;
+
+    // -- Platform features --
+    void fatalLoadError() override;
+    void setRichPresenceContext(int iPad, int contextId) override;
+    void captureSaveThumbnail() override;
+    void getSaveThumbnail(std::uint8_t** data, unsigned int* size) override;
+    void readBannedList(int iPad, eTMSAction action,
+                        bool bCallback) override;
+    void updatePlayerInfo(std::uint8_t networkSmallId,
+                          int16_t playerColourIndex,
+                          unsigned int playerPrivileges) override;
+    unsigned int getPlayerPrivileges(std::uint8_t networkSmallId) override;
+    void setGameSettingsDebugMask(int iPad, unsigned int uiVal) override;
+
+    // -- Schematics / terrain --
+    void processSchematics(LevelChunk* chunk) override;
+    void processSchematicsLighting(LevelChunk* chunk) override;
+    void addTerrainFeaturePosition(_eTerrainFeatureType type, int x,
+                                   int z) override;
+    bool getTerrainFeaturePosition(_eTerrainFeatureType type, int* pX,
+                                   int* pZ) override;
+    void loadDefaultGameRules() override;
+
+    // -- Archive / resources --
+    bool hasArchiveFile(const std::wstring& filename) override;
+    std::vector<std::uint8_t> getArchiveFile(
+        const std::wstring& filename) override;
+
+    // -- Strings / formatting / misc queries --
+    int getHTMLColour(eMinecraftColour colour) override;
+    std::wstring getEntityName(EntityTypeId type) override;
+    const wchar_t* getGameRulesString(const std::wstring& key) override;
+    unsigned int createImageTextData(std::uint8_t* textMetadata,
+                                     int64_t seed, bool hasSeed,
+                                     unsigned int uiHostOptions,
+                                     unsigned int uiTexturePackId) override;
+    std::wstring getFilePath(std::uint32_t packId, std::wstring filename,
+                             bool bAddDataFolder,
+                             std::wstring mountPoint) override;
+    char* getUniqueMapName() override;
+    void setUniqueMapName(char* name) override;
+    unsigned int getOpacityTimer(int iPad) override;
+    void setOpacityTimer(int iPad) override;
+    void tickOpacityTimer(int iPad) override;
+    bool isInBannedLevelList(int iPad, PlayerUID xuid,
+                             char* levelName) override;
+    MOJANG_DATA* getMojangDataForXuid(PlayerUID xuid) override;
+    void debugPrintf(const char* msg) override;
+
+    // -- DLC --
+    DLCSkinFile* getDLCSkinFile(const std::wstring& name) override;
+    bool dlcNeedsCorruptCheck() override;
+    unsigned int dlcCheckForCorrupt(bool showMessage) override;
+    bool dlcReadDataFile(unsigned int& filesProcessed,
+                         const std::wstring& path, DLCPack* pack,
+                         bool fromArchive) override;
+    void dlcRemovePack(DLCPack* pack) override;
+
+    // -- Game rules --
+    LevelGenerationOptions* loadGameRules(std::uint8_t* data,
+                                           unsigned int size) override;
+    void saveGameRules(std::uint8_t** data, unsigned int* size) override;
+    void unloadCurrentGameRules() override;
+    void setLevelGenerationOptions(LevelGenerationOptions* levelGen) override;
+
+    // -- Shared data --
+    std::vector<std::wstring>& getSkinNames() override;
+    std::vector<FEATURE_DATA*>& getTerrainFeatures() override;
+
+    // -- Menu service --
+    IMenuService& menus() override;
+
+private:
+    Game& game_;
+    IMenuService& menus_;
+};

targets/app/common/App_enums.h

@@ -1,706 +0,0 @@
-#pragma once
-
-enum eFileExtensionType {
-    eFileExtensionType_PNG = 0,
-    eFileExtensionType_INF,
-    eFileExtensionType_DAT,
-};
-
-enum eTMSFileType {
-    eTMSFileType_MinecraftStore = 0,
-    eTMSFileType_TexturePack,
-    eTMSFileType_All
-};
-
-enum eTPDFileType {
-    eTPDFileType_Loc = 0,
-    eTPDFileType_Icon,
-    //	eTPDFileType_Banner,
-    eTPDFileType_Comparison,
-};
-
-enum eFont {
-    eFont_European = 0,
-    eFont_Korean,
-    eFont_Japanese,
-    eFont_Chinese,
-    eFont_None,  // to fallback to nothing
-};
-
-enum eXuiAction {
-    eAppAction_Idle = 0,
-    eAppAction_SaveGame,
-    eAppAction_SaveGameCapturedThumbnail,
-    eAppAction_ExitWorld,
-    eAppAction_ExitWorldCapturedThumbnail,
-    eAppAction_ExitWorldTrial,
-    // eAppAction_ExitGameFatalLoadError,
-    eAppAction_Respawn,
-    eAppAction_WaitForRespawnComplete,
-    eAppAction_PrimaryPlayerSignedOut,
-    eAppAction_PrimaryPlayerSignedOutReturned,
-    eAppAction_PrimaryPlayerSignedOutReturned_Menus,
-    eAppAction_ExitPlayer,  // secondary player
-    eAppAction_ExitPlayerPreLogin,
-    eAppAction_TrialOver,
-    eAppAction_ExitTrial,
-    eAppAction_WaitForDimensionChangeComplete,
-    // eAppAction_SocialPost,
-    // eAppAction_SocialPostScreenshot,
-    eAppAction_EthernetDisconnected,
-    eAppAction_EthernetDisconnectedReturned,
-    eAppAction_EthernetDisconnectedReturned_Menus,
-    eAppAction_ExitAndJoinFromInvite,
-    eAppAction_DashboardTrialJoinFromInvite,
-    eAppAction_ExitAndJoinFromInviteConfirmed,
-    eAppAction_JoinFromInvite,
-    eAppAction_ChangeSessionType,
-    eAppAction_SetDefaultOptions,
-    eAppAction_LocalPlayerJoined,
-    eAppAction_RemoteServerSave,
-    eAppAction_WaitRemoteServerSaveComplete,
-    eAppAction_FailedToJoinNoPrivileges,
-    eAppAction_AutosaveSaveGame,
-    eAppAction_AutosaveSaveGameCapturedThumbnail,
-    eAppAction_ProfileReadError,
-    eAppAction_DisplayLavaMessage,
-    eAppAction_BanLevel,
-    eAppAction_LevelInBanLevelList,
-
-    eAppAction_ReloadTexturePack,
-    eAppAction_ReloadFont,
-    eAppAction_TexturePackRequired,  // when the user has joined from invite,
-                                     // but doesn't have the texture pack
-
-    eAppAction_DebugText,
-
-};
-
-enum eTMSAction {
-    eTMSAction_Idle = 0,
-    eTMSAction_TMS_RetrieveFiles_Complete,
-    eTMSAction_TMSPP_RetrieveFiles_CreateLoad_SignInReturned,
-    eTMSAction_TMSPP_RetrieveFiles_RunPlayGame,
-    eTMSAction_TMSPP_RetrieveFiles_HelpAndOptions,
-    eTMSAction_TMSPP_RetrieveFiles_DLCMain,
-    eTMSAction_TMSPP_GlobalFileList,
-    eTMSAction_TMSPP_GlobalFileList_Waiting,
-    // 	eTMSAction_TMSPP_ConfigFile,
-    // 	eTMSAction_TMSPP_ConfigFile_Waiting,
-    eTMSAction_TMSPP_UserFileList,
-    eTMSAction_TMSPP_UserFileList_Waiting,
-    eTMSAction_TMSPP_XUIDSFile,
-    eTMSAction_TMSPP_XUIDSFile_Waiting,
-    eTMSAction_TMSPP_DLCFile,
-    eTMSAction_TMSPP_DLCFile_Waiting,
-    eTMSAction_TMSPP_BannedListFile,
-    eTMSAction_TMSPP_BannedListFile_Waiting,
-    eTMSAction_TMSPP_RetrieveFiles_Complete,
-    eTMSAction_TMSPP_DLCFileOnly,
-    eTMSAction_TMSPP_RetrieveUserFilelist_DLCFileOnly,
-};
-
-// The server runs on its own thread, so we need to call its actions there
-// rather than where all other Xui actions are performed In general these are
-// debugging options
-enum eXuiServerAction {
-    eXuiServerAction_Idle = 0,
-    eXuiServerAction_DropItem,  // Debug
-    eXuiServerAction_SaveGame,
-    eXuiServerAction_AutoSaveGame,
-    eXuiServerAction_SpawnMob,  // Debug
-    eXuiServerAction_PauseServer,
-    eXuiServerAction_ToggleRain,     // Debug
-    eXuiServerAction_ToggleThunder,  // Debug
-    eXuiServerAction_ServerSettingChanged_Gamertags,
-    eXuiServerAction_ServerSettingChanged_Difficulty,
-    eXuiServerAction_ExportSchematic,  // Debug
-    eXuiServerAction_ServerSettingChanged_BedrockFog,
-    eXuiServerAction_SetCameraLocation,  // Debug
-};
-
-enum eGameSetting {
-    eGameSetting_MusicVolume = 0,
-    eGameSetting_SoundFXVolume,
-    eGameSetting_Gamma,
-    eGameSetting_Difficulty,
-    eGameSetting_Sensitivity_InGame,
-    eGameSetting_Sensitivity_InMenu,
-    eGameSetting_ViewBob,
-    eGameSetting_ControlScheme,
-    eGameSetting_ControlInvertLook,
-    eGameSetting_ControlSouthPaw,
-    eGameSetting_SplitScreenVertical,
-    eGameSetting_GamertagsVisible,
-    // Interim TU 1.6.6
-    eGameSetting_Autosave,
-    eGameSetting_DisplaySplitscreenGamertags,
-    eGameSetting_Hints,
-    eGameSetting_InterfaceOpacity,
-    eGameSetting_Tooltips,
-    // TU5
-    eGameSetting_Clouds,
-    eGameSetting_Online,
-    eGameSetting_InviteOnly,
-    eGameSetting_FriendsOfFriends,
-    eGameSetting_DisplayUpdateMessage,
-
-    // TU6
-    eGameSetting_BedrockFog,
-    eGameSetting_DisplayHUD,
-    eGameSetting_DisplayHand,
-
-    // TU7
-    eGameSetting_CustomSkinAnim,
-
-    // TU9
-    eGameSetting_DeathMessages,
-    eGameSetting_UISize,
-    eGameSetting_UISizeSplitscreen,
-    eGameSetting_AnimatedCharacter,
-
-    // PS3
-    eGameSetting_PS3_EULA_Read,
-
-    // PSVita
-    eGameSetting_PSVita_NetworkModeAdhoc,
-
-};
-
-enum eGameMode { eMode_Singleplayer, eMode_Multiplayer };
-
-enum eMinecraftColour {
-    eMinecraftColour_NOT_SET,
-
-    eMinecraftColour_Foliage_Evergreen,
-    eMinecraftColour_Foliage_Birch,
-    eMinecraftColour_Foliage_Default,
-    eMinecraftColour_Foliage_Common,
-    eMinecraftColour_Foliage_Ocean,
-    eMinecraftColour_Foliage_Plains,
-    eMinecraftColour_Foliage_Desert,
-    eMinecraftColour_Foliage_ExtremeHills,
-    eMinecraftColour_Foliage_Forest,
-    eMinecraftColour_Foliage_Taiga,
-    eMinecraftColour_Foliage_Swampland,
-    eMinecraftColour_Foliage_River,
-    eMinecraftColour_Foliage_Hell,
-    eMinecraftColour_Foliage_Sky,
-    eMinecraftColour_Foliage_FrozenOcean,
-    eMinecraftColour_Foliage_FrozenRiver,
-    eMinecraftColour_Foliage_IcePlains,
-    eMinecraftColour_Foliage_IceMountains,
-    eMinecraftColour_Foliage_MushroomIsland,
-    eMinecraftColour_Foliage_MushroomIslandShore,
-    eMinecraftColour_Foliage_Beach,
-    eMinecraftColour_Foliage_DesertHills,
-    eMinecraftColour_Foliage_ForestHills,
-    eMinecraftColour_Foliage_TaigaHills,
-    eMinecraftColour_Foliage_ExtremeHillsEdge,
-    eMinecraftColour_Foliage_Jungle,
-    eMinecraftColour_Foliage_JungleHills,
-
-    eMinecraftColour_Grass_Common,
-    eMinecraftColour_Grass_Ocean,
-    eMinecraftColour_Grass_Plains,
-    eMinecraftColour_Grass_Desert,
-    eMinecraftColour_Grass_ExtremeHills,
-    eMinecraftColour_Grass_Forest,
-    eMinecraftColour_Grass_Taiga,
-    eMinecraftColour_Grass_Swampland,
-    eMinecraftColour_Grass_River,
-    eMinecraftColour_Grass_Hell,
-    eMinecraftColour_Grass_Sky,
-    eMinecraftColour_Grass_FrozenOcean,
-    eMinecraftColour_Grass_FrozenRiver,
-    eMinecraftColour_Grass_IcePlains,
-    eMinecraftColour_Grass_IceMountains,
-    eMinecraftColour_Grass_MushroomIsland,
-    eMinecraftColour_Grass_MushroomIslandShore,
-    eMinecraftColour_Grass_Beach,
-    eMinecraftColour_Grass_DesertHills,
-    eMinecraftColour_Grass_ForestHills,
-    eMinecraftColour_Grass_TaigaHills,
-    eMinecraftColour_Grass_ExtremeHillsEdge,
-    eMinecraftColour_Grass_Jungle,
-    eMinecraftColour_Grass_JungleHills,
-
-    eMinecraftColour_Water_Ocean,
-    eMinecraftColour_Water_Plains,
-    eMinecraftColour_Water_Desert,
-    eMinecraftColour_Water_ExtremeHills,
-    eMinecraftColour_Water_Forest,
-    eMinecraftColour_Water_Taiga,
-    eMinecraftColour_Water_Swampland,
-    eMinecraftColour_Water_River,
-    eMinecraftColour_Water_Hell,
-    eMinecraftColour_Water_Sky,
-    eMinecraftColour_Water_FrozenOcean,
-    eMinecraftColour_Water_FrozenRiver,
-    eMinecraftColour_Water_IcePlains,
-    eMinecraftColour_Water_IceMountains,
-    eMinecraftColour_Water_MushroomIsland,
-    eMinecraftColour_Water_MushroomIslandShore,
-    eMinecraftColour_Water_Beach,
-    eMinecraftColour_Water_DesertHills,
-    eMinecraftColour_Water_ForestHills,
-    eMinecraftColour_Water_TaigaHills,
-    eMinecraftColour_Water_ExtremeHillsEdge,
-    eMinecraftColour_Water_Jungle,
-    eMinecraftColour_Water_JungleHills,
-
-    eMinecraftColour_Sky_Ocean,
-    eMinecraftColour_Sky_Plains,
-    eMinecraftColour_Sky_Desert,
-    eMinecraftColour_Sky_ExtremeHills,
-    eMinecraftColour_Sky_Forest,
-    eMinecraftColour_Sky_Taiga,
-    eMinecraftColour_Sky_Swampland,
-    eMinecraftColour_Sky_River,
-    eMinecraftColour_Sky_Hell,
-    eMinecraftColour_Sky_Sky,
-    eMinecraftColour_Sky_FrozenOcean,
-    eMinecraftColour_Sky_FrozenRiver,
-    eMinecraftColour_Sky_IcePlains,
-    eMinecraftColour_Sky_IceMountains,
-    eMinecraftColour_Sky_MushroomIsland,
-    eMinecraftColour_Sky_MushroomIslandShore,
-    eMinecraftColour_Sky_Beach,
-    eMinecraftColour_Sky_DesertHills,
-    eMinecraftColour_Sky_ForestHills,
-    eMinecraftColour_Sky_TaigaHills,
-    eMinecraftColour_Sky_ExtremeHillsEdge,
-    eMinecraftColour_Sky_Jungle,
-    eMinecraftColour_Sky_JungleHills,
-
-    eMinecraftColour_Tile_RedstoneDust,
-    eMinecraftColour_Tile_RedstoneDustUnlit,
-    eMinecraftColour_Tile_RedstoneDustLitMin,
-    eMinecraftColour_Tile_RedstoneDustLitMax,
-    eMinecraftColour_Tile_StemMin,
-    eMinecraftColour_Tile_StemMax,
-    eMinecraftColour_Tile_WaterLily,
-
-    eMinecraftColour_Sky_Dawn_Dark,
-    eMinecraftColour_Sky_Dawn_Bright,
-
-    eMinecraftColour_Material_None,
-    eMinecraftColour_Material_Grass,
-    eMinecraftColour_Material_Sand,
-    eMinecraftColour_Material_Cloth,
-    eMinecraftColour_Material_Fire,
-    eMinecraftColour_Material_Ice,
-    eMinecraftColour_Material_Metal,
-    eMinecraftColour_Material_Plant,
-    eMinecraftColour_Material_Snow,
-    eMinecraftColour_Material_Clay,
-    eMinecraftColour_Material_Dirt,
-    eMinecraftColour_Material_Stone,
-    eMinecraftColour_Material_Water,
-    eMinecraftColour_Material_Wood,
-    eMinecraftColour_Material_Emerald,
-
-    eMinecraftColour_Particle_Note_00,
-    eMinecraftColour_Particle_Note_01,
-    eMinecraftColour_Particle_Note_02,
-    eMinecraftColour_Particle_Note_03,
-    eMinecraftColour_Particle_Note_04,
-    eMinecraftColour_Particle_Note_05,
-    eMinecraftColour_Particle_Note_06,
-    eMinecraftColour_Particle_Note_07,
-    eMinecraftColour_Particle_Note_08,
-    eMinecraftColour_Particle_Note_09,
-    eMinecraftColour_Particle_Note_10,
-    eMinecraftColour_Particle_Note_11,
-    eMinecraftColour_Particle_Note_12,
-    eMinecraftColour_Particle_Note_13,
-    eMinecraftColour_Particle_Note_14,
-    eMinecraftColour_Particle_Note_15,
-    eMinecraftColour_Particle_Note_16,
-    eMinecraftColour_Particle_Note_17,
-    eMinecraftColour_Particle_Note_18,
-    eMinecraftColour_Particle_Note_19,
-    eMinecraftColour_Particle_Note_20,
-    eMinecraftColour_Particle_Note_21,
-    eMinecraftColour_Particle_Note_22,
-    eMinecraftColour_Particle_Note_23,
-    eMinecraftColour_Particle_Note_24,
-
-    eMinecraftColour_Particle_NetherPortal,
-    eMinecraftColour_Particle_EnderPortal,
-    eMinecraftColour_Particle_Smoke,
-    eMinecraftColour_Particle_Ender,
-    eMinecraftColour_Particle_Explode,
-    eMinecraftColour_Particle_HugeExplosion,
-    eMinecraftColour_Particle_DripWater,
-    eMinecraftColour_Particle_DripLavaStart,
-    eMinecraftColour_Particle_DripLavaEnd,
-    eMinecraftColour_Particle_EnchantmentTable,
-    eMinecraftColour_Particle_DragonBreathMin,
-    eMinecraftColour_Particle_DragonBreathMax,
-    eMinecraftColour_Particle_Suspend,
-    eMinecraftColour_Particle_CritStart,
-    eMinecraftColour_Particle_CritEnd,
-
-    eMinecraftColour_Effect_MovementSpeed,
-    eMinecraftColour_Effect_MovementSlowDown,
-    eMinecraftColour_Effect_DigSpeed,
-    eMinecraftColour_Effect_DigSlowdown,
-    eMinecraftColour_Effect_DamageBoost,
-    eMinecraftColour_Effect_Heal,
-    eMinecraftColour_Effect_Harm,
-    eMinecraftColour_Effect_Jump,
-    eMinecraftColour_Effect_Confusion,
-    eMinecraftColour_Effect_Regeneration,
-    eMinecraftColour_Effect_DamageResistance,
-    eMinecraftColour_Effect_FireResistance,
-    eMinecraftColour_Effect_WaterBreathing,
-    eMinecraftColour_Effect_Invisiblity,
-    eMinecraftColour_Effect_Blindness,
-    eMinecraftColour_Effect_NightVision,
-    eMinecraftColour_Effect_Hunger,
-    eMinecraftColour_Effect_Weakness,
-    eMinecraftColour_Effect_Poison,
-    eMinecraftColour_Effect_Wither,
-    eMinecraftColour_Effect_HealthBoost,
-    eMinecraftColour_Effect_Absoprtion,
-    eMinecraftColour_Effect_Saturation,
-
-    eMinecraftColour_Potion_BaseColour,
-
-    eMinecraftColour_Mob_Creeper_Colour1,
-    eMinecraftColour_Mob_Creeper_Colour2,
-    eMinecraftColour_Mob_Skeleton_Colour1,
-    eMinecraftColour_Mob_Skeleton_Colour2,
-    eMinecraftColour_Mob_Spider_Colour1,
-    eMinecraftColour_Mob_Spider_Colour2,
-    eMinecraftColour_Mob_Zombie_Colour1,
-    eMinecraftColour_Mob_Zombie_Colour2,
-    eMinecraftColour_Mob_Slime_Colour1,
-    eMinecraftColour_Mob_Slime_Colour2,
-    eMinecraftColour_Mob_Ghast_Colour1,
-    eMinecraftColour_Mob_Ghast_Colour2,
-    eMinecraftColour_Mob_PigZombie_Colour1,
-    eMinecraftColour_Mob_PigZombie_Colour2,
-    eMinecraftColour_Mob_Enderman_Colour1,
-    eMinecraftColour_Mob_Enderman_Colour2,
-    eMinecraftColour_Mob_CaveSpider_Colour1,
-    eMinecraftColour_Mob_CaveSpider_Colour2,
-    eMinecraftColour_Mob_Silverfish_Colour1,
-    eMinecraftColour_Mob_Silverfish_Colour2,
-    eMinecraftColour_Mob_Blaze_Colour1,
-    eMinecraftColour_Mob_Blaze_Colour2,
-    eMinecraftColour_Mob_LavaSlime_Colour1,
-    eMinecraftColour_Mob_LavaSlime_Colour2,
-    eMinecraftColour_Mob_Pig_Colour1,
-    eMinecraftColour_Mob_Pig_Colour2,
-    eMinecraftColour_Mob_Sheep_Colour1,
-    eMinecraftColour_Mob_Sheep_Colour2,
-    eMinecraftColour_Mob_Cow_Colour1,
-    eMinecraftColour_Mob_Cow_Colour2,
-    eMinecraftColour_Mob_Chicken_Colour1,
-    eMinecraftColour_Mob_Chicken_Colour2,
-    eMinecraftColour_Mob_Squid_Colour1,
-    eMinecraftColour_Mob_Squid_Colour2,
-    eMinecraftColour_Mob_Wolf_Colour1,
-    eMinecraftColour_Mob_Wolf_Colour2,
-    eMinecraftColour_Mob_MushroomCow_Colour1,
-    eMinecraftColour_Mob_MushroomCow_Colour2,
-    eMinecraftColour_Mob_Ocelot_Colour1,
-    eMinecraftColour_Mob_Ocelot_Colour2,
-    eMinecraftColour_Mob_Villager_Colour1,
-    eMinecraftColour_Mob_Villager_Colour2,
-    eMinecraftColour_Mob_Bat_Colour1,
-    eMinecraftColour_Mob_Bat_Colour2,
-    eMinecraftColour_Mob_Witch_Colour1,
-    eMinecraftColour_Mob_Witch_Colour2,
-    eMinecraftColour_Mob_Horse_Colour1,
-    eMinecraftColour_Mob_Horse_Colour2,
-
-    eMinecraftColour_Armour_Default_Leather_Colour,
-
-    eMinecraftColour_Under_Water_Clear_Colour,
-    eMinecraftColour_Under_Lava_Clear_Colour,
-    eMinecraftColour_In_Cloud_Base_Colour,
-
-    eMinecraftColour_Under_Water_Fog_Colour,
-    eMinecraftColour_Under_Lava_Fog_Colour,
-    eMinecraftColour_In_Cloud_Fog_Colour,
-
-    eMinecraftColour_Default_Fog_Colour,
-    eMinecraftColour_Nether_Fog_Colour,
-    eMinecraftColour_End_Fog_Colour,
-
-    eMinecraftColour_Sign_Text,
-    eMinecraftColour_Map_Text,
-
-    eMinecraftColour_Leash_Light_Colour,
-    eMinecraftColour_Leash_Dark_Colour,
-
-    eMinecraftColour_Fire_Overlay,
-
-    eHTMLColor_0,
-    eHTMLColor_1,
-    eHTMLColor_2,
-    eHTMLColor_3,
-    eHTMLColor_4,
-    eHTMLColor_5,
-    eHTMLColor_6,
-    eHTMLColor_7,
-    eHTMLColor_8,
-    eHTMLColor_9,
-    eHTMLColor_a,
-    eHTMLColor_b,
-    eHTMLColor_c,
-    eHTMLColor_d,
-    eHTMLColor_e,
-    eHTMLColor_f,
-    eHTMLColor_0_dark,
-    eHTMLColor_1_dark,
-    eHTMLColor_2_dark,
-    eHTMLColor_3_dark,
-    eHTMLColor_4_dark,
-    eHTMLColor_5_dark,
-    eHTMLColor_6_dark,
-    eHTMLColor_7_dark,
-    eHTMLColor_8_dark,
-    eHTMLColor_9_dark,
-    eHTMLColor_a_dark,
-    eHTMLColor_b_dark,
-    eHTMLColor_c_dark,
-    eHTMLColor_d_dark,
-    eHTMLColor_e_dark,
-    eHTMLColor_f_dark,
-    eHTMLColor_T1,
-    eHTMLColor_T2,
-    eHTMLColor_T3,
-    eHTMLColor_Black,
-    eHTMLColor_White,
-
-    eTextColor_Enchant,
-    eTextColor_EnchantFocus,
-    eTextColor_EnchantDisabled,
-    eTextColor_RenamedItemTitle,
-
-    // eHTMLColor_0 = 0x000000, //r:0 , g: 0, b: 0, i: 0
-    // eHTMLColor_1 = 0x0000aa, //r:0 , g: 0, b: aa, i: 1 // blue, quite dark
-    // eHTMLColor_2 = 0x109e10, // Changed by request of Dave //0x00aa00, //r:0
-    // , g: aa, b: 0, i: 2 // green eHTMLColor_3 = 0x109e9e, // Changed by
-    // request of Dave //0x00aaaa, //r:0 , g: aa, b: aa, i: 3 // cyan
-    // eHTMLColor_4 = 0xaa0000, //r:aa , g: 0, b: 0, i: 4 // red
-    // eHTMLColor_5 = 0xaa00aa, //r:aa , g: 0, b: aa, i: 5 // purple
-    // eHTMLColor_6 = 0xffaa00, //r:ff , g: aa, b: 0, i: 6 // orange
-    // eHTMLColor_7 = 0xaaaaaa, //r:aa , g: aa, b: aa, i: 7 // light gray
-    // eHTMLColor_8 = 0x555555, //r:55 , g: 55, b: 55, i: 8 // gray
-    // eHTMLColor_9 = 0x5555ff, //r:55 , g: 55, b: ff, i: 9 // blue
-    // eHTMLColor_a = 0x55ff55, //r:55 , g: ff, b: 55, i: a // green
-    // eHTMLColor_b = 0x55ffff, //r:55 , g: ff, b: ff, i: b // cyan
-    // eHTMLColor_c = 0xff5555, //r:ff , g: 55, b: 55, i: c // red pink
-    // eHTMLColor_d = 0xff55ff, //r:ff , g: 55, b: ff, i: d // bright pink
-    // eHTMLColor_e = 0xffff55, //r:ff , g: ff, b: 55, i: e // yellow
-    // eHTMLColor_f = 0xffffff, //r:ff , g: ff, b: ff, i: f
-    // eHTMLColor_0_dark = 0x000000, //r:0 , g: 0, b: 0, i: 10
-    // eHTMLColor_1_dark = 0x00002a, //r:0 , g: 0, b: 2a, i: 11
-    // eHTMLColor_2_dark = 0x002a00, //r:0 , g: 2a, b: 0, i: 12
-    // eHTMLColor_3_dark = 0x002a2a, //r:0 , g: 2a, b: 2a, i: 13
-    // eHTMLColor_4_dark = 0x2a0000, //r:2a , g: 0, b: 0, i: 14
-    // eHTMLColor_5_dark = 0x2a002a, //r:2a , g: 0, b: 2a, i: 15
-    // eHTMLColor_6_dark = 0x2a2a00, //r:2a , g: 2a, b: 0, i: 16
-    // eHTMLColor_7_dark = 0x2a2a2a, //r:2a , g: 2a, b: 2a, i: 17 // dark gray
-    // eHTMLColor_8_dark = 0x151515, //r:15 , g: 15, b: 15, i: 18
-    // eHTMLColor_9_dark = 0x15153f, //r:15 , g: 15, b: 3f, i: 19
-    // eHTMLColor_a_dark = 0x153f15, //r:15 , g: 3f, b: 15, i: 1a
-    // eHTMLColor_b_dark = 0x153f3f, //r:15 , g: 3f, b: 3f, i: 1b
-    // eHTMLColor_c_dark = 0x3f1515, //r:3f , g: 15, b: 15, i: 1c // brown
-    // eHTMLColor_d_dark = 0x3f153f, //r:3f , g: 15, b: 3f, i: 1d
-    // eHTMLColor_e_dark = 0x3f3f15, //r:3f , g: 3f, b: 15, i: 1e
-    // eHTMLColor_f_dark = 0x3f3f3f, //r:3f , g: 3f, b: 3f, i: 1f
-
-    eMinecraftColour_COUNT,
-};
-
-enum eDLCContentType {
-    e_DLC_SkinPack = 0,
-    e_DLC_TexturePacks,
-    e_DLC_MashupPacks,
-    e_DLC_Themes,
-    e_DLC_AvatarItems,
-    e_DLC_Gamerpics,
-    e_DLC_MAX_MinecraftStore,
-    e_DLC_TexturePackData,  // for the icon, banner and text
-    e_DLC_MAX,
-    e_DLC_NotDefined,
-};
-
-enum eDLCMarketplaceType {
-    e_Marketplace_Content = 0,  // skins, texture packs and mashup packs
-    e_Marketplace_Themes,
-    e_Marketplace_AvatarItems,
-    e_Marketplace_Gamerpics,
-    e_Marketplace_MAX,
-    e_Marketplace_NotDefined,
-};
-
-enum eDLCContentState {
-    e_DLC_ContentState_Idle = 0,
-    e_DLC_ContentState_Retrieving,
-    e_DLC_ContentState_Retrieved
-};
-
-enum eTMSContentState {
-    e_TMS_ContentState_Idle = 0,
-    e_TMS_ContentState_Queued,
-    e_TMS_ContentState_Retrieving,
-    e_TMS_ContentState_Retrieved
-};
-
-enum eXUID {
-    eXUID_Undefined = 0,
-    eXUID_NoName,  // name not needed
-    eXUID_Notch,
-    eXUID_Carl,
-    eXUID_Daniel,
-    eXUID_Deadmau5,
-    eXUID_DannyBStyle,
-    eXUID_JulianClark,
-    eXUID_Millionth,
-    eXUID_4JPaddy,
-    eXUID_4JStuart,
-    eXUID_4JDavid,
-    eXUID_4JRichard,
-    eXUID_4JSteven,
-};
-
-enum _eTerrainFeatureType {
-    eTerrainFeature_None = 0,
-    eTerrainFeature_Stronghold,
-    eTerrainFeature_Mineshaft,
-    eTerrainFeature_Village,
-    eTerrainFeature_Ravine,
-    eTerrainFeature_NetherFortress,
-    eTerrainFeature_StrongholdEndPortal,
-    eTerrainFeature_Count
-};
-
-// 4J Stu - Whend adding new options you should consider whether having them on
-// should disable achievements, and if so add them to the
-// CanRecordStatsAndAchievements function 4J Stu - These options are now saved
-// in save data, so new options can ONLY be added to the end
-enum eGameHostOption {
-    eGameHostOption_Difficulty = 0,
-    eGameHostOption_OnlineGame,  // Unused
-    eGameHostOption_InviteOnly,  // Unused
-    eGameHostOption_FriendsOfFriends,
-    eGameHostOption_Gamertags,
-    eGameHostOption_Tutorial,  // special case
-    eGameHostOption_GameType,
-    eGameHostOption_LevelType,  // flat or default
-    eGameHostOption_Structures,
-    eGameHostOption_BonusChest,
-    eGameHostOption_HasBeenInCreative,
-    eGameHostOption_PvP,
-    eGameHostOption_TrustPlayers,
-    eGameHostOption_TNT,
-    eGameHostOption_FireSpreads,
-    eGameHostOption_CheatsEnabled,  // special case
-    eGameHostOption_HostCanFly,
-    eGameHostOption_HostCanChangeHunger,
-    eGameHostOption_HostCanBeInvisible,
-    eGameHostOption_BedrockFog,
-    eGameHostOption_NoHUD,
-    eGameHostOption_WorldSize,
-    eGameHostOption_All,
-
-    eGameHostOption_DisableSaving,
-    eGameHostOption_WasntSaveOwner,  // Added for PS3 save transfer, so we can
-                                     // add a nice message in the future instead
-                                     // of the creative mode one
-
-    eGameHostOption_MobGriefing,
-    eGameHostOption_KeepInventory,
-    eGameHostOption_DoMobSpawning,
-    eGameHostOption_DoMobLoot,
-    eGameHostOption_DoTileDrops,
-    eGameHostOption_NaturalRegeneration,
-    eGameHostOption_DoDaylightCycle,
-};
-
-// 4J-PB - If any new DLC items are added to the TMSFiles, this array needs
-// updated
-
-enum EHTMLFontSize {
-    eHTMLSize_Normal,
-    eHTMLSize_Splitscreen,
-    eHTMLSize_Tutorial,
-    eHTMLSize_EndPoem,
-
-    eHTMLSize_COUNT,
-};
-
-enum eMCLang {
-    eMCLang_null = 0,
-    eMCLang_enUS,
-    eMCLang_enGB,
-    eMCLang_enIE,
-    eMCLang_enAU,
-    eMCLang_enNZ,
-    eMCLang_enCA,
-    eMCLang_jaJP,
-    eMCLang_deDE,
-    eMCLang_deAT,
-    eMCLang_frFR,
-    eMCLang_frCA,
-    eMCLang_esES,
-    eMCLang_esMX,
-    eMCLang_itIT,
-    eMCLang_koKR,
-    eMCLang_ptPT,
-    eMCLang_ptBR,
-    eMCLang_ruRU,
-    eMCLang_nlNL,
-    eMCLang_fiFI,
-    eMCLang_svSV,
-    eMCLang_daDA,
-    eMCLang_noNO,
-    eMCLang_plPL,
-    eMCLang_trTR,
-    eMCLang_elEL,
-    eMCLang_csCS,
-    eMCLang_zhCHT,
-    eMCLang_laLAS,
-
-    eMCLang_zhSG,
-    eMCLang_zhCN,
-    eMCLang_zhHK,
-    eMCLang_zhTW,
-    eMCLang_nlBE,
-    eMCLang_daDK,
-    eMCLang_frBE,
-    eMCLang_frCH,
-    eMCLang_deCH,
-    eMCLang_nbNO,
-    eMCLang_enGR,
-    eMCLang_enHK,
-    eMCLang_enSA,
-    eMCLang_enHU,
-    eMCLang_enIN,
-    eMCLang_enIL,
-    eMCLang_enSG,
-    eMCLang_enSK,
-    eMCLang_enZA,
-    eMCLang_enCZ,
-    eMCLang_enAE,
-    eMCLang_esAR,
-    eMCLang_esCL,
-    eMCLang_esCO,
-    eMCLang_esUS,
-    eMCLang_svSE,
-
-    eMCLang_csCZ,
-    eMCLang_elGR,
-    eMCLang_nnNO,
-    eMCLang_skSK,
-
-    eMCLang_hans,
-    eMCLang_hant,
-};

targets/app/common/App_structs.h

@@ -4,11 +4,12 @@
 
 #include "platform/sdl2/Storage.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
+#include "minecraft/GameTypes.h"
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 
 typedef struct {
@@ -144,12 +145,6 @@ typedef struct {
     int uiStringID;
 } TIPSTRUCT;
 
-typedef struct {
-    eXUID eXuid;
-    wchar_t wchCape[MAX_CAPENAME_SIZE];
-    wchar_t wchSkin[MAX_CAPENAME_SIZE];
-} MOJANG_DATA;
-
 typedef struct {
     eDLCContentType eDLCType;
 
@@ -162,11 +157,6 @@ typedef struct {
     unsigned int uiSortIndex;
 } DLC_INFO;
 
-typedef struct {
-    int x, z;
-    _eTerrainFeatureType eTerrainFeature;
-} FEATURE_DATA;
-
 // banned list
 typedef struct {
     std::uint8_t* pBannedList;

targets/app/common/Colours/ColourTable.cpp

@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"

targets/app/common/Colours/ColourTable.h

@@ -3,7 +3,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 
 class ColourTable {
 private:

targets/app/common/DLC/DLCSkinFile.cpp

@@ -7,7 +7,7 @@
 #include "DLCManager.h"
 #include "app/common/DLC/DLCFile.h"
 #include "app/linux/LinuxGame.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)

targets/app/common/DLC/DLCSkinFile.h

@@ -6,7 +6,7 @@
 
 #include "DLCFile.h"
 #include "app/common/DLC/DLCManager.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "minecraft/client/model/HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile {

targets/app/common/Game.cpp

@@ -7,7 +7,7 @@
 #include "platform/sdl2/Render.h"
 #include "platform/sdl2/Storage.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/common/DLC/DLCManager.h"
@@ -23,7 +23,7 @@
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 #include "platform/PlatformServices.h"
 #include "java/Class.h"
@@ -114,8 +114,6 @@ const float Game::fSafeZoneX = 64.0f;  // 5% of 1280
 const float Game::fSafeZoneY = 36.0f;  // 5% of 720
 
 Game::Game() {
-    GameHostOptions::init(&m_uiGameHostSettings);
-
     if (GAME_SETTINGS_PROFILE_DATA_BYTES != sizeof(GAME_SETTINGS)) {
         DebugPrintf(
             "WARNING: The size of the profile GAME_SETTINGS struct has "
@@ -414,12 +412,12 @@ void Game::FatalLoadError() {}
 
 void Game::SetGameHostOption(eGameHostOption eVal,
                                       unsigned int uiVal) {
-    GameHostOptions::set(eVal, uiVal);
+    GameHostOptions::set(m_uiGameHostSettings, eVal, uiVal);
 }
 
 
 unsigned int Game::GetGameHostOption(eGameHostOption eVal) {
-    return GameHostOptions::get(eVal);
+    return GameHostOptions::get(m_uiGameHostSettings, eVal);
 }
 
 

targets/app/common/Game.h

@@ -31,7 +31,7 @@
 #include "app/common/UI/All Platforms/ArchiveFile.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/world/entity/item/MinecartHopper.h"

targets/app/common/GameRules/LevelGeneration/LevelGenerationOptions.cpp

@@ -6,7 +6,7 @@
 #include <unordered_set>
 #include <utility>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCGameRulesHeader.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"

targets/app/common/GameSettingsManager.cpp

@@ -2,7 +2,7 @@
 
 #include "app/common/Game.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/All Platforms/UIEnums.h"

targets/app/common/Game_XuiActions.cpp

@@ -7,7 +7,7 @@
 #include "platform/sdl2/Render.h"
 #include "platform/sdl2/Storage.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/common/DLC/DLCManager.h"
@@ -23,7 +23,7 @@
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 #include "platform/PlatformServices.h"
 #include "java/Class.h"

targets/app/common/IPlatformGame.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 
 class IPlatformGame {
 public:

targets/app/common/LocalizationManager.cpp

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
 #include "app/common/Localisation/StringTable.h"
 #include "app/common/Colours/ColourTable.h"

targets/app/common/LocalizationManager.h

@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
 #include "platform/XboxStubs.h"
 

targets/app/common/Network/GameNetworkManager.cpp

@@ -13,7 +13,7 @@
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
 #include "platform/sdl2/Storage.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Game.h"
 #include "app/common/GameRules/GameRuleManager.h"
 #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"

targets/app/common/Network/PlatformNetworkManagerInterface.h

@@ -6,7 +6,7 @@
 #include <qnet.h>
 #endif
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
 #include "platform/C4JThread.h"

targets/app/common/Network/PlatformNetworkManagerStub.h

@@ -6,7 +6,7 @@
 
 #include "platform/PlatformTypes.h"
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "platform/IPlatformNetwork.h"

targets/app/common/SkinManager.h

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "app/common/App_structs.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 
 class ModelPart;

targets/app/common/TerrainFeatureManager.h

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
 
 class TerrainFeatureManager {

targets/app/common/Tutorial/Tasks/ControllerTask.cpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "platform/sdl2/Input.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Tutorial/Constraints/InputConstraint.h"
 #include "app/common/Tutorial/Tasks/TutorialTask.h"
 #include "app/linux/LinuxGame.h"

targets/app/common/Tutorial/Tutorial.cpp

@@ -8,7 +8,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/App_structs.h"
 #include "app/common/Tutorial/Constraints/TutorialConstraint.h"
 #include "app/common/Tutorial/Hints/DiggerItemHint.h"

targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp

@@ -10,7 +10,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/Tutorial/TutorialMode.h"
 #include "app/common/UI/All Platforms/UIStructs.h"

targets/app/common/UI/All Platforms/IUIScene_BeaconMenu.cpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
 #include "app/linux/LinuxGame.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"

targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp

@@ -10,7 +10,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/UI/All Platforms/UIEnums.h"

targets/app/common/UI/All Platforms/IUIScene_HUD.cpp

@@ -5,7 +5,7 @@
 
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "java/Class.h"

targets/app/common/UI/All Platforms/IUIScene_PauseMenu.cpp

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/GameRules/GameRuleManager.h"

targets/app/common/UI/Components/UIComponent_Tooltips.cpp

@@ -2,7 +2,7 @@
 
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
 #include "app/common/UI/UILayer.h"
 #include "app/common/UI/UIScene.h"

targets/app/common/UI/Components/UIComponent_Tooltips.h

@@ -5,7 +5,7 @@
 #include "platform/PlatformTypes.h"
 #include "platform/InputActions.h"
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
 #include "app/common/UI/UIScene.h"
 #include "app/common/UI/UIString.h"

targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/common/UI/Controls/UIControl_Label.h"

targets/app/common/UI/Components/UIScene_HUD.cpp

@@ -5,7 +5,7 @@
 #include <memory>
 
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Components/UIComponent_Chat.h"
 #include "app/common/UI/Controls/UIControl_Label.h"
 #include "app/common/UI/UILayer.h"

targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp

@@ -6,7 +6,7 @@
 #include <sstream>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"

targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl.h"
 #include "app/linux/Iggy/include/iggy.h"
 #ifndef _ENABLEIGGY

targets/app/common/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp

@@ -6,7 +6,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/GameRules/LevelGeneration/ConsoleSchematicFile.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"

targets/app/common/UI/Scenes/Debug/UIScene_DebugOverlay.cpp

@@ -7,7 +7,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
 #include "app/common/UI/Controls/UIControl_Button.h"

targets/app/common/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp

@@ -8,7 +8,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp

@@ -11,7 +11,7 @@
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Profile.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/Network/GameNetworkManager.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp

@@ -2,7 +2,7 @@
 #include "UIScene_DLCMainMenu.h"
 
 #include "platform/InputActions.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/common/UI/Controls/UIControl_ButtonList.h"
 #include "app/common/UI/Controls/UIControl_Label.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp

@@ -8,7 +8,7 @@
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Profile.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Controls/UIControl_DynamicLabel.h"
 #include "app/common/UI/UILayer.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp

@@ -8,7 +8,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/SessionInfo.h"
 #include "app/common/UI/All Platforms/UIStructs.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp

@@ -9,7 +9,7 @@
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"
 #include "app/common/UI/Controls/UIControl_HTMLLabel.h"
 #include "app/common/UI/Controls/UIControl_Label.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp

@@ -9,7 +9,7 @@
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp

@@ -10,7 +10,7 @@
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Profile.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "app/common/Network/GameNetworkManager.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp

@@ -11,7 +11,7 @@
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/common/UI/Controls/UIControl_Button.h"

targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp

@@ -5,7 +5,7 @@
 
 #include "platform/InputActions.h"
 #include "app/common/App_Defines.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Controls/UIControl_DynamicLabel.h"
 #include "app/common/UI/UILayer.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp

@@ -6,7 +6,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Input.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/BuildVer/BuildVer.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "platform/InputActions.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_Label.h"
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h

@@ -9,7 +9,7 @@
 #include "app/common/UI/UIScene.h"
 #include "app/linux/Iggy/include/rrCore.h"
 #include "platform/NetTypes.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "platform/XboxStubs.h"
 
 class UILayer;

targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp

@@ -4,7 +4,7 @@
 #include <wchar.h>
 
 #include "platform/InputActions.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_Slider.h"
 #include "app/common/UI/UILayer.h"
 #include "app/common/UI/UIScene.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp

@@ -3,7 +3,7 @@
 #include <wchar.h>
 
 #include "platform/InputActions.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_Slider.h"
 #include "app/common/UI/UILayer.h"
 #include "app/common/UI/UIScene.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp

@@ -4,7 +4,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"
 #include "app/common/UI/Controls/UIControl_Slider.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp

@@ -6,7 +6,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Render.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/Controls/UIControl_Button.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp

@@ -5,7 +5,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/UI/Controls/UIControl_CheckBox.h"
 #include "app/common/UI/Controls/UIControl_Slider.h"
 #include "app/common/UI/UILayer.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp

@@ -20,7 +20,7 @@
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "util/StringHelpers.h"
 
 #include "minecraft/client/Minecraft.h"

targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h

@@ -15,7 +15,7 @@
 #include "app/linux/Stubs/iggy_stubs.h"
 #endif
 #include "app/linux/Iggy/include/rrCore.h"
-#include "minecraft/client/SkinBox.h"
+#include "minecraft/client/model/SkinBox.h"
 #include "minecraft/world/entity/player/SkinTypes.h"
 #include "minecraft/client/renderer/Textures.h"
 

targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp

@@ -6,7 +6,7 @@
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
 #include "platform/sdl2/Storage.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/Tutorial/TutorialMode.h"

targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp

@@ -9,7 +9,7 @@
 #include "platform/PlatformTypes.h"
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"

targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp

@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "platform/InputActions.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/NetworkPlayerInterface.h"
 #include "app/common/UI/All Platforms/UIStructs.h"

targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp

@@ -5,7 +5,7 @@
 #include "platform/PlatformTypes.h"
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/NetworkPlayerInterface.h"

targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp

@@ -4,7 +4,7 @@
 #include <memory>
 
 #include "platform/InputActions.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/NetworkPlayerInterface.h"
 #include "app/common/UI/All Platforms/UIStructs.h"

targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp

@@ -7,7 +7,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/DLC/DLCPack.h"
 #include "app/common/Network/GameNetworkManager.h"

targets/app/common/UI/Scenes/UIScene_ConnectingProgress.cpp

@@ -3,7 +3,7 @@
 
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/common/UI/Controls/UIControl_Button.h"

targets/app/common/UI/Scenes/UIScene_FullscreenProgress.cpp

@@ -7,7 +7,7 @@
 #include "platform/PlatformTypes.h"
 #include "platform/InputActions.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Tutorial/Tutorial.h"
 #include "app/common/UI/Controls/UIControl_Button.h"

targets/app/common/UI/UIController.cpp

@@ -12,7 +12,7 @@
 
 #include "platform/sdl2/Input.h"
 #include "platform/sdl2/Profile.h"
-#include "app/common/App_enums.h"
+#include "minecraft/GameEnums.h"
 #include "app/common/Audio/SoundEngine.h"
 #include "app/common/DLC/DLCManager.h"
 #include "app/common/Network/GameNetworkManager.h"