From ad1e8369bc346ad432a65d371eab6cc135b7adc5 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Mon, 9 Mar 2026 00:17:42 -0500 Subject: [PATCH] refactor: move Common to Platform/Common --- 4J.Input/4J_Input.cpp | 2 +- Minecraft.Client/Build/stdafx.h | 78 +++++++++---------- Minecraft.Client/GameState/StatsCounter.cpp | 2 +- Minecraft.Client/Minecraft.cpp | 4 +- Minecraft.Client/MinecraftServer.cpp | 4 +- Minecraft.Client/Network/ClientConnection.cpp | 4 +- Minecraft.Client/Network/PlayerList.cpp | 2 +- .../Platform/Common}/App_Defines.h | 0 .../Platform/Common}/App_enums.h | 0 .../Platform/Common}/App_structs.h | 0 .../Common}/Audio/Consoles_SoundEngine.cpp | 0 .../Common}/Audio/Consoles_SoundEngine.h | 0 .../Platform/Common}/Audio/SoundEngine.cpp | 0 .../Platform/Common}/Audio/SoundEngine.h | 0 .../Platform/Common}/Audio/SoundNames.cpp | 0 .../Platform/Common}/BuildVer.h | 0 .../Platform/Common}/C4JMemoryPool.h | 0 .../Platform/Common}/C4JMemoryPoolAllocator.h | 0 .../Platform/Common}/Colours/ColourTable.cpp | 0 .../Platform/Common}/Colours/ColourTable.h | 0 .../Platform/Common}/ConsoleGameMode.cpp | 0 .../Platform/Common}/ConsoleGameMode.h | 0 .../Platform/Common}/Console_Awards_enum.h | 0 .../Platform/Common}/Console_Debug_enum.h | 0 .../Platform/Common}/Console_Utils.cpp | 0 .../Platform/Common}/Consoles_App.cpp | 0 .../Platform/Common}/Consoles_App.h | 0 .../Platform/Common}/DLC/DLCAudioFile.cpp | 0 .../Platform/Common}/DLC/DLCAudioFile.h | 0 .../Platform/Common}/DLC/DLCCapeFile.cpp | 0 .../Platform/Common}/DLC/DLCCapeFile.h | 0 .../Common}/DLC/DLCColourTableFile.cpp | 0 .../Platform/Common}/DLC/DLCColourTableFile.h | 0 .../Platform/Common}/DLC/DLCFile.cpp | 0 .../Platform/Common}/DLC/DLCFile.h | 0 .../Platform/Common}/DLC/DLCGameRules.h | 0 .../Platform/Common}/DLC/DLCGameRulesFile.cpp | 0 .../Platform/Common}/DLC/DLCGameRulesFile.h | 0 .../Common}/DLC/DLCGameRulesHeader.cpp | 0 .../Platform/Common}/DLC/DLCGameRulesHeader.h | 0 .../Common}/DLC/DLCLocalisationFile.cpp | 0 .../Common}/DLC/DLCLocalisationFile.h | 0 .../Platform/Common}/DLC/DLCManager.cpp | 0 .../Platform/Common}/DLC/DLCManager.h | 0 .../Platform/Common}/DLC/DLCPack.cpp | 0 .../Platform/Common}/DLC/DLCPack.h | 0 .../Platform/Common}/DLC/DLCSkinFile.cpp | 0 .../Platform/Common}/DLC/DLCSkinFile.h | 0 .../Platform/Common}/DLC/DLCTextureFile.cpp | 0 .../Platform/Common}/DLC/DLCTextureFile.h | 0 .../Platform/Common}/DLC/DLCUIDataFile.cpp | 0 .../Platform/Common}/DLC/DLCUIDataFile.h | 0 .../AddEnchantmentRuleDefinition.cpp | 0 .../GameRules/AddEnchantmentRuleDefinition.h | 0 .../GameRules/AddItemRuleDefinition.cpp | 0 .../Common}/GameRules/AddItemRuleDefinition.h | 0 .../ApplySchematicRuleDefinition.cpp | 0 .../GameRules/ApplySchematicRuleDefinition.h | 0 .../Common}/GameRules/BiomeOverride.cpp | 0 .../Common}/GameRules/BiomeOverride.h | 0 .../GameRules/CollectItemRuleDefinition.cpp | 0 .../GameRules/CollectItemRuleDefinition.h | 0 .../GameRules/CompleteAllRuleDefinition.cpp | 0 .../GameRules/CompleteAllRuleDefinition.h | 0 .../GameRules/CompoundGameRuleDefinition.cpp | 0 .../GameRules/CompoundGameRuleDefinition.h | 0 .../Common}/GameRules/ConsoleGameRules.h | 0 .../GameRules/ConsoleGameRulesConstants.h | 0 .../GameRules/ConsoleGenerateStructure.cpp | 0 .../GameRules/ConsoleGenerateStructure.h | 0 .../ConsoleGenerateStructureAction.h | 0 .../GameRules/ConsoleSchematicFile.cpp | 0 .../Common}/GameRules/ConsoleSchematicFile.h | 0 .../Platform/Common}/GameRules/GameRule.cpp | 0 .../Platform/Common}/GameRules/GameRule.h | 0 .../Common}/GameRules/GameRuleDefinition.cpp | 0 .../Common}/GameRules/GameRuleDefinition.h | 0 .../Common}/GameRules/GameRuleManager.cpp | 0 .../Common}/GameRules/GameRuleManager.h | 0 .../Common}/GameRules/GameRulesInstance.h | 0 .../GameRules/LevelGenerationOptions.cpp | 0 .../GameRules/LevelGenerationOptions.h | 0 .../Common}/GameRules/LevelGenerators.cpp | 0 .../Common}/GameRules/LevelGenerators.h | 0 .../Platform/Common}/GameRules/LevelRules.cpp | 0 .../Platform/Common}/GameRules/LevelRules.h | 0 .../Common}/GameRules/LevelRuleset.cpp | 0 .../Platform/Common}/GameRules/LevelRuleset.h | 0 .../GameRules/NamedAreaRuleDefinition.cpp | 0 .../GameRules/NamedAreaRuleDefinition.h | 0 .../Common}/GameRules/StartFeature.cpp | 0 .../Platform/Common}/GameRules/StartFeature.h | 0 .../GameRules/UpdatePlayerRuleDefinition.cpp | 0 .../GameRules/UpdatePlayerRuleDefinition.h | 0 .../GameRules/UseTileRuleDefinition.cpp | 0 .../Common}/GameRules/UseTileRuleDefinition.h | 0 .../XboxStructureActionGenerateBox.cpp | 0 .../XboxStructureActionGenerateBox.h | 0 .../XboxStructureActionPlaceBlock.cpp | 0 .../GameRules/XboxStructureActionPlaceBlock.h | 0 .../XboxStructureActionPlaceContainer.cpp | 0 .../XboxStructureActionPlaceContainer.h | 0 .../XboxStructureActionPlaceSpawner.cpp | 0 .../XboxStructureActionPlaceSpawner.h | 0 .../Leaderboards/LeaderboardManager.cpp | 0 .../Common}/Leaderboards/LeaderboardManager.h | 0 .../Platform/Common}/Minecraft_Macros.h | 0 .../Common}/Network/GameNetworkManager.cpp | 0 .../Common}/Network/GameNetworkManager.h | 0 .../Common}/Network/NetworkPlayerInterface.h | 0 .../Network/PlatformNetworkManagerInterface.h | 0 .../Network/PlatformNetworkManagerStub.cpp | 0 .../Network/PlatformNetworkManagerStub.h | 0 .../Platform/Common}/Network/SessionInfo.h | 0 .../Network/Sony/NetworkPlayerSony.cpp | 0 .../Common}/Network/Sony/NetworkPlayerSony.h | 0 .../Sony/PlatformNetworkManagerSony.cpp | 0 .../Network/Sony/PlatformNetworkManagerSony.h | 0 .../Network/Sony/SQRNetworkManager.cpp | 0 .../Common}/Network/Sony/SQRNetworkManager.h | 0 .../Common}/Network/Sony/SQRNetworkPlayer.cpp | 0 .../Common}/Network/Sony/SQRNetworkPlayer.h | 0 .../Common}/Network/Sony/SonyCommerce.cpp | 0 .../Common}/Network/Sony/SonyCommerce.h | 0 .../Common}/Network/Sony/SonyHttp.cpp | 0 .../Platform/Common}/Network/Sony/SonyHttp.h | 0 .../Network/Sony/SonyRemoteStorage.cpp | 0 .../Common}/Network/Sony/SonyRemoteStorage.h | 0 .../header/sceRemoteStorage.h | 0 .../header/sceRemoteStorageDefines.h | 0 .../Platform/Common}/Potion_Macros.h | 0 .../Common}/Telemetry/TelemetryManager.cpp | 0 .../Common}/Telemetry/TelemetryManager.h | 0 .../Platform/Common}/Trial/TrialMode.cpp | 0 .../Platform/Common}/Trial/TrialMode.h | 0 .../Common}/Tutorial/AreaConstraint.cpp | 0 .../Common}/Tutorial/AreaConstraint.h | 0 .../Platform/Common}/Tutorial/AreaHint.cpp | 0 .../Platform/Common}/Tutorial/AreaHint.h | 0 .../Platform/Common}/Tutorial/AreaTask.cpp | 0 .../Platform/Common}/Tutorial/AreaTask.h | 0 .../Tutorial/ChangeStateConstraint.cpp | 0 .../Common}/Tutorial/ChangeStateConstraint.h | 0 .../Platform/Common}/Tutorial/ChoiceTask.cpp | 0 .../Platform/Common}/Tutorial/ChoiceTask.h | 0 .../Tutorial/CompleteUsingItemTask.cpp | 0 .../Common}/Tutorial/CompleteUsingItemTask.h | 0 .../Common}/Tutorial/ControllerTask.cpp | 0 .../Common}/Tutorial/ControllerTask.h | 0 .../Platform/Common}/Tutorial/CraftTask.cpp | 0 .../Platform/Common}/Tutorial/CraftTask.h | 0 .../Common}/Tutorial/DiggerItemHint.cpp | 0 .../Common}/Tutorial/DiggerItemHint.h | 0 .../Common}/Tutorial/EffectChangedTask.cpp | 0 .../Common}/Tutorial/EffectChangedTask.h | 0 .../Common}/Tutorial/FullTutorial.cpp | 0 .../Platform/Common}/Tutorial/FullTutorial.h | 0 .../Tutorial/FullTutorialActiveTask.cpp | 0 .../Common}/Tutorial/FullTutorialActiveTask.h | 0 .../Common}/Tutorial/FullTutorialMode.cpp | 0 .../Common}/Tutorial/FullTutorialMode.h | 0 .../Platform/Common}/Tutorial/InfoTask.cpp | 0 .../Platform/Common}/Tutorial/InfoTask.h | 0 .../Common}/Tutorial/InputConstraint.cpp | 0 .../Common}/Tutorial/InputConstraint.h | 0 .../Common}/Tutorial/LookAtEntityHint.cpp | 0 .../Common}/Tutorial/LookAtEntityHint.h | 0 .../Common}/Tutorial/LookAtTileHint.cpp | 0 .../Common}/Tutorial/LookAtTileHint.h | 0 .../Platform/Common}/Tutorial/PickupTask.cpp | 0 .../Platform/Common}/Tutorial/PickupTask.h | 0 .../Tutorial/ProcedureCompoundTask.cpp | 0 .../Common}/Tutorial/ProcedureCompoundTask.h | 0 .../Common}/Tutorial/ProgressFlagTask.cpp | 0 .../Common}/Tutorial/ProgressFlagTask.h | 0 .../Platform/Common}/Tutorial/StatTask.cpp | 0 .../Platform/Common}/Tutorial/StatTask.h | 0 .../Common}/Tutorial/StateChangeTask.h | 0 .../Common}/Tutorial/TakeItemHint.cpp | 0 .../Platform/Common}/Tutorial/TakeItemHint.h | 0 .../Platform/Common}/Tutorial/Tutorial.cpp | 0 .../Platform/Common}/Tutorial/Tutorial.h | 0 .../Common}/Tutorial/TutorialConstraint.h | 0 .../Common}/Tutorial/TutorialConstraints.h | 0 .../Platform/Common}/Tutorial/TutorialEnum.h | 0 .../Common}/Tutorial/TutorialHint.cpp | 0 .../Platform/Common}/Tutorial/TutorialHint.h | 0 .../Platform/Common}/Tutorial/TutorialHints.h | 0 .../Common}/Tutorial/TutorialMessage.cpp | 0 .../Common}/Tutorial/TutorialMessage.h | 0 .../Common}/Tutorial/TutorialMode.cpp | 0 .../Platform/Common}/Tutorial/TutorialMode.h | 0 .../Common}/Tutorial/TutorialTask.cpp | 0 .../Platform/Common}/Tutorial/TutorialTask.h | 0 .../Platform/Common}/Tutorial/TutorialTasks.h | 0 .../Platform/Common}/Tutorial/UseItemTask.cpp | 0 .../Platform/Common}/Tutorial/UseItemTask.h | 0 .../Platform/Common}/Tutorial/UseTileTask.cpp | 0 .../Platform/Common}/Tutorial/UseTileTask.h | 0 .../Common}/Tutorial/XuiCraftingTask.cpp | 0 .../Common}/Tutorial/XuiCraftingTask.h | 0 .../Platform/Common}/UI/IUIController.h | 0 .../UI/IUIScene_AbstractContainerMenu.cpp | 0 .../UI/IUIScene_AbstractContainerMenu.h | 0 .../Common}/UI/IUIScene_AnvilMenu.cpp | 0 .../Platform/Common}/UI/IUIScene_AnvilMenu.h | 0 .../Common}/UI/IUIScene_BrewingMenu.cpp | 0 .../Common}/UI/IUIScene_BrewingMenu.h | 0 .../Common}/UI/IUIScene_ContainerMenu.cpp | 0 .../Common}/UI/IUIScene_ContainerMenu.h | 0 .../Common}/UI/IUIScene_CraftingMenu.cpp | 0 .../Common}/UI/IUIScene_CraftingMenu.h | 0 .../Common}/UI/IUIScene_CreativeMenu.cpp | 0 .../Common}/UI/IUIScene_CreativeMenu.h | 0 .../Common}/UI/IUIScene_DispenserMenu.cpp | 0 .../Common}/UI/IUIScene_DispenserMenu.h | 0 .../Common}/UI/IUIScene_EnchantingMenu.cpp | 0 .../Common}/UI/IUIScene_EnchantingMenu.h | 0 .../Common}/UI/IUIScene_FurnaceMenu.cpp | 0 .../Common}/UI/IUIScene_FurnaceMenu.h | 0 .../Common}/UI/IUIScene_InventoryMenu.cpp | 0 .../Common}/UI/IUIScene_InventoryMenu.h | 0 .../Common}/UI/IUIScene_PauseMenu.cpp | 0 .../Platform/Common}/UI/IUIScene_PauseMenu.h | 0 .../Common}/UI/IUIScene_StartGame.cpp | 0 .../Platform/Common}/UI/IUIScene_StartGame.h | 0 .../Common}/UI/IUIScene_TradingMenu.cpp | 0 .../Common}/UI/IUIScene_TradingMenu.h | 0 .../Platform/Common}/UI/UI.h | 0 .../Platform/Common}/UI/UIBitmapFont.cpp | 0 .../Platform/Common}/UI/UIBitmapFont.h | 0 .../Platform/Common}/UI/UIComponent_Chat.cpp | 0 .../Platform/Common}/UI/UIComponent_Chat.h | 0 .../Common}/UI/UIComponent_DebugUIConsole.cpp | 0 .../Common}/UI/UIComponent_DebugUIConsole.h | 0 .../UI/UIComponent_DebugUIMarketingGuide.cpp | 0 .../UI/UIComponent_DebugUIMarketingGuide.h | 0 .../Platform/Common}/UI/UIComponent_Logo.cpp | 0 .../Platform/Common}/UI/UIComponent_Logo.h | 0 .../Common}/UI/UIComponent_MenuBackground.cpp | 0 .../Common}/UI/UIComponent_MenuBackground.h | 0 .../Common}/UI/UIComponent_Panorama.cpp | 0 .../Common}/UI/UIComponent_Panorama.h | 0 .../UI/UIComponent_PressStartToPlay.cpp | 0 .../Common}/UI/UIComponent_PressStartToPlay.h | 0 .../Common}/UI/UIComponent_Tooltips.cpp | 0 .../Common}/UI/UIComponent_Tooltips.h | 0 .../Common}/UI/UIComponent_TutorialPopup.cpp | 0 .../Common}/UI/UIComponent_TutorialPopup.h | 0 .../Platform/Common}/UI/UIControl.cpp | 0 .../Platform/Common}/UI/UIControl.h | 0 .../Platform/Common}/UI/UIControl_Base.cpp | 0 .../Platform/Common}/UI/UIControl_Base.h | 0 .../Common}/UI/UIControl_BitmapIcon.cpp | 0 .../Common}/UI/UIControl_BitmapIcon.h | 0 .../Platform/Common}/UI/UIControl_Button.cpp | 0 .../Platform/Common}/UI/UIControl_Button.h | 0 .../Common}/UI/UIControl_ButtonList.cpp | 0 .../Common}/UI/UIControl_ButtonList.h | 0 .../Common}/UI/UIControl_CheckBox.cpp | 0 .../Platform/Common}/UI/UIControl_CheckBox.h | 0 .../Platform/Common}/UI/UIControl_Cursor.cpp | 0 .../Platform/Common}/UI/UIControl_Cursor.h | 0 .../Platform/Common}/UI/UIControl_DLCList.cpp | 0 .../Platform/Common}/UI/UIControl_DLCList.h | 0 .../Common}/UI/UIControl_DynamicLabel.cpp | 0 .../Common}/UI/UIControl_DynamicLabel.h | 0 .../Common}/UI/UIControl_EnchantmentBook.cpp | 0 .../Common}/UI/UIControl_EnchantmentBook.h | 0 .../UI/UIControl_EnchantmentButton.cpp | 0 .../Common}/UI/UIControl_EnchantmentButton.h | 0 .../Common}/UI/UIControl_HTMLLabel.cpp | 0 .../Platform/Common}/UI/UIControl_HTMLLabel.h | 0 .../Platform/Common}/UI/UIControl_Label.cpp | 0 .../Platform/Common}/UI/UIControl_Label.h | 0 .../Common}/UI/UIControl_LeaderboardList.cpp | 0 .../Common}/UI/UIControl_LeaderboardList.h | 0 .../Common}/UI/UIControl_MinecraftPlayer.cpp | 0 .../Common}/UI/UIControl_MinecraftPlayer.h | 0 .../Common}/UI/UIControl_PlayerList.cpp | 0 .../Common}/UI/UIControl_PlayerList.h | 0 .../UI/UIControl_PlayerSkinPreview.cpp | 0 .../Common}/UI/UIControl_PlayerSkinPreview.h | 0 .../Common}/UI/UIControl_Progress.cpp | 0 .../Platform/Common}/UI/UIControl_Progress.h | 0 .../Common}/UI/UIControl_SaveList.cpp | 0 .../Platform/Common}/UI/UIControl_SaveList.h | 0 .../Platform/Common}/UI/UIControl_Slider.cpp | 0 .../Platform/Common}/UI/UIControl_Slider.h | 0 .../Common}/UI/UIControl_SlotList.cpp | 0 .../Platform/Common}/UI/UIControl_SlotList.h | 0 .../UI/UIControl_SpaceIndicatorBar.cpp | 0 .../Common}/UI/UIControl_SpaceIndicatorBar.h | 0 .../Common}/UI/UIControl_TextInput.cpp | 0 .../Platform/Common}/UI/UIControl_TextInput.h | 0 .../Common}/UI/UIControl_TexturePackList.cpp | 0 .../Common}/UI/UIControl_TexturePackList.h | 0 .../Platform/Common}/UI/UIControl_Touch.cpp | 0 .../Platform/Common}/UI/UIControl_Touch.h | 0 .../Platform/Common}/UI/UIController.cpp | 0 .../Platform/Common}/UI/UIController.h | 0 .../Platform/Common}/UI/UIEnums.h | 0 .../Platform/Common}/UI/UIFontData.cpp | 0 .../Platform/Common}/UI/UIFontData.h | 0 .../Platform/Common}/UI/UIGroup.cpp | 0 .../Platform/Common}/UI/UIGroup.h | 0 .../Platform/Common}/UI/UILayer.cpp | 0 .../Platform/Common}/UI/UILayer.h | 0 .../Platform/Common}/UI/UIScene.cpp | 0 .../Platform/Common}/UI/UIScene.h | 0 .../UI/UIScene_AbstractContainerMenu.cpp | 0 .../UI/UIScene_AbstractContainerMenu.h | 0 .../Platform/Common}/UI/UIScene_AnvilMenu.cpp | 0 .../Platform/Common}/UI/UIScene_AnvilMenu.h | 0 .../Common}/UI/UIScene_BrewingStandMenu.cpp | 0 .../Common}/UI/UIScene_BrewingStandMenu.h | 0 .../Common}/UI/UIScene_ConnectingProgress.cpp | 0 .../Common}/UI/UIScene_ConnectingProgress.h | 0 .../Common}/UI/UIScene_ContainerMenu.cpp | 0 .../Common}/UI/UIScene_ContainerMenu.h | 0 .../Common}/UI/UIScene_ControlsMenu.cpp | 0 .../Common}/UI/UIScene_ControlsMenu.h | 0 .../Common}/UI/UIScene_CraftingMenu.cpp | 0 .../Common}/UI/UIScene_CraftingMenu.h | 0 .../Common}/UI/UIScene_CreateWorldMenu.cpp | 0 .../Common}/UI/UIScene_CreateWorldMenu.h | 0 .../Common}/UI/UIScene_CreativeMenu.cpp | 0 .../Common}/UI/UIScene_CreativeMenu.h | 0 .../Platform/Common}/UI/UIScene_Credits.cpp | 0 .../Platform/Common}/UI/UIScene_Credits.h | 0 .../Common}/UI/UIScene_DLCMainMenu.cpp | 0 .../Platform/Common}/UI/UIScene_DLCMainMenu.h | 0 .../Common}/UI/UIScene_DLCOffersMenu.cpp | 0 .../Common}/UI/UIScene_DLCOffersMenu.h | 0 .../Platform/Common}/UI/UIScene_DeathMenu.cpp | 0 .../Platform/Common}/UI/UIScene_DeathMenu.h | 0 .../UI/UIScene_DebugCreateSchematic.cpp | 0 .../Common}/UI/UIScene_DebugCreateSchematic.h | 0 .../Common}/UI/UIScene_DebugOptions.cpp | 0 .../Common}/UI/UIScene_DebugOptions.h | 0 .../Common}/UI/UIScene_DebugOverlay.cpp | 0 .../Common}/UI/UIScene_DebugOverlay.h | 0 .../Common}/UI/UIScene_DebugSetCamera.cpp | 0 .../Common}/UI/UIScene_DebugSetCamera.h | 0 .../Common}/UI/UIScene_DispenserMenu.cpp | 0 .../Common}/UI/UIScene_DispenserMenu.h | 0 .../Platform/Common}/UI/UIScene_EULA.cpp | 0 .../Platform/Common}/UI/UIScene_EULA.h | 0 .../Common}/UI/UIScene_EnchantingMenu.cpp | 0 .../Common}/UI/UIScene_EnchantingMenu.h | 0 .../Platform/Common}/UI/UIScene_EndPoem.cpp | 0 .../Platform/Common}/UI/UIScene_EndPoem.h | 0 .../Common}/UI/UIScene_FullscreenProgress.cpp | 0 .../Common}/UI/UIScene_FullscreenProgress.h | 0 .../Common}/UI/UIScene_FurnaceMenu.cpp | 0 .../Platform/Common}/UI/UIScene_FurnaceMenu.h | 0 .../Platform/Common}/UI/UIScene_HUD.cpp | 0 .../Platform/Common}/UI/UIScene_HUD.h | 0 .../Common}/UI/UIScene_HelpAndOptionsMenu.cpp | 0 .../Common}/UI/UIScene_HelpAndOptionsMenu.h | 0 .../Platform/Common}/UI/UIScene_HowToPlay.cpp | 0 .../Platform/Common}/UI/UIScene_HowToPlay.h | 0 .../Common}/UI/UIScene_HowToPlayMenu.cpp | 0 .../Common}/UI/UIScene_HowToPlayMenu.h | 0 .../UI/UIScene_InGameHostOptionsMenu.cpp | 0 .../UI/UIScene_InGameHostOptionsMenu.h | 0 .../Common}/UI/UIScene_InGameInfoMenu.cpp | 0 .../Common}/UI/UIScene_InGameInfoMenu.h | 0 .../UI/UIScene_InGamePlayerOptionsMenu.cpp | 0 .../UI/UIScene_InGamePlayerOptionsMenu.h | 0 .../UI/UIScene_InGameSaveManagementMenu.cpp | 0 .../UI/UIScene_InGameSaveManagementMenu.h | 0 .../Platform/Common}/UI/UIScene_Intro.cpp | 0 .../Platform/Common}/UI/UIScene_Intro.h | 0 .../Common}/UI/UIScene_InventoryMenu.cpp | 0 .../Common}/UI/UIScene_InventoryMenu.h | 0 .../Platform/Common}/UI/UIScene_JoinMenu.cpp | 0 .../Platform/Common}/UI/UIScene_JoinMenu.h | 0 .../Platform/Common}/UI/UIScene_Keyboard.cpp | 0 .../Platform/Common}/UI/UIScene_Keyboard.h | 0 .../UI/UIScene_LaunchMoreOptionsMenu.cpp | 0 .../UI/UIScene_LaunchMoreOptionsMenu.h | 0 .../Common}/UI/UIScene_LeaderboardsMenu.cpp | 0 .../Common}/UI/UIScene_LeaderboardsMenu.h | 0 .../Platform/Common}/UI/UIScene_LoadMenu.cpp | 0 .../Platform/Common}/UI/UIScene_LoadMenu.h | 0 .../Common}/UI/UIScene_LoadOrJoinMenu.cpp | 0 .../Common}/UI/UIScene_LoadOrJoinMenu.h | 0 .../Platform/Common}/UI/UIScene_MainMenu.cpp | 0 .../Platform/Common}/UI/UIScene_MainMenu.h | 0 .../Common}/UI/UIScene_MessageBox.cpp | 0 .../Platform/Common}/UI/UIScene_MessageBox.h | 0 .../Platform/Common}/UI/UIScene_PauseMenu.cpp | 0 .../Platform/Common}/UI/UIScene_PauseMenu.h | 0 .../Common}/UI/UIScene_QuadrantSignin.cpp | 0 .../Common}/UI/UIScene_QuadrantSignin.h | 0 .../Common}/UI/UIScene_ReinstallMenu.cpp | 0 .../Common}/UI/UIScene_ReinstallMenu.h | 0 .../Common}/UI/UIScene_SaveMessage.cpp | 0 .../Platform/Common}/UI/UIScene_SaveMessage.h | 0 .../Common}/UI/UIScene_SettingsAudioMenu.cpp | 0 .../Common}/UI/UIScene_SettingsAudioMenu.h | 0 .../UI/UIScene_SettingsControlMenu.cpp | 0 .../Common}/UI/UIScene_SettingsControlMenu.h | 0 .../UI/UIScene_SettingsGraphicsMenu.cpp | 0 .../Common}/UI/UIScene_SettingsGraphicsMenu.h | 0 .../Common}/UI/UIScene_SettingsMenu.cpp | 0 .../Common}/UI/UIScene_SettingsMenu.h | 0 .../UI/UIScene_SettingsOptionsMenu.cpp | 0 .../Common}/UI/UIScene_SettingsOptionsMenu.h | 0 .../Common}/UI/UIScene_SettingsUIMenu.cpp | 0 .../Common}/UI/UIScene_SettingsUIMenu.h | 0 .../Common}/UI/UIScene_SignEntryMenu.cpp | 0 .../Common}/UI/UIScene_SignEntryMenu.h | 0 .../Common}/UI/UIScene_SkinSelectMenu.cpp | 0 .../Common}/UI/UIScene_SkinSelectMenu.h | 0 .../Common}/UI/UIScene_TeleportMenu.cpp | 0 .../Common}/UI/UIScene_TeleportMenu.h | 0 .../Platform/Common}/UI/UIScene_Timer.cpp | 0 .../Platform/Common}/UI/UIScene_Timer.h | 0 .../Common}/UI/UIScene_TradingMenu.cpp | 0 .../Platform/Common}/UI/UIScene_TradingMenu.h | 0 .../Common}/UI/UIScene_TrialExitUpsell.cpp | 0 .../Common}/UI/UIScene_TrialExitUpsell.h | 0 .../Platform/Common}/UI/UIStructs.h | 0 .../Platform/Common}/UI/UITTFFont.cpp | 0 .../Platform/Common}/UI/UITTFFont.h | 0 .../Common}/XUI/SlotProgressControl.cpp | 0 .../Common}/XUI/SlotProgressControl.h | 0 .../Platform/Common}/XUI/XUI_BasePlayer.cpp | 0 .../Platform/Common}/XUI/XUI_BasePlayer.h | 0 .../Platform/Common}/XUI/XUI_Chat.cpp | 0 .../Platform/Common}/XUI/XUI_Chat.h | 0 .../Common}/XUI/XUI_ConnectingProgress.cpp | 0 .../Common}/XUI/XUI_ConnectingProgress.h | 0 .../Common}/XUI/XUI_Control_ComboBox.cpp | 0 .../Common}/XUI/XUI_Control_ComboBox.h | 0 .../Platform/Common}/XUI/XUI_Controls.h | 0 .../Platform/Common}/XUI/XUI_Ctrl_4JEdit.cpp | 0 .../Platform/Common}/XUI/XUI_Ctrl_4JEdit.h | 0 .../Platform/Common}/XUI/XUI_Ctrl_4JIcon.cpp | 0 .../Platform/Common}/XUI/XUI_Ctrl_4JIcon.h | 0 .../Platform/Common}/XUI/XUI_Ctrl_4JList.cpp | 0 .../Platform/Common}/XUI/XUI_Ctrl_4JList.h | 0 .../Common}/XUI/XUI_Ctrl_BrewProgress.cpp | 0 .../Common}/XUI/XUI_Ctrl_BrewProgress.h | 0 .../Common}/XUI/XUI_Ctrl_BubblesProgress.cpp | 0 .../Common}/XUI/XUI_Ctrl_BubblesProgress.h | 0 .../Common}/XUI/XUI_Ctrl_BurnProgress.cpp | 0 .../Common}/XUI/XUI_Ctrl_BurnProgress.h | 0 .../XUI/XUI_Ctrl_CraftIngredientSlot.cpp | 0 .../XUI/XUI_Ctrl_CraftIngredientSlot.h | 0 .../Common}/XUI/XUI_Ctrl_EnchantButton.cpp | 0 .../Common}/XUI/XUI_Ctrl_EnchantButton.h | 0 .../Common}/XUI/XUI_Ctrl_EnchantmentBook.cpp | 0 .../Common}/XUI/XUI_Ctrl_EnchantmentBook.h | 0 .../XUI/XUI_Ctrl_EnchantmentButtonText.cpp | 0 .../XUI/XUI_Ctrl_EnchantmentButtonText.h | 0 .../Common}/XUI/XUI_Ctrl_FireProgress.cpp | 0 .../Common}/XUI/XUI_Ctrl_FireProgress.h | 0 .../Common}/XUI/XUI_Ctrl_LoadingProgress.cpp | 0 .../Common}/XUI/XUI_Ctrl_LoadingProgress.h | 0 .../Common}/XUI/XUI_Ctrl_MinecraftPlayer.cpp | 0 .../Common}/XUI/XUI_Ctrl_MinecraftPlayer.h | 0 .../XUI/XUI_Ctrl_MinecraftSkinPreview.cpp | 0 .../XUI/XUI_Ctrl_MinecraftSkinPreview.h | 0 .../Common}/XUI/XUI_Ctrl_MinecraftSlot.cpp | 0 .../Common}/XUI/XUI_Ctrl_MinecraftSlot.h | 0 .../Common}/XUI/XUI_Ctrl_MobEffect.cpp | 0 .../Platform/Common}/XUI/XUI_Ctrl_MobEffect.h | 0 .../Common}/XUI/XUI_Ctrl_PassThroughList.cpp | 0 .../Common}/XUI/XUI_Ctrl_PassthroughList.h | 0 .../Common}/XUI/XUI_Ctrl_ProgressCtrlBase.cpp | 0 .../Common}/XUI/XUI_Ctrl_ProgressCtrlBase.h | 0 .../Common}/XUI/XUI_Ctrl_SliderWrapper.cpp | 0 .../Common}/XUI/XUI_Ctrl_SliderWrapper.h | 0 .../Platform/Common}/XUI/XUI_Ctrl_SlotItem.h | 0 .../Common}/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp | 0 .../Common}/XUI/XUI_Ctrl_SlotItemCtrlBase.h | 0 .../Common}/XUI/XUI_Ctrl_SlotItemListItem.h | 0 .../Common}/XUI/XUI_Ctrl_SlotList.cpp | 0 .../Platform/Common}/XUI/XUI_Ctrl_SlotList.h | 0 .../Common}/XUI/XUI_Ctrl_SplashPulser.cpp | 0 .../Common}/XUI/XUI_Ctrl_SplashPulser.h | 0 .../Platform/Common}/XUI/XUI_CustomMessages.h | 0 .../Platform/Common}/XUI/XUI_DLCOffers.cpp | 0 .../Platform/Common}/XUI/XUI_DLCOffers.h | 0 .../Platform/Common}/XUI/XUI_Death.cpp | 0 .../Platform/Common}/XUI/XUI_Death.h | 0 .../Platform/Common}/XUI/XUI_Debug.h | 0 .../Common}/XUI/XUI_DebugItemEditor.cpp | 0 .../Common}/XUI/XUI_DebugItemEditor.h | 0 .../Platform/Common}/XUI/XUI_DebugOverlay.cpp | 0 .../Platform/Common}/XUI/XUI_DebugOverlay.h | 0 .../Common}/XUI/XUI_DebugSchematicCreator.cpp | 0 .../Common}/XUI/XUI_DebugSchematicCreator.h | 0 .../Common}/XUI/XUI_DebugSetCamera.cpp | 0 .../Platform/Common}/XUI/XUI_DebugSetCamera.h | 0 .../Platform/Common}/XUI/XUI_DebugTips.cpp | 0 .../Platform/Common}/XUI/XUI_DebugTips.h | 0 .../Common}/XUI/XUI_FullscreenProgress.cpp | 0 .../Common}/XUI/XUI_FullscreenProgress.h | 0 .../Platform/Common}/XUI/XUI_HUD.cpp | 0 .../Platform/Common}/XUI/XUI_HUD.h | 0 .../Common}/XUI/XUI_HelpAndOptions.cpp | 0 .../Platform/Common}/XUI/XUI_HelpAndOptions.h | 0 .../Platform/Common}/XUI/XUI_HelpControls.cpp | 0 .../Platform/Common}/XUI/XUI_HelpControls.h | 0 .../Platform/Common}/XUI/XUI_HelpCredits.cpp | 0 .../Platform/Common}/XUI/XUI_HelpCredits.h | 0 .../Common}/XUI/XUI_HelpHowToPlay.cpp | 0 .../Platform/Common}/XUI/XUI_HelpHowToPlay.h | 0 .../Platform/Common}/XUI/XUI_Helper.h | 0 .../Common}/XUI/XUI_HowToPlayMenu.cpp | 0 .../Platform/Common}/XUI/XUI_HowToPlayMenu.h | 0 .../Common}/XUI/XUI_InGameHostOptions.cpp | 0 .../Common}/XUI/XUI_InGameHostOptions.h | 0 .../Platform/Common}/XUI/XUI_InGameInfo.cpp | 0 .../Platform/Common}/XUI/XUI_InGameInfo.h | 0 .../Common}/XUI/XUI_InGamePlayerOptions.cpp | 0 .../Common}/XUI/XUI_InGamePlayerOptions.h | 0 .../Platform/Common}/XUI/XUI_Intro.cpp | 0 .../Platform/Common}/XUI/XUI_Intro.h | 0 .../Platform/Common}/XUI/XUI_Leaderboards.cpp | 0 .../Platform/Common}/XUI/XUI_Leaderboards.h | 0 .../Platform/Common}/XUI/XUI_LoadSettings.cpp | 0 .../Platform/Common}/XUI/XUI_LoadSettings.h | 0 .../Platform/Common}/XUI/XUI_MainMenu.cpp | 0 .../Platform/Common}/XUI/XUI_MainMenu.h | 0 .../Common}/XUI/XUI_MultiGameCreate.cpp | 0 .../Common}/XUI/XUI_MultiGameCreate.h | 0 .../Common}/XUI/XUI_MultiGameInfo.cpp | 0 .../Platform/Common}/XUI/XUI_MultiGameInfo.h | 0 .../Common}/XUI/XUI_MultiGameJoinLoad.cpp | 0 .../Common}/XUI/XUI_MultiGameJoinLoad.h | 0 .../XUI/XUI_MultiGameLaunchMoreOptions.cpp | 0 .../XUI/XUI_MultiGameLaunchMoreOptions.h | 0 .../Common}/XUI/XUI_NewUpdateMessage.cpp | 0 .../Common}/XUI/XUI_NewUpdateMessage.h | 0 .../Common}/XUI/XUI_PartnernetPassword.cpp | 0 .../Common}/XUI/XUI_PartnernetPassword.h | 0 .../Platform/Common}/XUI/XUI_PauseMenu.cpp | 0 .../Platform/Common}/XUI/XUI_PauseMenu.h | 0 .../Platform/Common}/XUI/XUI_Reinstall.cpp | 0 .../Platform/Common}/XUI/XUI_Reinstall.h | 0 .../Platform/Common}/XUI/XUI_SaveMessage.cpp | 0 .../Platform/Common}/XUI/XUI_SaveMessage.h | 0 .../XUI/XUI_Scene_AbstractContainer.cpp | 0 .../Common}/XUI/XUI_Scene_AbstractContainer.h | 0 .../Platform/Common}/XUI/XUI_Scene_Anvil.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Anvil.h | 0 .../Platform/Common}/XUI/XUI_Scene_Base.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Base.h | 0 .../Common}/XUI/XUI_Scene_BrewingStand.cpp | 0 .../Common}/XUI/XUI_Scene_BrewingStand.h | 0 .../Common}/XUI/XUI_Scene_Container.cpp | 0 .../Common}/XUI/XUI_Scene_Container.h | 0 .../Common}/XUI/XUI_Scene_CraftingPanel.cpp | 0 .../Common}/XUI/XUI_Scene_CraftingPanel.h | 0 .../Common}/XUI/XUI_Scene_Enchant.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Enchant.h | 0 .../Common}/XUI/XUI_Scene_Furnace.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Furnace.h | 0 .../Common}/XUI/XUI_Scene_Inventory.cpp | 0 .../Common}/XUI/XUI_Scene_Inventory.h | 0 .../XUI/XUI_Scene_Inventory_Creative.cpp | 2 +- .../XUI/XUI_Scene_Inventory_Creative.h | 0 .../Common}/XUI/XUI_Scene_Trading.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Trading.h | 0 .../Platform/Common}/XUI/XUI_Scene_Trap.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Trap.h | 0 .../Platform/Common}/XUI/XUI_Scene_Win.cpp | 0 .../Platform/Common}/XUI/XUI_Scene_Win.h | 0 .../Platform/Common}/XUI/XUI_SettingsAll.cpp | 0 .../Platform/Common}/XUI/XUI_SettingsAll.h | 0 .../Common}/XUI/XUI_SettingsAudio.cpp | 0 .../Platform/Common}/XUI/XUI_SettingsAudio.h | 0 .../Common}/XUI/XUI_SettingsControl.cpp | 0 .../Common}/XUI/XUI_SettingsControl.h | 0 .../Common}/XUI/XUI_SettingsGraphics.cpp | 0 .../Common}/XUI/XUI_SettingsGraphics.h | 0 .../Common}/XUI/XUI_SettingsOptions.cpp | 0 .../Common}/XUI/XUI_SettingsOptions.h | 0 .../Platform/Common}/XUI/XUI_SettingsUI.cpp | 0 .../Platform/Common}/XUI/XUI_SettingsUI.h | 0 .../Platform/Common}/XUI/XUI_SignEntry.cpp | 0 .../Platform/Common}/XUI/XUI_SignEntry.h | 0 .../Platform/Common}/XUI/XUI_SkinSelect.cpp | 0 .../Platform/Common}/XUI/XUI_SkinSelect.h | 0 .../Platform/Common}/XUI/XUI_SocialPost.cpp | 0 .../Platform/Common}/XUI/XUI_SocialPost.h | 0 .../Platform/Common}/XUI/XUI_Teleport.cpp | 0 .../Platform/Common}/XUI/XUI_Teleport.h | 0 .../Platform/Common}/XUI/XUI_TextEntry.cpp | 0 .../Platform/Common}/XUI/XUI_TextEntry.h | 0 .../Common}/XUI/XUI_TransferToXboxOne.cpp | 0 .../Common}/XUI/XUI_TransferToXboxOne.h | 0 .../Common}/XUI/XUI_TrialExitUpsell.cpp | 0 .../Common}/XUI/XUI_TrialExitUpsell.h | 0 .../Common}/XUI/XUI_TutorialPopup.cpp | 0 .../Platform/Common}/XUI/XUI_TutorialPopup.h | 0 .../Platform/Common}/XUI/XUI_XZP_Icons.h | 0 .../Platform/Common}/XUI/XUI_debug.cpp | 0 .../Platform/Common}/xuiscene_base.h | 0 .../Platform/Common}/zlib/adler32.c | 0 .../Platform/Common}/zlib/compress.c | 0 .../Platform/Common}/zlib/crc32.c | 0 .../Platform/Common}/zlib/crc32.h | 0 .../Platform/Common}/zlib/deflate.c | 0 .../Platform/Common}/zlib/deflate.h | 0 .../Platform/Common}/zlib/gzclose.c | 0 .../Platform/Common}/zlib/gzguts.h | 0 .../Platform/Common}/zlib/gzlib.c | 0 .../Platform/Common}/zlib/gzread.c | 0 .../Platform/Common}/zlib/gzwrite.c | 0 .../Platform/Common}/zlib/infback.c | 0 .../Platform/Common}/zlib/inffast.c | 0 .../Platform/Common}/zlib/inffast.h | 0 .../Platform/Common}/zlib/inffixed.h | 0 .../Platform/Common}/zlib/inflate.c | 0 .../Platform/Common}/zlib/inflate.h | 0 .../Platform/Common}/zlib/inftrees.c | 0 .../Platform/Common}/zlib/inftrees.h | 0 .../Platform/Common}/zlib/trees.c | 0 .../Platform/Common}/zlib/trees.h | 0 .../Platform/Common}/zlib/uncompr.c | 0 .../Platform/Common}/zlib/zconf.h | 0 .../Platform/Common}/zlib/zlib.h | 0 .../Platform/Common}/zlib/zutil.c | 0 .../Platform/Common}/zlib/zutil.h | 0 Minecraft.Client/meson.build | 72 ++++++++++------- Minecraft.World/Blocks/StemTile.cpp | 2 +- .../IO/Files/ConsoleSaveFileOriginal.cpp | 2 +- .../IO/Files/ConsoleSaveFileSplit.cpp | 2 +- .../Level/Dimensions/Dimension.cpp | 2 +- .../Level/Dimensions/HellDimension.cpp | 2 +- .../Level/Dimensions/TheEndDimension.cpp | 2 +- Minecraft.World/Level/Level.cpp | 2 +- .../Network/Packets/SetHealthPacket.cpp | 2 +- Minecraft.World/Platform/stdafx.h | 38 ++++----- Minecraft.World/Stats/GenericStats.h | 2 +- Minecraft.World/meson.build | 4 +- 642 files changed, 122 insertions(+), 108 deletions(-) rename {Common => Minecraft.Client/Platform/Common}/App_Defines.h (100%) rename {Common => Minecraft.Client/Platform/Common}/App_enums.h (100%) rename {Common => Minecraft.Client/Platform/Common}/App_structs.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Audio/Consoles_SoundEngine.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Audio/Consoles_SoundEngine.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Audio/SoundEngine.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Audio/SoundEngine.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Audio/SoundNames.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/BuildVer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/C4JMemoryPool.h (100%) rename {Common => Minecraft.Client/Platform/Common}/C4JMemoryPoolAllocator.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Colours/ColourTable.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Colours/ColourTable.h (100%) rename {Common => Minecraft.Client/Platform/Common}/ConsoleGameMode.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/ConsoleGameMode.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Console_Awards_enum.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Console_Debug_enum.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Console_Utils.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Consoles_App.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Consoles_App.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCAudioFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCAudioFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCCapeFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCCapeFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCColourTableFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCColourTableFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCGameRules.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCGameRulesFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCGameRulesFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCGameRulesHeader.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCGameRulesHeader.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCLocalisationFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCLocalisationFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCManager.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCManager.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCPack.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCPack.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCSkinFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCSkinFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCTextureFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCTextureFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCUIDataFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/DLC/DLCUIDataFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/AddEnchantmentRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/AddEnchantmentRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/AddItemRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/AddItemRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ApplySchematicRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ApplySchematicRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/BiomeOverride.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/BiomeOverride.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/CollectItemRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/CollectItemRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/CompleteAllRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/CompleteAllRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/CompoundGameRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/CompoundGameRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleGameRules.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleGameRulesConstants.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleGenerateStructure.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleGenerateStructure.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleGenerateStructureAction.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleSchematicFile.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/ConsoleSchematicFile.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRule.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRule.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRuleManager.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRuleManager.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/GameRulesInstance.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelGenerationOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelGenerationOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelGenerators.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelGenerators.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelRules.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelRules.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelRuleset.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/LevelRuleset.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/NamedAreaRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/NamedAreaRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/StartFeature.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/StartFeature.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/UpdatePlayerRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/UpdatePlayerRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/UseTileRuleDefinition.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/UseTileRuleDefinition.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionGenerateBox.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionGenerateBox.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionPlaceBlock.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionPlaceBlock.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionPlaceContainer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionPlaceContainer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionPlaceSpawner.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/GameRules/XboxStructureActionPlaceSpawner.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Leaderboards/LeaderboardManager.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Leaderboards/LeaderboardManager.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Minecraft_Macros.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/GameNetworkManager.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/GameNetworkManager.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/NetworkPlayerInterface.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/PlatformNetworkManagerInterface.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/PlatformNetworkManagerStub.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/PlatformNetworkManagerStub.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/SessionInfo.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/NetworkPlayerSony.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/NetworkPlayerSony.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/PlatformNetworkManagerSony.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/PlatformNetworkManagerSony.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SQRNetworkManager.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SQRNetworkManager.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SQRNetworkPlayer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SQRNetworkPlayer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SonyCommerce.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SonyCommerce.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SonyHttp.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SonyHttp.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SonyRemoteStorage.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/SonyRemoteStorage.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Network/Sony/sceRemoteStorage/header/sceRemoteStorageDefines.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Potion_Macros.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Telemetry/TelemetryManager.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Telemetry/TelemetryManager.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Trial/TrialMode.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Trial/TrialMode.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/AreaConstraint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/AreaConstraint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/AreaHint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/AreaHint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/AreaTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/AreaTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ChangeStateConstraint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ChangeStateConstraint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ChoiceTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ChoiceTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/CompleteUsingItemTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/CompleteUsingItemTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ControllerTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ControllerTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/CraftTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/CraftTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/DiggerItemHint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/DiggerItemHint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/EffectChangedTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/EffectChangedTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/FullTutorial.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/FullTutorial.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/FullTutorialActiveTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/FullTutorialActiveTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/FullTutorialMode.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/FullTutorialMode.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/InfoTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/InfoTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/InputConstraint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/InputConstraint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/LookAtEntityHint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/LookAtEntityHint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/LookAtTileHint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/LookAtTileHint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/PickupTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/PickupTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ProcedureCompoundTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ProcedureCompoundTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ProgressFlagTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/ProgressFlagTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/StatTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/StatTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/StateChangeTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TakeItemHint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TakeItemHint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/Tutorial.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/Tutorial.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialConstraint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialConstraints.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialEnum.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialHint.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialHint.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialHints.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialMessage.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialMessage.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialMode.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialMode.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/TutorialTasks.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/UseItemTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/UseItemTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/UseTileTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/UseTileTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/XuiCraftingTask.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/Tutorial/XuiCraftingTask.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIController.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_AbstractContainerMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_AbstractContainerMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_AnvilMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_AnvilMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_BrewingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_BrewingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_ContainerMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_ContainerMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_CraftingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_CraftingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_CreativeMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_CreativeMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_DispenserMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_DispenserMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_EnchantingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_EnchantingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_FurnaceMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_FurnaceMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_InventoryMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_InventoryMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_PauseMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_PauseMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_StartGame.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_StartGame.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_TradingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/IUIScene_TradingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UI.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIBitmapFont.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIBitmapFont.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Chat.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Chat.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_DebugUIConsole.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_DebugUIConsole.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_DebugUIMarketingGuide.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_DebugUIMarketingGuide.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Logo.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Logo.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_MenuBackground.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_MenuBackground.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Panorama.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Panorama.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_PressStartToPlay.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_PressStartToPlay.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Tooltips.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_Tooltips.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_TutorialPopup.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIComponent_TutorialPopup.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Base.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Base.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_BitmapIcon.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_BitmapIcon.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Button.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Button.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_ButtonList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_ButtonList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_CheckBox.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_CheckBox.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Cursor.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Cursor.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_DLCList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_DLCList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_DynamicLabel.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_DynamicLabel.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_EnchantmentBook.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_EnchantmentBook.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_EnchantmentButton.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_EnchantmentButton.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_HTMLLabel.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_HTMLLabel.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Label.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Label.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_LeaderboardList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_LeaderboardList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_MinecraftPlayer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_MinecraftPlayer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_PlayerList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_PlayerList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_PlayerSkinPreview.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_PlayerSkinPreview.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Progress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Progress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_SaveList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_SaveList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Slider.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Slider.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_SlotList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_SlotList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_SpaceIndicatorBar.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_SpaceIndicatorBar.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_TextInput.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_TextInput.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_TexturePackList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_TexturePackList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Touch.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIControl_Touch.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIController.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIController.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIEnums.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIFontData.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIFontData.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIGroup.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIGroup.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UILayer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UILayer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_AbstractContainerMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_AbstractContainerMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_AnvilMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_AnvilMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_BrewingStandMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_BrewingStandMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ConnectingProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ConnectingProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ContainerMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ContainerMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ControlsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ControlsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_CraftingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_CraftingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_CreateWorldMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_CreateWorldMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_CreativeMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_CreativeMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Credits.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Credits.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DLCMainMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DLCMainMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DLCOffersMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DLCOffersMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DeathMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DeathMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugCreateSchematic.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugCreateSchematic.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugOverlay.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugOverlay.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugSetCamera.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DebugSetCamera.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DispenserMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_DispenserMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_EULA.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_EULA.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_EnchantingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_EnchantingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_EndPoem.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_EndPoem.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_FullscreenProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_FullscreenProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_FurnaceMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_FurnaceMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HUD.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HUD.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HelpAndOptionsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HelpAndOptionsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HowToPlay.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HowToPlay.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HowToPlayMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_HowToPlayMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGameHostOptionsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGameHostOptionsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGameInfoMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGameInfoMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGamePlayerOptionsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGamePlayerOptionsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGameSaveManagementMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InGameSaveManagementMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Intro.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Intro.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InventoryMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_InventoryMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_JoinMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_JoinMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Keyboard.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Keyboard.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LaunchMoreOptionsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LaunchMoreOptionsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LeaderboardsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LeaderboardsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LoadMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LoadMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LoadOrJoinMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_LoadOrJoinMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_MainMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_MainMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_MessageBox.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_MessageBox.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_PauseMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_PauseMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_QuadrantSignin.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_QuadrantSignin.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ReinstallMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_ReinstallMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SaveMessage.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SaveMessage.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsAudioMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsAudioMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsControlMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsControlMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsGraphicsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsGraphicsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsOptionsMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsOptionsMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsUIMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SettingsUIMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SignEntryMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SignEntryMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SkinSelectMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_SkinSelectMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_TeleportMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_TeleportMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Timer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_Timer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_TradingMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_TradingMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_TrialExitUpsell.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIScene_TrialExitUpsell.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UIStructs.h (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UITTFFont.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/UI/UITTFFont.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/SlotProgressControl.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/SlotProgressControl.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_BasePlayer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_BasePlayer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Chat.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Chat.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_ConnectingProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_ConnectingProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Control_ComboBox.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Control_ComboBox.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Controls.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_4JEdit.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_4JEdit.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_4JIcon.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_4JIcon.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_4JList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_4JList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_BrewProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_BrewProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_BubblesProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_BubblesProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_BurnProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_BurnProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_CraftIngredientSlot.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_CraftIngredientSlot.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_EnchantButton.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_EnchantButton.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_EnchantmentBook.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_EnchantmentBook.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_EnchantmentButtonText.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_EnchantmentButtonText.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_FireProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_FireProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_LoadingProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_LoadingProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MinecraftPlayer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MinecraftPlayer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MinecraftSkinPreview.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MinecraftSlot.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MinecraftSlot.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MobEffect.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_MobEffect.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_PassThroughList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_PassthroughList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_ProgressCtrlBase.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_ProgressCtrlBase.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SliderWrapper.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SliderWrapper.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SlotItem.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SlotItemCtrlBase.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SlotItemListItem.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SlotList.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SlotList.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SplashPulser.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Ctrl_SplashPulser.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_CustomMessages.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DLCOffers.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DLCOffers.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Death.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Death.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Debug.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugItemEditor.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugItemEditor.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugOverlay.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugOverlay.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugSchematicCreator.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugSchematicCreator.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugSetCamera.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugSetCamera.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugTips.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_DebugTips.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_FullscreenProgress.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_FullscreenProgress.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HUD.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HUD.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpAndOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpAndOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpControls.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpControls.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpCredits.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpCredits.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpHowToPlay.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HelpHowToPlay.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Helper.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HowToPlayMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_HowToPlayMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_InGameHostOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_InGameHostOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_InGameInfo.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_InGameInfo.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_InGamePlayerOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_InGamePlayerOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Intro.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Intro.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Leaderboards.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Leaderboards.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_LoadSettings.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_LoadSettings.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MainMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MainMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameCreate.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameCreate.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameInfo.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameInfo.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameJoinLoad.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameJoinLoad.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameLaunchMoreOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_MultiGameLaunchMoreOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_NewUpdateMessage.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_NewUpdateMessage.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_PartnernetPassword.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_PartnernetPassword.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_PauseMenu.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_PauseMenu.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Reinstall.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Reinstall.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SaveMessage.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SaveMessage.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_AbstractContainer.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_AbstractContainer.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Anvil.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Anvil.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Base.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Base.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_BrewingStand.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_BrewingStand.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Container.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Container.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_CraftingPanel.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_CraftingPanel.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Enchant.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Enchant.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Furnace.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Furnace.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Inventory.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Inventory.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Inventory_Creative.cpp (99%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Inventory_Creative.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Trading.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Trading.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Trap.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Trap.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Win.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Scene_Win.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsAll.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsAll.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsAudio.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsAudio.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsControl.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsControl.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsGraphics.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsGraphics.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsOptions.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsOptions.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsUI.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SettingsUI.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SignEntry.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SignEntry.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SkinSelect.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SkinSelect.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SocialPost.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_SocialPost.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Teleport.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_Teleport.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TextEntry.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TextEntry.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TransferToXboxOne.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TransferToXboxOne.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TrialExitUpsell.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TrialExitUpsell.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TutorialPopup.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_TutorialPopup.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_XZP_Icons.h (100%) rename {Common => Minecraft.Client/Platform/Common}/XUI/XUI_debug.cpp (100%) rename {Common => Minecraft.Client/Platform/Common}/xuiscene_base.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/adler32.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/compress.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/crc32.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/crc32.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/deflate.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/deflate.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/gzclose.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/gzguts.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/gzlib.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/gzread.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/gzwrite.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/infback.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inffast.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inffast.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inffixed.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inflate.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inflate.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inftrees.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/inftrees.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/trees.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/trees.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/uncompr.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/zconf.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/zlib.h (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/zutil.c (100%) rename {Common => Minecraft.Client/Platform/Common}/zlib/zutil.h (100%) diff --git a/4J.Input/4J_Input.cpp b/4J.Input/4J_Input.cpp index 2864779a5..5fac4355d 100644 --- a/4J.Input/4J_Input.cpp +++ b/4J.Input/4J_Input.cpp @@ -4,7 +4,7 @@ // avoiding a coupling dependency on 4J_Render.h. #include "4J_Input.h" -#include "../Common/App_enums.h" +#include "../Minecraft.Client/Platform/Common/App_enums.h" #include #include #include diff --git a/Minecraft.Client/Build/stdafx.h b/Minecraft.Client/Build/stdafx.h index 58e8c308e..f0534b169 100644 --- a/Minecraft.Client/Build/stdafx.h +++ b/Minecraft.Client/Build/stdafx.h @@ -215,25 +215,25 @@ typedef XUID GameSessionUID; #include "stubs.h" #include "../Textures/BufferedImage.h" -#include "../../Common/Network/GameNetworkManager.h" +#include "../Platform/Common/Network/GameNetworkManager.h" #ifdef _XBOX -#include "../../Common/XUI/XUI_Helper.h" -#include "../../Common/XUI/XUI_Scene_Base.h" +#include "../Platform/Common/XUI/XUI_Helper.h" +#include "../Platform/Common/XUI/XUI_Scene_Base.h" #endif -#include "../../Common/UI/UIEnums.h" -#include "../../Common/UI/UIStructs.h" +#include "../Platform/Common/UI/UIEnums.h" +#include "../Platform/Common/UI/UIStructs.h" // #ifdef _XBOX -#include "../../Common/App_Defines.h" -#include "../../Common/App_enums.h" -#include "../../Common/Tutorial/TutorialEnum.h" -#include "../../Common/App_structs.h" +#include "../Platform/Common/App_Defines.h" +#include "../Platform/Common/App_enums.h" +#include "../Platform/Common/Tutorial/TutorialEnum.h" +#include "../Platform/Common/App_structs.h" //#endif -#include "../../Common/Consoles_App.h" -#include "../../Common/Minecraft_Macros.h" -#include "../../Common/BuildVer.h" +#include "../Platform/Common/Consoles_App.h" +#include "../Platform/Common/Minecraft_Macros.h" +#include "../Platform/Common/BuildVer.h" // This is generated at build time via scripts/pack_loc.py #include "strings.h" @@ -265,7 +265,7 @@ typedef XUID GameSessionUID; #include "../../Minecraft.Assets/PS3Media/4J_strings.h" #include "../Platform/PS3/XML/ATGXmlParser.h" #include "../Platform/PS3/Social/SocialManager.h" - #include "../../Common/Audio/SoundEngine.h" + #include "../Platform/Common/Audio/SoundEngine.h" #include "../Platform/PS3/Iggy/include/iggy.h" #include "../Platform/PS3/Iggy/gdraw/gdraw_ps3gcm.h" #include "../Platform/PS3/PS3_UIController.h" @@ -279,7 +279,7 @@ typedef XUID GameSessionUID; #include "../../Minecraft.Assets/DurangoMedia/4J_strings.h" #include "../Platform/Durango/XML/ATGXmlParser.h" #include "../Platform/Durango/Social/SocialManager.h" - #include "../../Common/Audio/SoundEngine.h" + #include "../Platform/Common/Audio/SoundEngine.h" #include "../Platform/Durango/Iggy/include/iggy.h" #include "../Platform/Durango/Iggy/gdraw/gdraw_d3d11.h" #include "../Platform/Durango/Durango_UIController.h" @@ -291,7 +291,7 @@ typedef XUID GameSessionUID; #include "../Platform/Windows64/GameConfig/Minecraft.spa.h" #include "../Platform/Windows64/XML/ATGXmlParser.h" #include "../Platform/Windows64/Social/SocialManager.h" - #include "../../Common/Audio/SoundEngine.h" + #include "../Platform/Common/Audio/SoundEngine.h" #include "../Platform/Windows64/Iggy/include/iggy.h" #include "../Platform/Windows64/Iggy/gdraw/gdraw_d3d11.h" #include "../Platform/Windows64/Windows64_UIController.h" @@ -302,7 +302,7 @@ typedef XUID GameSessionUID; #include "../Platform/Orbis/Sentient/SentientTelemetryCommon.h" #include "../Platform/Orbis/Sentient/DynamicConfigurations.h" #include "../Platform/Orbis/GameConfig/Minecraft.spa.h" - #include "../../Common/Audio/SoundEngine.h" + #include "../Platform/Common/Audio/SoundEngine.h" #include "../Platform/Linux/Linux_UIController.h" #include "../Platform/Linux/Social/SocialManager.h" #elif defined __PSVITA__ @@ -313,7 +313,7 @@ typedef XUID GameSessionUID; #include "../Platform/PSVita/GameConfig/Minecraft.spa.h" #include "../Platform/PSVita/XML/ATGXmlParser.h" #include "../Platform/PSVita/Social/SocialManager.h" - #include "../../Common/Audio/SoundEngine.h" + #include "../Platform/Common/Audio/SoundEngine.h" #include "../Platform/PSVita/Iggy/include/iggy.h" #include "../Platform/PSVita/Iggy/gdraw/gdraw_psp2.h" #include "../Platform/PSVita/PSVita_UIController.h" @@ -326,35 +326,35 @@ typedef XUID GameSessionUID; #include "../../Minecraft.Assets/OrbisMedia/4J_strings.h" #include "../Platform/Orbis/XML/ATGXmlParser.h" #include "../Platform/Windows64/Social/SocialManager.h" - #include "../../Common/Audio/SoundEngine.h" + #include "../Platform/Common/Audio/SoundEngine.h" #include "../Platform/Orbis/Iggy/include/iggy.h" #include "../Platform/Orbis/Iggy/gdraw/gdraw_orbis.h" #include "../Platform/Orbis/Orbis_UIController.h" #endif #ifdef _XBOX -#include "../../Common/XUI/XUI_CustomMessages.h" -#include "../../Common/XUI/XUI_Scene_Inventory_Creative.h" -#include "../../Common/XUI/XUI_FullscreenProgress.h" -#include "../../Common/XUI/XUI_ConnectingProgress.h" -#include "../../Common/XUI/XUI_Scene_CraftingPanel.h" -#include "../../Common/XUI/XUI_TutorialPopup.h" -#include "../../Common/XUI/XUI_PauseMenu.h" +#include "../Platform/Common/XUI/XUI_CustomMessages.h" +#include "../Platform/Common/XUI/XUI_Scene_Inventory_Creative.h" +#include "../Platform/Common/XUI/XUI_FullscreenProgress.h" +#include "../Platform/Common/XUI/XUI_ConnectingProgress.h" +#include "../Platform/Common/XUI/XUI_Scene_CraftingPanel.h" +#include "../Platform/Common/XUI/XUI_TutorialPopup.h" +#include "../Platform/Common/XUI/XUI_PauseMenu.h" #endif -#include "../../Common/ConsoleGameMode.h" -#include "../../Common/Console_Debug_enum.h" -#include "../../Common/Console_Awards_enum.h" -#include "../../Common/Tutorial/TutorialMode.h" -#include "../../Common/Tutorial/Tutorial.h" -#include "../../Common/Tutorial/FullTutorialMode.h" -#include "../../Common/Trial/TrialMode.h" -#include "../../Common/GameRules/ConsoleGameRules.h" -#include "../../Common/GameRules/ConsoleSchematicFile.h" -#include "../../Common/Colours/ColourTable.h" -#include "../../Common/DLC/DLCSkinFile.h" -#include "../../Common/DLC/DLCManager.h" -#include "../../Common/DLC/DLCPack.h" -#include "../../Common/Telemetry/TelemetryManager.h" +#include "../Platform/Common/ConsoleGameMode.h" +#include "../Platform/Common/Console_Debug_enum.h" +#include "../Platform/Common/Console_Awards_enum.h" +#include "../Platform/Common/Tutorial/TutorialMode.h" +#include "../Platform/Common/Tutorial/Tutorial.h" +#include "../Platform/Common/Tutorial/FullTutorialMode.h" +#include "../Platform/Common/Trial/TrialMode.h" +#include "../Platform/Common/GameRules/ConsoleGameRules.h" +#include "../Platform/Common/GameRules/ConsoleSchematicFile.h" +#include "../Platform/Common/Colours/ColourTable.h" +#include "../Platform/Common/DLC/DLCSkinFile.h" +#include "../Platform/Common/DLC/DLCManager.h" +#include "../Platform/Common/DLC/DLCPack.h" +#include "../Platform/Common/Telemetry/TelemetryManager.h" #ifdef _XBOX //#include "../Platform/Xbox/Xbox_App.h" diff --git a/Minecraft.Client/GameState/StatsCounter.cpp b/Minecraft.Client/GameState/StatsCounter.cpp index ee770dc94..e8150a868 100644 --- a/Minecraft.Client/GameState/StatsCounter.cpp +++ b/Minecraft.Client/GameState/StatsCounter.cpp @@ -9,7 +9,7 @@ #include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h" #include "../../Minecraft.World/Headers/net.minecraft.world.item.h" -#include "../../Common/Leaderboards/LeaderboardManager.h" +#include "../Platform/Common/Leaderboards/LeaderboardManager.h" Stat** StatsCounter::LARGE_STATS[] = { &Stats::walkOneM, diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp index b5f917597..92feb78f0 100644 --- a/Minecraft.Client/Minecraft.cpp +++ b/Minecraft.Client/Minecraft.cpp @@ -65,8 +65,8 @@ #ifdef _XBOX #include "Platform/Xbox/Network/NetworkPlayerXbox.h" #endif -#include "../Common/UI/IUIScene_CreativeMenu.h" -#include "../Common/UI/UIFontData.h" +#include "Platform/UI/IUIScene_CreativeMenu.h" +#include "Platform/UI/UIFontData.h" #include "Textures/Packs/DLCTexturePack.h" #ifdef __ORBIS__ diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index 5bf35a84b..4072e5224 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -41,13 +41,13 @@ #include "../Minecraft.World/Level/Storage/SparseDataStorage.h" #include "../Minecraft.World/IO/Streams/Compression.h" #ifdef _XBOX -#include "../Common/XUI/XUI_DebugSetCamera.h" +#include "Platform/Common/XUI/XUI_DebugSetCamera.h" #endif #include "Platform/PS3/PS3Extras/ShutdownManager.h" #include "Network/ServerCommandDispatcher.h" #include "../Minecraft.World/WorldGen/Biomes/BiomeSource.h" #include "Network/PlayerChunkMap.h" -#include "../Common/Telemetry/TelemetryManager.h" +#include "Platform/Telemetry/TelemetryManager.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/Minecraft.Client/Network/ClientConnection.cpp b/Minecraft.Client/Network/ClientConnection.cpp index 506aedce7..cfdc8be04 100644 --- a/Minecraft.Client/Network/ClientConnection.cpp +++ b/Minecraft.Client/Network/ClientConnection.cpp @@ -43,9 +43,9 @@ #include "../../Minecraft.World/Util/SoundTypes.h" #include "../Textures/Packs/TexturePackRepository.h" #ifdef _XBOX -#include "../../Common/XUI/XUI_Scene_Trading.h" +#include "../Platform/Common/XUI/XUI_Scene_Trading.h" #else -#include "../../Common/UI/UI.h" +#include "../Platform/Common/UI/UI.h" #endif #ifdef __PS3__ #include "../Platform/PS3/Network/SonyVoiceChat.h" diff --git a/Minecraft.Client/Network/PlayerList.cpp b/Minecraft.Client/Network/PlayerList.cpp index 41aa62849..f490cd805 100644 --- a/Minecraft.Client/Network/PlayerList.cpp +++ b/Minecraft.Client/Network/PlayerList.cpp @@ -27,7 +27,7 @@ #ifdef _XBOX #include "../Platform/Xbox/Network/NetworkPlayerXbox.h" #elif defined(__PS3__) || defined(__ORBIS__) -#include "../../Common/Network/Sony/NetworkPlayerSony.h" +#include "../Platform/Common/Network/Sony/NetworkPlayerSony.h" #endif // 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc. diff --git a/Common/App_Defines.h b/Minecraft.Client/Platform/Common/App_Defines.h similarity index 100% rename from Common/App_Defines.h rename to Minecraft.Client/Platform/Common/App_Defines.h diff --git a/Common/App_enums.h b/Minecraft.Client/Platform/Common/App_enums.h similarity index 100% rename from Common/App_enums.h rename to Minecraft.Client/Platform/Common/App_enums.h diff --git a/Common/App_structs.h b/Minecraft.Client/Platform/Common/App_structs.h similarity index 100% rename from Common/App_structs.h rename to Minecraft.Client/Platform/Common/App_structs.h diff --git a/Common/Audio/Consoles_SoundEngine.cpp b/Minecraft.Client/Platform/Common/Audio/Consoles_SoundEngine.cpp similarity index 100% rename from Common/Audio/Consoles_SoundEngine.cpp rename to Minecraft.Client/Platform/Common/Audio/Consoles_SoundEngine.cpp diff --git a/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Platform/Common/Audio/Consoles_SoundEngine.h similarity index 100% rename from Common/Audio/Consoles_SoundEngine.h rename to Minecraft.Client/Platform/Common/Audio/Consoles_SoundEngine.h diff --git a/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp similarity index 100% rename from Common/Audio/SoundEngine.cpp rename to Minecraft.Client/Platform/Common/Audio/SoundEngine.cpp diff --git a/Common/Audio/SoundEngine.h b/Minecraft.Client/Platform/Common/Audio/SoundEngine.h similarity index 100% rename from Common/Audio/SoundEngine.h rename to Minecraft.Client/Platform/Common/Audio/SoundEngine.h diff --git a/Common/Audio/SoundNames.cpp b/Minecraft.Client/Platform/Common/Audio/SoundNames.cpp similarity index 100% rename from Common/Audio/SoundNames.cpp rename to Minecraft.Client/Platform/Common/Audio/SoundNames.cpp diff --git a/Common/BuildVer.h b/Minecraft.Client/Platform/Common/BuildVer.h similarity index 100% rename from Common/BuildVer.h rename to Minecraft.Client/Platform/Common/BuildVer.h diff --git a/Common/C4JMemoryPool.h b/Minecraft.Client/Platform/Common/C4JMemoryPool.h similarity index 100% rename from Common/C4JMemoryPool.h rename to Minecraft.Client/Platform/Common/C4JMemoryPool.h diff --git a/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Platform/Common/C4JMemoryPoolAllocator.h similarity index 100% rename from Common/C4JMemoryPoolAllocator.h rename to Minecraft.Client/Platform/Common/C4JMemoryPoolAllocator.h diff --git a/Common/Colours/ColourTable.cpp b/Minecraft.Client/Platform/Common/Colours/ColourTable.cpp similarity index 100% rename from Common/Colours/ColourTable.cpp rename to Minecraft.Client/Platform/Common/Colours/ColourTable.cpp diff --git a/Common/Colours/ColourTable.h b/Minecraft.Client/Platform/Common/Colours/ColourTable.h similarity index 100% rename from Common/Colours/ColourTable.h rename to Minecraft.Client/Platform/Common/Colours/ColourTable.h diff --git a/Common/ConsoleGameMode.cpp b/Minecraft.Client/Platform/Common/ConsoleGameMode.cpp similarity index 100% rename from Common/ConsoleGameMode.cpp rename to Minecraft.Client/Platform/Common/ConsoleGameMode.cpp diff --git a/Common/ConsoleGameMode.h b/Minecraft.Client/Platform/Common/ConsoleGameMode.h similarity index 100% rename from Common/ConsoleGameMode.h rename to Minecraft.Client/Platform/Common/ConsoleGameMode.h diff --git a/Common/Console_Awards_enum.h b/Minecraft.Client/Platform/Common/Console_Awards_enum.h similarity index 100% rename from Common/Console_Awards_enum.h rename to Minecraft.Client/Platform/Common/Console_Awards_enum.h diff --git a/Common/Console_Debug_enum.h b/Minecraft.Client/Platform/Common/Console_Debug_enum.h similarity index 100% rename from Common/Console_Debug_enum.h rename to Minecraft.Client/Platform/Common/Console_Debug_enum.h diff --git a/Common/Console_Utils.cpp b/Minecraft.Client/Platform/Common/Console_Utils.cpp similarity index 100% rename from Common/Console_Utils.cpp rename to Minecraft.Client/Platform/Common/Console_Utils.cpp diff --git a/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp similarity index 100% rename from Common/Consoles_App.cpp rename to Minecraft.Client/Platform/Common/Consoles_App.cpp diff --git a/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h similarity index 100% rename from Common/Consoles_App.h rename to Minecraft.Client/Platform/Common/Consoles_App.h diff --git a/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp similarity index 100% rename from Common/DLC/DLCAudioFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp diff --git a/Common/DLC/DLCAudioFile.h b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.h similarity index 100% rename from Common/DLC/DLCAudioFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCAudioFile.h diff --git a/Common/DLC/DLCCapeFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.cpp similarity index 100% rename from Common/DLC/DLCCapeFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCCapeFile.cpp diff --git a/Common/DLC/DLCCapeFile.h b/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.h similarity index 100% rename from Common/DLC/DLCCapeFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCCapeFile.h diff --git a/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.cpp similarity index 100% rename from Common/DLC/DLCColourTableFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.cpp diff --git a/Common/DLC/DLCColourTableFile.h b/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.h similarity index 100% rename from Common/DLC/DLCColourTableFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.h diff --git a/Common/DLC/DLCFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCFile.cpp similarity index 100% rename from Common/DLC/DLCFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCFile.cpp diff --git a/Common/DLC/DLCFile.h b/Minecraft.Client/Platform/Common/DLC/DLCFile.h similarity index 100% rename from Common/DLC/DLCFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCFile.h diff --git a/Common/DLC/DLCGameRules.h b/Minecraft.Client/Platform/Common/DLC/DLCGameRules.h similarity index 100% rename from Common/DLC/DLCGameRules.h rename to Minecraft.Client/Platform/Common/DLC/DLCGameRules.h diff --git a/Common/DLC/DLCGameRulesFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.cpp similarity index 100% rename from Common/DLC/DLCGameRulesFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.cpp diff --git a/Common/DLC/DLCGameRulesFile.h b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.h similarity index 100% rename from Common/DLC/DLCGameRulesFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.h diff --git a/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.cpp similarity index 100% rename from Common/DLC/DLCGameRulesHeader.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.cpp diff --git a/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h similarity index 100% rename from Common/DLC/DLCGameRulesHeader.h rename to Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h diff --git a/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.cpp similarity index 100% rename from Common/DLC/DLCLocalisationFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.cpp diff --git a/Common/DLC/DLCLocalisationFile.h b/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.h similarity index 100% rename from Common/DLC/DLCLocalisationFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.h diff --git a/Common/DLC/DLCManager.cpp b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp similarity index 100% rename from Common/DLC/DLCManager.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCManager.cpp diff --git a/Common/DLC/DLCManager.h b/Minecraft.Client/Platform/Common/DLC/DLCManager.h similarity index 100% rename from Common/DLC/DLCManager.h rename to Minecraft.Client/Platform/Common/DLC/DLCManager.h diff --git a/Common/DLC/DLCPack.cpp b/Minecraft.Client/Platform/Common/DLC/DLCPack.cpp similarity index 100% rename from Common/DLC/DLCPack.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCPack.cpp diff --git a/Common/DLC/DLCPack.h b/Minecraft.Client/Platform/Common/DLC/DLCPack.h similarity index 100% rename from Common/DLC/DLCPack.h rename to Minecraft.Client/Platform/Common/DLC/DLCPack.h diff --git a/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp similarity index 100% rename from Common/DLC/DLCSkinFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp diff --git a/Common/DLC/DLCSkinFile.h b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h similarity index 100% rename from Common/DLC/DLCSkinFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h diff --git a/Common/DLC/DLCTextureFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.cpp similarity index 100% rename from Common/DLC/DLCTextureFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCTextureFile.cpp diff --git a/Common/DLC/DLCTextureFile.h b/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.h similarity index 100% rename from Common/DLC/DLCTextureFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCTextureFile.h diff --git a/Common/DLC/DLCUIDataFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.cpp similarity index 100% rename from Common/DLC/DLCUIDataFile.cpp rename to Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.cpp diff --git a/Common/DLC/DLCUIDataFile.h b/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.h similarity index 100% rename from Common/DLC/DLCUIDataFile.h rename to Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.h diff --git a/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.cpp similarity index 100% rename from Common/GameRules/AddEnchantmentRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.cpp diff --git a/Common/GameRules/AddEnchantmentRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.h similarity index 100% rename from Common/GameRules/AddEnchantmentRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/AddEnchantmentRuleDefinition.h diff --git a/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.cpp similarity index 100% rename from Common/GameRules/AddItemRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.cpp diff --git a/Common/GameRules/AddItemRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.h similarity index 100% rename from Common/GameRules/AddItemRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/AddItemRuleDefinition.h diff --git a/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.cpp similarity index 100% rename from Common/GameRules/ApplySchematicRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.cpp diff --git a/Common/GameRules/ApplySchematicRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.h similarity index 100% rename from Common/GameRules/ApplySchematicRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/ApplySchematicRuleDefinition.h diff --git a/Common/GameRules/BiomeOverride.cpp b/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp similarity index 100% rename from Common/GameRules/BiomeOverride.cpp rename to Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp diff --git a/Common/GameRules/BiomeOverride.h b/Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h similarity index 100% rename from Common/GameRules/BiomeOverride.h rename to Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h diff --git a/Common/GameRules/CollectItemRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.cpp similarity index 100% rename from Common/GameRules/CollectItemRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.cpp diff --git a/Common/GameRules/CollectItemRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.h similarity index 100% rename from Common/GameRules/CollectItemRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/CollectItemRuleDefinition.h diff --git a/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/CompleteAllRuleDefinition.cpp similarity index 100% rename from Common/GameRules/CompleteAllRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/CompleteAllRuleDefinition.cpp diff --git a/Common/GameRules/CompleteAllRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/CompleteAllRuleDefinition.h similarity index 100% rename from Common/GameRules/CompleteAllRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/CompleteAllRuleDefinition.h diff --git a/Common/GameRules/CompoundGameRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/CompoundGameRuleDefinition.cpp similarity index 100% rename from Common/GameRules/CompoundGameRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/CompoundGameRuleDefinition.cpp diff --git a/Common/GameRules/CompoundGameRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/CompoundGameRuleDefinition.h similarity index 100% rename from Common/GameRules/CompoundGameRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/CompoundGameRuleDefinition.h diff --git a/Common/GameRules/ConsoleGameRules.h b/Minecraft.Client/Platform/Common/GameRules/ConsoleGameRules.h similarity index 100% rename from Common/GameRules/ConsoleGameRules.h rename to Minecraft.Client/Platform/Common/GameRules/ConsoleGameRules.h diff --git a/Common/GameRules/ConsoleGameRulesConstants.h b/Minecraft.Client/Platform/Common/GameRules/ConsoleGameRulesConstants.h similarity index 100% rename from Common/GameRules/ConsoleGameRulesConstants.h rename to Minecraft.Client/Platform/Common/GameRules/ConsoleGameRulesConstants.h diff --git a/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.cpp similarity index 100% rename from Common/GameRules/ConsoleGenerateStructure.cpp rename to Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.cpp diff --git a/Common/GameRules/ConsoleGenerateStructure.h b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.h similarity index 100% rename from Common/GameRules/ConsoleGenerateStructure.h rename to Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructure.h diff --git a/Common/GameRules/ConsoleGenerateStructureAction.h b/Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructureAction.h similarity index 100% rename from Common/GameRules/ConsoleGenerateStructureAction.h rename to Minecraft.Client/Platform/Common/GameRules/ConsoleGenerateStructureAction.h diff --git a/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Platform/Common/GameRules/ConsoleSchematicFile.cpp similarity index 100% rename from Common/GameRules/ConsoleSchematicFile.cpp rename to Minecraft.Client/Platform/Common/GameRules/ConsoleSchematicFile.cpp diff --git a/Common/GameRules/ConsoleSchematicFile.h b/Minecraft.Client/Platform/Common/GameRules/ConsoleSchematicFile.h similarity index 100% rename from Common/GameRules/ConsoleSchematicFile.h rename to Minecraft.Client/Platform/Common/GameRules/ConsoleSchematicFile.h diff --git a/Common/GameRules/GameRule.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRule.cpp similarity index 100% rename from Common/GameRules/GameRule.cpp rename to Minecraft.Client/Platform/Common/GameRules/GameRule.cpp diff --git a/Common/GameRules/GameRule.h b/Minecraft.Client/Platform/Common/GameRules/GameRule.h similarity index 100% rename from Common/GameRules/GameRule.h rename to Minecraft.Client/Platform/Common/GameRules/GameRule.h diff --git a/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.cpp similarity index 100% rename from Common/GameRules/GameRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.cpp diff --git a/Common/GameRules/GameRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h similarity index 100% rename from Common/GameRules/GameRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h diff --git a/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp similarity index 100% rename from Common/GameRules/GameRuleManager.cpp rename to Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp diff --git a/Common/GameRules/GameRuleManager.h b/Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h similarity index 100% rename from Common/GameRules/GameRuleManager.h rename to Minecraft.Client/Platform/Common/GameRules/GameRuleManager.h diff --git a/Common/GameRules/GameRulesInstance.h b/Minecraft.Client/Platform/Common/GameRules/GameRulesInstance.h similarity index 100% rename from Common/GameRules/GameRulesInstance.h rename to Minecraft.Client/Platform/Common/GameRules/GameRulesInstance.h diff --git a/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp similarity index 100% rename from Common/GameRules/LevelGenerationOptions.cpp rename to Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp diff --git a/Common/GameRules/LevelGenerationOptions.h b/Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h similarity index 100% rename from Common/GameRules/LevelGenerationOptions.h rename to Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h diff --git a/Common/GameRules/LevelGenerators.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelGenerators.cpp similarity index 100% rename from Common/GameRules/LevelGenerators.cpp rename to Minecraft.Client/Platform/Common/GameRules/LevelGenerators.cpp diff --git a/Common/GameRules/LevelGenerators.h b/Minecraft.Client/Platform/Common/GameRules/LevelGenerators.h similarity index 100% rename from Common/GameRules/LevelGenerators.h rename to Minecraft.Client/Platform/Common/GameRules/LevelGenerators.h diff --git a/Common/GameRules/LevelRules.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelRules.cpp similarity index 100% rename from Common/GameRules/LevelRules.cpp rename to Minecraft.Client/Platform/Common/GameRules/LevelRules.cpp diff --git a/Common/GameRules/LevelRules.h b/Minecraft.Client/Platform/Common/GameRules/LevelRules.h similarity index 100% rename from Common/GameRules/LevelRules.h rename to Minecraft.Client/Platform/Common/GameRules/LevelRules.h diff --git a/Common/GameRules/LevelRuleset.cpp b/Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp similarity index 100% rename from Common/GameRules/LevelRuleset.cpp rename to Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp diff --git a/Common/GameRules/LevelRuleset.h b/Minecraft.Client/Platform/Common/GameRules/LevelRuleset.h similarity index 100% rename from Common/GameRules/LevelRuleset.h rename to Minecraft.Client/Platform/Common/GameRules/LevelRuleset.h diff --git a/Common/GameRules/NamedAreaRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.cpp similarity index 100% rename from Common/GameRules/NamedAreaRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.cpp diff --git a/Common/GameRules/NamedAreaRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.h similarity index 100% rename from Common/GameRules/NamedAreaRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/NamedAreaRuleDefinition.h diff --git a/Common/GameRules/StartFeature.cpp b/Minecraft.Client/Platform/Common/GameRules/StartFeature.cpp similarity index 100% rename from Common/GameRules/StartFeature.cpp rename to Minecraft.Client/Platform/Common/GameRules/StartFeature.cpp diff --git a/Common/GameRules/StartFeature.h b/Minecraft.Client/Platform/Common/GameRules/StartFeature.h similarity index 100% rename from Common/GameRules/StartFeature.h rename to Minecraft.Client/Platform/Common/GameRules/StartFeature.h diff --git a/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.cpp similarity index 100% rename from Common/GameRules/UpdatePlayerRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.cpp diff --git a/Common/GameRules/UpdatePlayerRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.h similarity index 100% rename from Common/GameRules/UpdatePlayerRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/UpdatePlayerRuleDefinition.h diff --git a/Common/GameRules/UseTileRuleDefinition.cpp b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp similarity index 100% rename from Common/GameRules/UseTileRuleDefinition.cpp rename to Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.cpp diff --git a/Common/GameRules/UseTileRuleDefinition.h b/Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.h similarity index 100% rename from Common/GameRules/UseTileRuleDefinition.h rename to Minecraft.Client/Platform/Common/GameRules/UseTileRuleDefinition.h diff --git a/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp similarity index 100% rename from Common/GameRules/XboxStructureActionGenerateBox.cpp rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.cpp diff --git a/Common/GameRules/XboxStructureActionGenerateBox.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.h similarity index 100% rename from Common/GameRules/XboxStructureActionGenerateBox.h rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionGenerateBox.h diff --git a/Common/GameRules/XboxStructureActionPlaceBlock.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.cpp similarity index 100% rename from Common/GameRules/XboxStructureActionPlaceBlock.cpp rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.cpp diff --git a/Common/GameRules/XboxStructureActionPlaceBlock.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.h similarity index 100% rename from Common/GameRules/XboxStructureActionPlaceBlock.h rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceBlock.h diff --git a/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp similarity index 100% rename from Common/GameRules/XboxStructureActionPlaceContainer.cpp rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.cpp diff --git a/Common/GameRules/XboxStructureActionPlaceContainer.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h similarity index 100% rename from Common/GameRules/XboxStructureActionPlaceContainer.h rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceContainer.h diff --git a/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.cpp similarity index 100% rename from Common/GameRules/XboxStructureActionPlaceSpawner.cpp rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.cpp diff --git a/Common/GameRules/XboxStructureActionPlaceSpawner.h b/Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.h similarity index 100% rename from Common/GameRules/XboxStructureActionPlaceSpawner.h rename to Minecraft.Client/Platform/Common/GameRules/XboxStructureActionPlaceSpawner.h diff --git a/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp similarity index 100% rename from Common/Leaderboards/LeaderboardManager.cpp rename to Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.cpp diff --git a/Common/Leaderboards/LeaderboardManager.h b/Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h similarity index 100% rename from Common/Leaderboards/LeaderboardManager.h rename to Minecraft.Client/Platform/Common/Leaderboards/LeaderboardManager.h diff --git a/Common/Minecraft_Macros.h b/Minecraft.Client/Platform/Common/Minecraft_Macros.h similarity index 100% rename from Common/Minecraft_Macros.h rename to Minecraft.Client/Platform/Common/Minecraft_Macros.h diff --git a/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp similarity index 100% rename from Common/Network/GameNetworkManager.cpp rename to Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp diff --git a/Common/Network/GameNetworkManager.h b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.h similarity index 100% rename from Common/Network/GameNetworkManager.h rename to Minecraft.Client/Platform/Common/Network/GameNetworkManager.h diff --git a/Common/Network/NetworkPlayerInterface.h b/Minecraft.Client/Platform/Common/Network/NetworkPlayerInterface.h similarity index 100% rename from Common/Network/NetworkPlayerInterface.h rename to Minecraft.Client/Platform/Common/Network/NetworkPlayerInterface.h diff --git a/Common/Network/PlatformNetworkManagerInterface.h b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h similarity index 100% rename from Common/Network/PlatformNetworkManagerInterface.h rename to Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerInterface.h diff --git a/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp similarity index 100% rename from Common/Network/PlatformNetworkManagerStub.cpp rename to Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.cpp diff --git a/Common/Network/PlatformNetworkManagerStub.h b/Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h similarity index 100% rename from Common/Network/PlatformNetworkManagerStub.h rename to Minecraft.Client/Platform/Common/Network/PlatformNetworkManagerStub.h diff --git a/Common/Network/SessionInfo.h b/Minecraft.Client/Platform/Common/Network/SessionInfo.h similarity index 100% rename from Common/Network/SessionInfo.h rename to Minecraft.Client/Platform/Common/Network/SessionInfo.h diff --git a/Common/Network/Sony/NetworkPlayerSony.cpp b/Minecraft.Client/Platform/Common/Network/Sony/NetworkPlayerSony.cpp similarity index 100% rename from Common/Network/Sony/NetworkPlayerSony.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/NetworkPlayerSony.cpp diff --git a/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Platform/Common/Network/Sony/NetworkPlayerSony.h similarity index 100% rename from Common/Network/Sony/NetworkPlayerSony.h rename to Minecraft.Client/Platform/Common/Network/Sony/NetworkPlayerSony.h diff --git a/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp similarity index 100% rename from Common/Network/Sony/PlatformNetworkManagerSony.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp diff --git a/Common/Network/Sony/PlatformNetworkManagerSony.h b/Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.h similarity index 100% rename from Common/Network/Sony/PlatformNetworkManagerSony.h rename to Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.h diff --git a/Common/Network/Sony/SQRNetworkManager.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkManager.cpp similarity index 100% rename from Common/Network/Sony/SQRNetworkManager.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkManager.cpp diff --git a/Common/Network/Sony/SQRNetworkManager.h b/Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkManager.h similarity index 100% rename from Common/Network/Sony/SQRNetworkManager.h rename to Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkManager.h diff --git a/Common/Network/Sony/SQRNetworkPlayer.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkPlayer.cpp similarity index 100% rename from Common/Network/Sony/SQRNetworkPlayer.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkPlayer.cpp diff --git a/Common/Network/Sony/SQRNetworkPlayer.h b/Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkPlayer.h similarity index 100% rename from Common/Network/Sony/SQRNetworkPlayer.h rename to Minecraft.Client/Platform/Common/Network/Sony/SQRNetworkPlayer.h diff --git a/Common/Network/Sony/SonyCommerce.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp similarity index 100% rename from Common/Network/Sony/SonyCommerce.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.cpp diff --git a/Common/Network/Sony/SonyCommerce.h b/Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.h similarity index 100% rename from Common/Network/Sony/SonyCommerce.h rename to Minecraft.Client/Platform/Common/Network/Sony/SonyCommerce.h diff --git a/Common/Network/Sony/SonyHttp.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SonyHttp.cpp similarity index 100% rename from Common/Network/Sony/SonyHttp.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/SonyHttp.cpp diff --git a/Common/Network/Sony/SonyHttp.h b/Minecraft.Client/Platform/Common/Network/Sony/SonyHttp.h similarity index 100% rename from Common/Network/Sony/SonyHttp.h rename to Minecraft.Client/Platform/Common/Network/Sony/SonyHttp.h diff --git a/Common/Network/Sony/SonyRemoteStorage.cpp b/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp similarity index 100% rename from Common/Network/Sony/SonyRemoteStorage.cpp rename to Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.cpp diff --git a/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h similarity index 100% rename from Common/Network/Sony/SonyRemoteStorage.h rename to Minecraft.Client/Platform/Common/Network/Sony/SonyRemoteStorage.h diff --git a/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h b/Minecraft.Client/Platform/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h similarity index 100% rename from Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h rename to Minecraft.Client/Platform/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h diff --git a/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorageDefines.h b/Minecraft.Client/Platform/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorageDefines.h similarity index 100% rename from Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorageDefines.h rename to Minecraft.Client/Platform/Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorageDefines.h diff --git a/Common/Potion_Macros.h b/Minecraft.Client/Platform/Common/Potion_Macros.h similarity index 100% rename from Common/Potion_Macros.h rename to Minecraft.Client/Platform/Common/Potion_Macros.h diff --git a/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp similarity index 100% rename from Common/Telemetry/TelemetryManager.cpp rename to Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.cpp diff --git a/Common/Telemetry/TelemetryManager.h b/Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h similarity index 100% rename from Common/Telemetry/TelemetryManager.h rename to Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h diff --git a/Common/Trial/TrialMode.cpp b/Minecraft.Client/Platform/Common/Trial/TrialMode.cpp similarity index 100% rename from Common/Trial/TrialMode.cpp rename to Minecraft.Client/Platform/Common/Trial/TrialMode.cpp diff --git a/Common/Trial/TrialMode.h b/Minecraft.Client/Platform/Common/Trial/TrialMode.h similarity index 100% rename from Common/Trial/TrialMode.h rename to Minecraft.Client/Platform/Common/Trial/TrialMode.h diff --git a/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Platform/Common/Tutorial/AreaConstraint.cpp similarity index 100% rename from Common/Tutorial/AreaConstraint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/AreaConstraint.cpp diff --git a/Common/Tutorial/AreaConstraint.h b/Minecraft.Client/Platform/Common/Tutorial/AreaConstraint.h similarity index 100% rename from Common/Tutorial/AreaConstraint.h rename to Minecraft.Client/Platform/Common/Tutorial/AreaConstraint.h diff --git a/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Platform/Common/Tutorial/AreaHint.cpp similarity index 100% rename from Common/Tutorial/AreaHint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/AreaHint.cpp diff --git a/Common/Tutorial/AreaHint.h b/Minecraft.Client/Platform/Common/Tutorial/AreaHint.h similarity index 100% rename from Common/Tutorial/AreaHint.h rename to Minecraft.Client/Platform/Common/Tutorial/AreaHint.h diff --git a/Common/Tutorial/AreaTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/AreaTask.cpp similarity index 100% rename from Common/Tutorial/AreaTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/AreaTask.cpp diff --git a/Common/Tutorial/AreaTask.h b/Minecraft.Client/Platform/Common/Tutorial/AreaTask.h similarity index 100% rename from Common/Tutorial/AreaTask.h rename to Minecraft.Client/Platform/Common/Tutorial/AreaTask.h diff --git a/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Platform/Common/Tutorial/ChangeStateConstraint.cpp similarity index 100% rename from Common/Tutorial/ChangeStateConstraint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/ChangeStateConstraint.cpp diff --git a/Common/Tutorial/ChangeStateConstraint.h b/Minecraft.Client/Platform/Common/Tutorial/ChangeStateConstraint.h similarity index 100% rename from Common/Tutorial/ChangeStateConstraint.h rename to Minecraft.Client/Platform/Common/Tutorial/ChangeStateConstraint.h diff --git a/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/ChoiceTask.cpp similarity index 100% rename from Common/Tutorial/ChoiceTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/ChoiceTask.cpp diff --git a/Common/Tutorial/ChoiceTask.h b/Minecraft.Client/Platform/Common/Tutorial/ChoiceTask.h similarity index 100% rename from Common/Tutorial/ChoiceTask.h rename to Minecraft.Client/Platform/Common/Tutorial/ChoiceTask.h diff --git a/Common/Tutorial/CompleteUsingItemTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/CompleteUsingItemTask.cpp similarity index 100% rename from Common/Tutorial/CompleteUsingItemTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/CompleteUsingItemTask.cpp diff --git a/Common/Tutorial/CompleteUsingItemTask.h b/Minecraft.Client/Platform/Common/Tutorial/CompleteUsingItemTask.h similarity index 100% rename from Common/Tutorial/CompleteUsingItemTask.h rename to Minecraft.Client/Platform/Common/Tutorial/CompleteUsingItemTask.h diff --git a/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/ControllerTask.cpp similarity index 100% rename from Common/Tutorial/ControllerTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/ControllerTask.cpp diff --git a/Common/Tutorial/ControllerTask.h b/Minecraft.Client/Platform/Common/Tutorial/ControllerTask.h similarity index 100% rename from Common/Tutorial/ControllerTask.h rename to Minecraft.Client/Platform/Common/Tutorial/ControllerTask.h diff --git a/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/CraftTask.cpp similarity index 100% rename from Common/Tutorial/CraftTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/CraftTask.cpp diff --git a/Common/Tutorial/CraftTask.h b/Minecraft.Client/Platform/Common/Tutorial/CraftTask.h similarity index 100% rename from Common/Tutorial/CraftTask.h rename to Minecraft.Client/Platform/Common/Tutorial/CraftTask.h diff --git a/Common/Tutorial/DiggerItemHint.cpp b/Minecraft.Client/Platform/Common/Tutorial/DiggerItemHint.cpp similarity index 100% rename from Common/Tutorial/DiggerItemHint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/DiggerItemHint.cpp diff --git a/Common/Tutorial/DiggerItemHint.h b/Minecraft.Client/Platform/Common/Tutorial/DiggerItemHint.h similarity index 100% rename from Common/Tutorial/DiggerItemHint.h rename to Minecraft.Client/Platform/Common/Tutorial/DiggerItemHint.h diff --git a/Common/Tutorial/EffectChangedTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/EffectChangedTask.cpp similarity index 100% rename from Common/Tutorial/EffectChangedTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/EffectChangedTask.cpp diff --git a/Common/Tutorial/EffectChangedTask.h b/Minecraft.Client/Platform/Common/Tutorial/EffectChangedTask.h similarity index 100% rename from Common/Tutorial/EffectChangedTask.h rename to Minecraft.Client/Platform/Common/Tutorial/EffectChangedTask.h diff --git a/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp similarity index 100% rename from Common/Tutorial/FullTutorial.cpp rename to Minecraft.Client/Platform/Common/Tutorial/FullTutorial.cpp diff --git a/Common/Tutorial/FullTutorial.h b/Minecraft.Client/Platform/Common/Tutorial/FullTutorial.h similarity index 100% rename from Common/Tutorial/FullTutorial.h rename to Minecraft.Client/Platform/Common/Tutorial/FullTutorial.h diff --git a/Common/Tutorial/FullTutorialActiveTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/FullTutorialActiveTask.cpp similarity index 100% rename from Common/Tutorial/FullTutorialActiveTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/FullTutorialActiveTask.cpp diff --git a/Common/Tutorial/FullTutorialActiveTask.h b/Minecraft.Client/Platform/Common/Tutorial/FullTutorialActiveTask.h similarity index 100% rename from Common/Tutorial/FullTutorialActiveTask.h rename to Minecraft.Client/Platform/Common/Tutorial/FullTutorialActiveTask.h diff --git a/Common/Tutorial/FullTutorialMode.cpp b/Minecraft.Client/Platform/Common/Tutorial/FullTutorialMode.cpp similarity index 100% rename from Common/Tutorial/FullTutorialMode.cpp rename to Minecraft.Client/Platform/Common/Tutorial/FullTutorialMode.cpp diff --git a/Common/Tutorial/FullTutorialMode.h b/Minecraft.Client/Platform/Common/Tutorial/FullTutorialMode.h similarity index 100% rename from Common/Tutorial/FullTutorialMode.h rename to Minecraft.Client/Platform/Common/Tutorial/FullTutorialMode.h diff --git a/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/InfoTask.cpp similarity index 100% rename from Common/Tutorial/InfoTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/InfoTask.cpp diff --git a/Common/Tutorial/InfoTask.h b/Minecraft.Client/Platform/Common/Tutorial/InfoTask.h similarity index 100% rename from Common/Tutorial/InfoTask.h rename to Minecraft.Client/Platform/Common/Tutorial/InfoTask.h diff --git a/Common/Tutorial/InputConstraint.cpp b/Minecraft.Client/Platform/Common/Tutorial/InputConstraint.cpp similarity index 100% rename from Common/Tutorial/InputConstraint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/InputConstraint.cpp diff --git a/Common/Tutorial/InputConstraint.h b/Minecraft.Client/Platform/Common/Tutorial/InputConstraint.h similarity index 100% rename from Common/Tutorial/InputConstraint.h rename to Minecraft.Client/Platform/Common/Tutorial/InputConstraint.h diff --git a/Common/Tutorial/LookAtEntityHint.cpp b/Minecraft.Client/Platform/Common/Tutorial/LookAtEntityHint.cpp similarity index 100% rename from Common/Tutorial/LookAtEntityHint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/LookAtEntityHint.cpp diff --git a/Common/Tutorial/LookAtEntityHint.h b/Minecraft.Client/Platform/Common/Tutorial/LookAtEntityHint.h similarity index 100% rename from Common/Tutorial/LookAtEntityHint.h rename to Minecraft.Client/Platform/Common/Tutorial/LookAtEntityHint.h diff --git a/Common/Tutorial/LookAtTileHint.cpp b/Minecraft.Client/Platform/Common/Tutorial/LookAtTileHint.cpp similarity index 100% rename from Common/Tutorial/LookAtTileHint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/LookAtTileHint.cpp diff --git a/Common/Tutorial/LookAtTileHint.h b/Minecraft.Client/Platform/Common/Tutorial/LookAtTileHint.h similarity index 100% rename from Common/Tutorial/LookAtTileHint.h rename to Minecraft.Client/Platform/Common/Tutorial/LookAtTileHint.h diff --git a/Common/Tutorial/PickupTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/PickupTask.cpp similarity index 100% rename from Common/Tutorial/PickupTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/PickupTask.cpp diff --git a/Common/Tutorial/PickupTask.h b/Minecraft.Client/Platform/Common/Tutorial/PickupTask.h similarity index 100% rename from Common/Tutorial/PickupTask.h rename to Minecraft.Client/Platform/Common/Tutorial/PickupTask.h diff --git a/Common/Tutorial/ProcedureCompoundTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/ProcedureCompoundTask.cpp similarity index 100% rename from Common/Tutorial/ProcedureCompoundTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/ProcedureCompoundTask.cpp diff --git a/Common/Tutorial/ProcedureCompoundTask.h b/Minecraft.Client/Platform/Common/Tutorial/ProcedureCompoundTask.h similarity index 100% rename from Common/Tutorial/ProcedureCompoundTask.h rename to Minecraft.Client/Platform/Common/Tutorial/ProcedureCompoundTask.h diff --git a/Common/Tutorial/ProgressFlagTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/ProgressFlagTask.cpp similarity index 100% rename from Common/Tutorial/ProgressFlagTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/ProgressFlagTask.cpp diff --git a/Common/Tutorial/ProgressFlagTask.h b/Minecraft.Client/Platform/Common/Tutorial/ProgressFlagTask.h similarity index 100% rename from Common/Tutorial/ProgressFlagTask.h rename to Minecraft.Client/Platform/Common/Tutorial/ProgressFlagTask.h diff --git a/Common/Tutorial/StatTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/StatTask.cpp similarity index 100% rename from Common/Tutorial/StatTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/StatTask.cpp diff --git a/Common/Tutorial/StatTask.h b/Minecraft.Client/Platform/Common/Tutorial/StatTask.h similarity index 100% rename from Common/Tutorial/StatTask.h rename to Minecraft.Client/Platform/Common/Tutorial/StatTask.h diff --git a/Common/Tutorial/StateChangeTask.h b/Minecraft.Client/Platform/Common/Tutorial/StateChangeTask.h similarity index 100% rename from Common/Tutorial/StateChangeTask.h rename to Minecraft.Client/Platform/Common/Tutorial/StateChangeTask.h diff --git a/Common/Tutorial/TakeItemHint.cpp b/Minecraft.Client/Platform/Common/Tutorial/TakeItemHint.cpp similarity index 100% rename from Common/Tutorial/TakeItemHint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/TakeItemHint.cpp diff --git a/Common/Tutorial/TakeItemHint.h b/Minecraft.Client/Platform/Common/Tutorial/TakeItemHint.h similarity index 100% rename from Common/Tutorial/TakeItemHint.h rename to Minecraft.Client/Platform/Common/Tutorial/TakeItemHint.h diff --git a/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp similarity index 100% rename from Common/Tutorial/Tutorial.cpp rename to Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp diff --git a/Common/Tutorial/Tutorial.h b/Minecraft.Client/Platform/Common/Tutorial/Tutorial.h similarity index 100% rename from Common/Tutorial/Tutorial.h rename to Minecraft.Client/Platform/Common/Tutorial/Tutorial.h diff --git a/Common/Tutorial/TutorialConstraint.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialConstraint.h similarity index 100% rename from Common/Tutorial/TutorialConstraint.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialConstraint.h diff --git a/Common/Tutorial/TutorialConstraints.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialConstraints.h similarity index 100% rename from Common/Tutorial/TutorialConstraints.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialConstraints.h diff --git a/Common/Tutorial/TutorialEnum.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialEnum.h similarity index 100% rename from Common/Tutorial/TutorialEnum.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialEnum.h diff --git a/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Platform/Common/Tutorial/TutorialHint.cpp similarity index 100% rename from Common/Tutorial/TutorialHint.cpp rename to Minecraft.Client/Platform/Common/Tutorial/TutorialHint.cpp diff --git a/Common/Tutorial/TutorialHint.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialHint.h similarity index 100% rename from Common/Tutorial/TutorialHint.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialHint.h diff --git a/Common/Tutorial/TutorialHints.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialHints.h similarity index 100% rename from Common/Tutorial/TutorialHints.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialHints.h diff --git a/Common/Tutorial/TutorialMessage.cpp b/Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.cpp similarity index 100% rename from Common/Tutorial/TutorialMessage.cpp rename to Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.cpp diff --git a/Common/Tutorial/TutorialMessage.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.h similarity index 100% rename from Common/Tutorial/TutorialMessage.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialMessage.h diff --git a/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Platform/Common/Tutorial/TutorialMode.cpp similarity index 100% rename from Common/Tutorial/TutorialMode.cpp rename to Minecraft.Client/Platform/Common/Tutorial/TutorialMode.cpp diff --git a/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialMode.h similarity index 100% rename from Common/Tutorial/TutorialMode.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialMode.h diff --git a/Common/Tutorial/TutorialTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp similarity index 100% rename from Common/Tutorial/TutorialTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp diff --git a/Common/Tutorial/TutorialTask.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialTask.h similarity index 100% rename from Common/Tutorial/TutorialTask.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialTask.h diff --git a/Common/Tutorial/TutorialTasks.h b/Minecraft.Client/Platform/Common/Tutorial/TutorialTasks.h similarity index 100% rename from Common/Tutorial/TutorialTasks.h rename to Minecraft.Client/Platform/Common/Tutorial/TutorialTasks.h diff --git a/Common/Tutorial/UseItemTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/UseItemTask.cpp similarity index 100% rename from Common/Tutorial/UseItemTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/UseItemTask.cpp diff --git a/Common/Tutorial/UseItemTask.h b/Minecraft.Client/Platform/Common/Tutorial/UseItemTask.h similarity index 100% rename from Common/Tutorial/UseItemTask.h rename to Minecraft.Client/Platform/Common/Tutorial/UseItemTask.h diff --git a/Common/Tutorial/UseTileTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/UseTileTask.cpp similarity index 100% rename from Common/Tutorial/UseTileTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/UseTileTask.cpp diff --git a/Common/Tutorial/UseTileTask.h b/Minecraft.Client/Platform/Common/Tutorial/UseTileTask.h similarity index 100% rename from Common/Tutorial/UseTileTask.h rename to Minecraft.Client/Platform/Common/Tutorial/UseTileTask.h diff --git a/Common/Tutorial/XuiCraftingTask.cpp b/Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp similarity index 100% rename from Common/Tutorial/XuiCraftingTask.cpp rename to Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.cpp diff --git a/Common/Tutorial/XuiCraftingTask.h b/Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.h similarity index 100% rename from Common/Tutorial/XuiCraftingTask.h rename to Minecraft.Client/Platform/Common/Tutorial/XuiCraftingTask.h diff --git a/Common/UI/IUIController.h b/Minecraft.Client/Platform/Common/UI/IUIController.h similarity index 100% rename from Common/UI/IUIController.h rename to Minecraft.Client/Platform/Common/UI/IUIController.h diff --git a/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp similarity index 100% rename from Common/UI/IUIScene_AbstractContainerMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.cpp diff --git a/Common/UI/IUIScene_AbstractContainerMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h similarity index 100% rename from Common/UI/IUIScene_AbstractContainerMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_AbstractContainerMenu.h diff --git a/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_AnvilMenu.cpp similarity index 100% rename from Common/UI/IUIScene_AnvilMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_AnvilMenu.cpp diff --git a/Common/UI/IUIScene_AnvilMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_AnvilMenu.h similarity index 100% rename from Common/UI/IUIScene_AnvilMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_AnvilMenu.h diff --git a/Common/UI/IUIScene_BrewingMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_BrewingMenu.cpp similarity index 100% rename from Common/UI/IUIScene_BrewingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_BrewingMenu.cpp diff --git a/Common/UI/IUIScene_BrewingMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_BrewingMenu.h similarity index 100% rename from Common/UI/IUIScene_BrewingMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_BrewingMenu.h diff --git a/Common/UI/IUIScene_ContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_ContainerMenu.cpp similarity index 100% rename from Common/UI/IUIScene_ContainerMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_ContainerMenu.cpp diff --git a/Common/UI/IUIScene_ContainerMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_ContainerMenu.h similarity index 100% rename from Common/UI/IUIScene_ContainerMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_ContainerMenu.h diff --git a/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp similarity index 100% rename from Common/UI/IUIScene_CraftingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.cpp diff --git a/Common/UI/IUIScene_CraftingMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.h similarity index 100% rename from Common/UI/IUIScene_CraftingMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_CraftingMenu.h diff --git a/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp similarity index 100% rename from Common/UI/IUIScene_CreativeMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp diff --git a/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.h similarity index 100% rename from Common/UI/IUIScene_CreativeMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.h diff --git a/Common/UI/IUIScene_DispenserMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_DispenserMenu.cpp similarity index 100% rename from Common/UI/IUIScene_DispenserMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_DispenserMenu.cpp diff --git a/Common/UI/IUIScene_DispenserMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_DispenserMenu.h similarity index 100% rename from Common/UI/IUIScene_DispenserMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_DispenserMenu.h diff --git a/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_EnchantingMenu.cpp similarity index 100% rename from Common/UI/IUIScene_EnchantingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_EnchantingMenu.cpp diff --git a/Common/UI/IUIScene_EnchantingMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_EnchantingMenu.h similarity index 100% rename from Common/UI/IUIScene_EnchantingMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_EnchantingMenu.h diff --git a/Common/UI/IUIScene_FurnaceMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_FurnaceMenu.cpp similarity index 100% rename from Common/UI/IUIScene_FurnaceMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_FurnaceMenu.cpp diff --git a/Common/UI/IUIScene_FurnaceMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_FurnaceMenu.h similarity index 100% rename from Common/UI/IUIScene_FurnaceMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_FurnaceMenu.h diff --git a/Common/UI/IUIScene_InventoryMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_InventoryMenu.cpp similarity index 100% rename from Common/UI/IUIScene_InventoryMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_InventoryMenu.cpp diff --git a/Common/UI/IUIScene_InventoryMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_InventoryMenu.h similarity index 100% rename from Common/UI/IUIScene_InventoryMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_InventoryMenu.h diff --git a/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp similarity index 100% rename from Common/UI/IUIScene_PauseMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.cpp diff --git a/Common/UI/IUIScene_PauseMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.h similarity index 100% rename from Common/UI/IUIScene_PauseMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_PauseMenu.h diff --git a/Common/UI/IUIScene_StartGame.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp similarity index 100% rename from Common/UI/IUIScene_StartGame.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.cpp diff --git a/Common/UI/IUIScene_StartGame.h b/Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.h similarity index 100% rename from Common/UI/IUIScene_StartGame.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_StartGame.h diff --git a/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp similarity index 100% rename from Common/UI/IUIScene_TradingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.cpp diff --git a/Common/UI/IUIScene_TradingMenu.h b/Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.h similarity index 100% rename from Common/UI/IUIScene_TradingMenu.h rename to Minecraft.Client/Platform/Common/UI/IUIScene_TradingMenu.h diff --git a/Common/UI/UI.h b/Minecraft.Client/Platform/Common/UI/UI.h similarity index 100% rename from Common/UI/UI.h rename to Minecraft.Client/Platform/Common/UI/UI.h diff --git a/Common/UI/UIBitmapFont.cpp b/Minecraft.Client/Platform/Common/UI/UIBitmapFont.cpp similarity index 100% rename from Common/UI/UIBitmapFont.cpp rename to Minecraft.Client/Platform/Common/UI/UIBitmapFont.cpp diff --git a/Common/UI/UIBitmapFont.h b/Minecraft.Client/Platform/Common/UI/UIBitmapFont.h similarity index 100% rename from Common/UI/UIBitmapFont.h rename to Minecraft.Client/Platform/Common/UI/UIBitmapFont.h diff --git a/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Chat.cpp similarity index 100% rename from Common/UI/UIComponent_Chat.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_Chat.cpp diff --git a/Common/UI/UIComponent_Chat.h b/Minecraft.Client/Platform/Common/UI/UIComponent_Chat.h similarity index 100% rename from Common/UI/UIComponent_Chat.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_Chat.h diff --git a/Common/UI/UIComponent_DebugUIConsole.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIConsole.cpp similarity index 100% rename from Common/UI/UIComponent_DebugUIConsole.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIConsole.cpp diff --git a/Common/UI/UIComponent_DebugUIConsole.h b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIConsole.h similarity index 100% rename from Common/UI/UIComponent_DebugUIConsole.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIConsole.h diff --git a/Common/UI/UIComponent_DebugUIMarketingGuide.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp similarity index 100% rename from Common/UI/UIComponent_DebugUIMarketingGuide.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.cpp diff --git a/Common/UI/UIComponent_DebugUIMarketingGuide.h b/Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.h similarity index 100% rename from Common/UI/UIComponent_DebugUIMarketingGuide.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_DebugUIMarketingGuide.h diff --git a/Common/UI/UIComponent_Logo.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Logo.cpp similarity index 100% rename from Common/UI/UIComponent_Logo.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_Logo.cpp diff --git a/Common/UI/UIComponent_Logo.h b/Minecraft.Client/Platform/Common/UI/UIComponent_Logo.h similarity index 100% rename from Common/UI/UIComponent_Logo.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_Logo.h diff --git a/Common/UI/UIComponent_MenuBackground.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_MenuBackground.cpp similarity index 100% rename from Common/UI/UIComponent_MenuBackground.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_MenuBackground.cpp diff --git a/Common/UI/UIComponent_MenuBackground.h b/Minecraft.Client/Platform/Common/UI/UIComponent_MenuBackground.h similarity index 100% rename from Common/UI/UIComponent_MenuBackground.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_MenuBackground.h diff --git a/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp similarity index 100% rename from Common/UI/UIComponent_Panorama.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp diff --git a/Common/UI/UIComponent_Panorama.h b/Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.h similarity index 100% rename from Common/UI/UIComponent_Panorama.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.h diff --git a/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp similarity index 100% rename from Common/UI/UIComponent_PressStartToPlay.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.cpp diff --git a/Common/UI/UIComponent_PressStartToPlay.h b/Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.h similarity index 100% rename from Common/UI/UIComponent_PressStartToPlay.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_PressStartToPlay.h diff --git a/Common/UI/UIComponent_Tooltips.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp similarity index 100% rename from Common/UI/UIComponent_Tooltips.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.cpp diff --git a/Common/UI/UIComponent_Tooltips.h b/Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h similarity index 100% rename from Common/UI/UIComponent_Tooltips.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_Tooltips.h diff --git a/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Platform/Common/UI/UIComponent_TutorialPopup.cpp similarity index 100% rename from Common/UI/UIComponent_TutorialPopup.cpp rename to Minecraft.Client/Platform/Common/UI/UIComponent_TutorialPopup.cpp diff --git a/Common/UI/UIComponent_TutorialPopup.h b/Minecraft.Client/Platform/Common/UI/UIComponent_TutorialPopup.h similarity index 100% rename from Common/UI/UIComponent_TutorialPopup.h rename to Minecraft.Client/Platform/Common/UI/UIComponent_TutorialPopup.h diff --git a/Common/UI/UIControl.cpp b/Minecraft.Client/Platform/Common/UI/UIControl.cpp similarity index 100% rename from Common/UI/UIControl.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl.cpp diff --git a/Common/UI/UIControl.h b/Minecraft.Client/Platform/Common/UI/UIControl.h similarity index 100% rename from Common/UI/UIControl.h rename to Minecraft.Client/Platform/Common/UI/UIControl.h diff --git a/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Base.cpp similarity index 100% rename from Common/UI/UIControl_Base.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Base.cpp diff --git a/Common/UI/UIControl_Base.h b/Minecraft.Client/Platform/Common/UI/UIControl_Base.h similarity index 100% rename from Common/UI/UIControl_Base.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Base.h diff --git a/Common/UI/UIControl_BitmapIcon.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.cpp similarity index 100% rename from Common/UI/UIControl_BitmapIcon.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.cpp diff --git a/Common/UI/UIControl_BitmapIcon.h b/Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.h similarity index 100% rename from Common/UI/UIControl_BitmapIcon.h rename to Minecraft.Client/Platform/Common/UI/UIControl_BitmapIcon.h diff --git a/Common/UI/UIControl_Button.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp similarity index 100% rename from Common/UI/UIControl_Button.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Button.cpp diff --git a/Common/UI/UIControl_Button.h b/Minecraft.Client/Platform/Common/UI/UIControl_Button.h similarity index 100% rename from Common/UI/UIControl_Button.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Button.h diff --git a/Common/UI/UIControl_ButtonList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp similarity index 100% rename from Common/UI/UIControl_ButtonList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.cpp diff --git a/Common/UI/UIControl_ButtonList.h b/Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h similarity index 100% rename from Common/UI/UIControl_ButtonList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_ButtonList.h diff --git a/Common/UI/UIControl_CheckBox.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp similarity index 100% rename from Common/UI/UIControl_CheckBox.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.cpp diff --git a/Common/UI/UIControl_CheckBox.h b/Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.h similarity index 100% rename from Common/UI/UIControl_CheckBox.h rename to Minecraft.Client/Platform/Common/UI/UIControl_CheckBox.h diff --git a/Common/UI/UIControl_Cursor.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Cursor.cpp similarity index 100% rename from Common/UI/UIControl_Cursor.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Cursor.cpp diff --git a/Common/UI/UIControl_Cursor.h b/Minecraft.Client/Platform/Common/UI/UIControl_Cursor.h similarity index 100% rename from Common/UI/UIControl_Cursor.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Cursor.h diff --git a/Common/UI/UIControl_DLCList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_DLCList.cpp similarity index 100% rename from Common/UI/UIControl_DLCList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_DLCList.cpp diff --git a/Common/UI/UIControl_DLCList.h b/Minecraft.Client/Platform/Common/UI/UIControl_DLCList.h similarity index 100% rename from Common/UI/UIControl_DLCList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_DLCList.h diff --git a/Common/UI/UIControl_DynamicLabel.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp similarity index 100% rename from Common/UI/UIControl_DynamicLabel.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.cpp diff --git a/Common/UI/UIControl_DynamicLabel.h b/Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.h similarity index 100% rename from Common/UI/UIControl_DynamicLabel.h rename to Minecraft.Client/Platform/Common/UI/UIControl_DynamicLabel.h diff --git a/Common/UI/UIControl_EnchantmentBook.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentBook.cpp similarity index 100% rename from Common/UI/UIControl_EnchantmentBook.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentBook.cpp diff --git a/Common/UI/UIControl_EnchantmentBook.h b/Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentBook.h similarity index 100% rename from Common/UI/UIControl_EnchantmentBook.h rename to Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentBook.h diff --git a/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentButton.cpp similarity index 100% rename from Common/UI/UIControl_EnchantmentButton.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentButton.cpp diff --git a/Common/UI/UIControl_EnchantmentButton.h b/Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentButton.h similarity index 100% rename from Common/UI/UIControl_EnchantmentButton.h rename to Minecraft.Client/Platform/Common/UI/UIControl_EnchantmentButton.h diff --git a/Common/UI/UIControl_HTMLLabel.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp similarity index 100% rename from Common/UI/UIControl_HTMLLabel.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.cpp diff --git a/Common/UI/UIControl_HTMLLabel.h b/Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.h similarity index 100% rename from Common/UI/UIControl_HTMLLabel.h rename to Minecraft.Client/Platform/Common/UI/UIControl_HTMLLabel.h diff --git a/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Label.cpp similarity index 100% rename from Common/UI/UIControl_Label.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Label.cpp diff --git a/Common/UI/UIControl_Label.h b/Minecraft.Client/Platform/Common/UI/UIControl_Label.h similarity index 100% rename from Common/UI/UIControl_Label.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Label.h diff --git a/Common/UI/UIControl_LeaderboardList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp similarity index 100% rename from Common/UI/UIControl_LeaderboardList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.cpp diff --git a/Common/UI/UIControl_LeaderboardList.h b/Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h similarity index 100% rename from Common/UI/UIControl_LeaderboardList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_LeaderboardList.h diff --git a/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftPlayer.cpp similarity index 100% rename from Common/UI/UIControl_MinecraftPlayer.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_MinecraftPlayer.cpp diff --git a/Common/UI/UIControl_MinecraftPlayer.h b/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftPlayer.h similarity index 100% rename from Common/UI/UIControl_MinecraftPlayer.h rename to Minecraft.Client/Platform/Common/UI/UIControl_MinecraftPlayer.h diff --git a/Common/UI/UIControl_PlayerList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.cpp similarity index 100% rename from Common/UI/UIControl_PlayerList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.cpp diff --git a/Common/UI/UIControl_PlayerList.h b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.h similarity index 100% rename from Common/UI/UIControl_PlayerList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_PlayerList.h diff --git a/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp similarity index 100% rename from Common/UI/UIControl_PlayerSkinPreview.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.cpp diff --git a/Common/UI/UIControl_PlayerSkinPreview.h b/Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.h similarity index 100% rename from Common/UI/UIControl_PlayerSkinPreview.h rename to Minecraft.Client/Platform/Common/UI/UIControl_PlayerSkinPreview.h diff --git a/Common/UI/UIControl_Progress.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Progress.cpp similarity index 100% rename from Common/UI/UIControl_Progress.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Progress.cpp diff --git a/Common/UI/UIControl_Progress.h b/Minecraft.Client/Platform/Common/UI/UIControl_Progress.h similarity index 100% rename from Common/UI/UIControl_Progress.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Progress.h diff --git a/Common/UI/UIControl_SaveList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_SaveList.cpp similarity index 100% rename from Common/UI/UIControl_SaveList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_SaveList.cpp diff --git a/Common/UI/UIControl_SaveList.h b/Minecraft.Client/Platform/Common/UI/UIControl_SaveList.h similarity index 100% rename from Common/UI/UIControl_SaveList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_SaveList.h diff --git a/Common/UI/UIControl_Slider.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp similarity index 100% rename from Common/UI/UIControl_Slider.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Slider.cpp diff --git a/Common/UI/UIControl_Slider.h b/Minecraft.Client/Platform/Common/UI/UIControl_Slider.h similarity index 100% rename from Common/UI/UIControl_Slider.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Slider.h diff --git a/Common/UI/UIControl_SlotList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_SlotList.cpp similarity index 100% rename from Common/UI/UIControl_SlotList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_SlotList.cpp diff --git a/Common/UI/UIControl_SlotList.h b/Minecraft.Client/Platform/Common/UI/UIControl_SlotList.h similarity index 100% rename from Common/UI/UIControl_SlotList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_SlotList.h diff --git a/Common/UI/UIControl_SpaceIndicatorBar.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.cpp similarity index 100% rename from Common/UI/UIControl_SpaceIndicatorBar.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.cpp diff --git a/Common/UI/UIControl_SpaceIndicatorBar.h b/Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.h similarity index 100% rename from Common/UI/UIControl_SpaceIndicatorBar.h rename to Minecraft.Client/Platform/Common/UI/UIControl_SpaceIndicatorBar.h diff --git a/Common/UI/UIControl_TextInput.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp similarity index 100% rename from Common/UI/UIControl_TextInput.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_TextInput.cpp diff --git a/Common/UI/UIControl_TextInput.h b/Minecraft.Client/Platform/Common/UI/UIControl_TextInput.h similarity index 100% rename from Common/UI/UIControl_TextInput.h rename to Minecraft.Client/Platform/Common/UI/UIControl_TextInput.h diff --git a/Common/UI/UIControl_TexturePackList.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp similarity index 100% rename from Common/UI/UIControl_TexturePackList.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.cpp diff --git a/Common/UI/UIControl_TexturePackList.h b/Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.h similarity index 100% rename from Common/UI/UIControl_TexturePackList.h rename to Minecraft.Client/Platform/Common/UI/UIControl_TexturePackList.h diff --git a/Common/UI/UIControl_Touch.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_Touch.cpp similarity index 100% rename from Common/UI/UIControl_Touch.cpp rename to Minecraft.Client/Platform/Common/UI/UIControl_Touch.cpp diff --git a/Common/UI/UIControl_Touch.h b/Minecraft.Client/Platform/Common/UI/UIControl_Touch.h similarity index 100% rename from Common/UI/UIControl_Touch.h rename to Minecraft.Client/Platform/Common/UI/UIControl_Touch.h diff --git a/Common/UI/UIController.cpp b/Minecraft.Client/Platform/Common/UI/UIController.cpp similarity index 100% rename from Common/UI/UIController.cpp rename to Minecraft.Client/Platform/Common/UI/UIController.cpp diff --git a/Common/UI/UIController.h b/Minecraft.Client/Platform/Common/UI/UIController.h similarity index 100% rename from Common/UI/UIController.h rename to Minecraft.Client/Platform/Common/UI/UIController.h diff --git a/Common/UI/UIEnums.h b/Minecraft.Client/Platform/Common/UI/UIEnums.h similarity index 100% rename from Common/UI/UIEnums.h rename to Minecraft.Client/Platform/Common/UI/UIEnums.h diff --git a/Common/UI/UIFontData.cpp b/Minecraft.Client/Platform/Common/UI/UIFontData.cpp similarity index 100% rename from Common/UI/UIFontData.cpp rename to Minecraft.Client/Platform/Common/UI/UIFontData.cpp diff --git a/Common/UI/UIFontData.h b/Minecraft.Client/Platform/Common/UI/UIFontData.h similarity index 100% rename from Common/UI/UIFontData.h rename to Minecraft.Client/Platform/Common/UI/UIFontData.h diff --git a/Common/UI/UIGroup.cpp b/Minecraft.Client/Platform/Common/UI/UIGroup.cpp similarity index 100% rename from Common/UI/UIGroup.cpp rename to Minecraft.Client/Platform/Common/UI/UIGroup.cpp diff --git a/Common/UI/UIGroup.h b/Minecraft.Client/Platform/Common/UI/UIGroup.h similarity index 100% rename from Common/UI/UIGroup.h rename to Minecraft.Client/Platform/Common/UI/UIGroup.h diff --git a/Common/UI/UILayer.cpp b/Minecraft.Client/Platform/Common/UI/UILayer.cpp similarity index 100% rename from Common/UI/UILayer.cpp rename to Minecraft.Client/Platform/Common/UI/UILayer.cpp diff --git a/Common/UI/UILayer.h b/Minecraft.Client/Platform/Common/UI/UILayer.h similarity index 100% rename from Common/UI/UILayer.h rename to Minecraft.Client/Platform/Common/UI/UILayer.h diff --git a/Common/UI/UIScene.cpp b/Minecraft.Client/Platform/Common/UI/UIScene.cpp similarity index 100% rename from Common/UI/UIScene.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene.cpp diff --git a/Common/UI/UIScene.h b/Minecraft.Client/Platform/Common/UI/UIScene.h similarity index 100% rename from Common/UI/UIScene.h rename to Minecraft.Client/Platform/Common/UI/UIScene.h diff --git a/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp similarity index 100% rename from Common/UI/UIScene_AbstractContainerMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.cpp diff --git a/Common/UI/UIScene_AbstractContainerMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.h similarity index 100% rename from Common/UI/UIScene_AbstractContainerMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_AbstractContainerMenu.h diff --git a/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp similarity index 100% rename from Common/UI/UIScene_AnvilMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.cpp diff --git a/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h similarity index 100% rename from Common/UI/UIScene_AnvilMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_AnvilMenu.h diff --git a/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_BrewingStandMenu.cpp similarity index 100% rename from Common/UI/UIScene_BrewingStandMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_BrewingStandMenu.cpp diff --git a/Common/UI/UIScene_BrewingStandMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_BrewingStandMenu.h similarity index 100% rename from Common/UI/UIScene_BrewingStandMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_BrewingStandMenu.h diff --git a/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp similarity index 100% rename from Common/UI/UIScene_ConnectingProgress.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.cpp diff --git a/Common/UI/UIScene_ConnectingProgress.h b/Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h similarity index 100% rename from Common/UI/UIScene_ConnectingProgress.h rename to Minecraft.Client/Platform/Common/UI/UIScene_ConnectingProgress.h diff --git a/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ContainerMenu.cpp similarity index 100% rename from Common/UI/UIScene_ContainerMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_ContainerMenu.cpp diff --git a/Common/UI/UIScene_ContainerMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_ContainerMenu.h similarity index 100% rename from Common/UI/UIScene_ContainerMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_ContainerMenu.h diff --git a/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp similarity index 100% rename from Common/UI/UIScene_ControlsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.cpp diff --git a/Common/UI/UIScene_ControlsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h similarity index 100% rename from Common/UI/UIScene_ControlsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_ControlsMenu.h diff --git a/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp similarity index 100% rename from Common/UI/UIScene_CraftingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.cpp diff --git a/Common/UI/UIScene_CraftingMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h similarity index 100% rename from Common/UI/UIScene_CraftingMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_CraftingMenu.h diff --git a/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp similarity index 100% rename from Common/UI/UIScene_CreateWorldMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.cpp diff --git a/Common/UI/UIScene_CreateWorldMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h similarity index 100% rename from Common/UI/UIScene_CreateWorldMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_CreateWorldMenu.h diff --git a/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp similarity index 100% rename from Common/UI/UIScene_CreativeMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.cpp diff --git a/Common/UI/UIScene_CreativeMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h similarity index 100% rename from Common/UI/UIScene_CreativeMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_CreativeMenu.h diff --git a/Common/UI/UIScene_Credits.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp similarity index 100% rename from Common/UI/UIScene_Credits.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_Credits.cpp diff --git a/Common/UI/UIScene_Credits.h b/Minecraft.Client/Platform/Common/UI/UIScene_Credits.h similarity index 100% rename from Common/UI/UIScene_Credits.h rename to Minecraft.Client/Platform/Common/UI/UIScene_Credits.h diff --git a/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp similarity index 100% rename from Common/UI/UIScene_DLCMainMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.cpp diff --git a/Common/UI/UIScene_DLCMainMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h similarity index 100% rename from Common/UI/UIScene_DLCMainMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DLCMainMenu.h diff --git a/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp similarity index 100% rename from Common/UI/UIScene_DLCOffersMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.cpp diff --git a/Common/UI/UIScene_DLCOffersMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h similarity index 100% rename from Common/UI/UIScene_DLCOffersMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DLCOffersMenu.h diff --git a/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp similarity index 100% rename from Common/UI/UIScene_DeathMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.cpp diff --git a/Common/UI/UIScene_DeathMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h similarity index 100% rename from Common/UI/UIScene_DeathMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DeathMenu.h diff --git a/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp similarity index 100% rename from Common/UI/UIScene_DebugCreateSchematic.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.cpp diff --git a/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.h similarity index 100% rename from Common/UI/UIScene_DebugCreateSchematic.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugCreateSchematic.h diff --git a/Common/UI/UIScene_DebugOptions.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.cpp similarity index 100% rename from Common/UI/UIScene_DebugOptions.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.cpp diff --git a/Common/UI/UIScene_DebugOptions.h b/Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.h similarity index 100% rename from Common/UI/UIScene_DebugOptions.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugOptions.h diff --git a/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugOverlay.cpp similarity index 100% rename from Common/UI/UIScene_DebugOverlay.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugOverlay.cpp diff --git a/Common/UI/UIScene_DebugOverlay.h b/Minecraft.Client/Platform/Common/UI/UIScene_DebugOverlay.h similarity index 100% rename from Common/UI/UIScene_DebugOverlay.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugOverlay.h diff --git a/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp similarity index 100% rename from Common/UI/UIScene_DebugSetCamera.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.cpp diff --git a/Common/UI/UIScene_DebugSetCamera.h b/Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h similarity index 100% rename from Common/UI/UIScene_DebugSetCamera.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DebugSetCamera.h diff --git a/Common/UI/UIScene_DispenserMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_DispenserMenu.cpp similarity index 100% rename from Common/UI/UIScene_DispenserMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_DispenserMenu.cpp diff --git a/Common/UI/UIScene_DispenserMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_DispenserMenu.h similarity index 100% rename from Common/UI/UIScene_DispenserMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_DispenserMenu.h diff --git a/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp similarity index 100% rename from Common/UI/UIScene_EULA.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_EULA.cpp diff --git a/Common/UI/UIScene_EULA.h b/Minecraft.Client/Platform/Common/UI/UIScene_EULA.h similarity index 100% rename from Common/UI/UIScene_EULA.h rename to Minecraft.Client/Platform/Common/UI/UIScene_EULA.h diff --git a/Common/UI/UIScene_EnchantingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp similarity index 100% rename from Common/UI/UIScene_EnchantingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.cpp diff --git a/Common/UI/UIScene_EnchantingMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.h similarity index 100% rename from Common/UI/UIScene_EnchantingMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_EnchantingMenu.h diff --git a/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp similarity index 100% rename from Common/UI/UIScene_EndPoem.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.cpp diff --git a/Common/UI/UIScene_EndPoem.h b/Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.h similarity index 100% rename from Common/UI/UIScene_EndPoem.h rename to Minecraft.Client/Platform/Common/UI/UIScene_EndPoem.h diff --git a/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp similarity index 100% rename from Common/UI/UIScene_FullscreenProgress.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.cpp diff --git a/Common/UI/UIScene_FullscreenProgress.h b/Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.h similarity index 100% rename from Common/UI/UIScene_FullscreenProgress.h rename to Minecraft.Client/Platform/Common/UI/UIScene_FullscreenProgress.h diff --git a/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_FurnaceMenu.cpp similarity index 100% rename from Common/UI/UIScene_FurnaceMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_FurnaceMenu.cpp diff --git a/Common/UI/UIScene_FurnaceMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_FurnaceMenu.h similarity index 100% rename from Common/UI/UIScene_FurnaceMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_FurnaceMenu.h diff --git a/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp similarity index 100% rename from Common/UI/UIScene_HUD.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_HUD.cpp diff --git a/Common/UI/UIScene_HUD.h b/Minecraft.Client/Platform/Common/UI/UIScene_HUD.h similarity index 100% rename from Common/UI/UIScene_HUD.h rename to Minecraft.Client/Platform/Common/UI/UIScene_HUD.h diff --git a/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp similarity index 100% rename from Common/UI/UIScene_HelpAndOptionsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.cpp diff --git a/Common/UI/UIScene_HelpAndOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.h similarity index 100% rename from Common/UI/UIScene_HelpAndOptionsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_HelpAndOptionsMenu.h diff --git a/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp similarity index 100% rename from Common/UI/UIScene_HowToPlay.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.cpp diff --git a/Common/UI/UIScene_HowToPlay.h b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.h similarity index 100% rename from Common/UI/UIScene_HowToPlay.h rename to Minecraft.Client/Platform/Common/UI/UIScene_HowToPlay.h diff --git a/Common/UI/UIScene_HowToPlayMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp similarity index 100% rename from Common/UI/UIScene_HowToPlayMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.cpp diff --git a/Common/UI/UIScene_HowToPlayMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h similarity index 100% rename from Common/UI/UIScene_HowToPlayMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_HowToPlayMenu.h diff --git a/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp similarity index 100% rename from Common/UI/UIScene_InGameHostOptionsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.cpp diff --git a/Common/UI/UIScene_InGameHostOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.h similarity index 100% rename from Common/UI/UIScene_InGameHostOptionsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_InGameHostOptionsMenu.h diff --git a/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp similarity index 100% rename from Common/UI/UIScene_InGameInfoMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.cpp diff --git a/Common/UI/UIScene_InGameInfoMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h similarity index 100% rename from Common/UI/UIScene_InGameInfoMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_InGameInfoMenu.h diff --git a/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp similarity index 100% rename from Common/UI/UIScene_InGamePlayerOptionsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp diff --git a/Common/UI/UIScene_InGamePlayerOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h similarity index 100% rename from Common/UI/UIScene_InGamePlayerOptionsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_InGamePlayerOptionsMenu.h diff --git a/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp similarity index 100% rename from Common/UI/UIScene_InGameSaveManagementMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp diff --git a/Common/UI/UIScene_InGameSaveManagementMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.h similarity index 100% rename from Common/UI/UIScene_InGameSaveManagementMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.h diff --git a/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp similarity index 100% rename from Common/UI/UIScene_Intro.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp diff --git a/Common/UI/UIScene_Intro.h b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h similarity index 100% rename from Common/UI/UIScene_Intro.h rename to Minecraft.Client/Platform/Common/UI/UIScene_Intro.h diff --git a/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.cpp similarity index 100% rename from Common/UI/UIScene_InventoryMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.cpp diff --git a/Common/UI/UIScene_InventoryMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.h similarity index 100% rename from Common/UI/UIScene_InventoryMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_InventoryMenu.h diff --git a/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp similarity index 100% rename from Common/UI/UIScene_JoinMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp diff --git a/Common/UI/UIScene_JoinMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h similarity index 100% rename from Common/UI/UIScene_JoinMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h diff --git a/Common/UI/UIScene_Keyboard.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.cpp similarity index 100% rename from Common/UI/UIScene_Keyboard.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.cpp diff --git a/Common/UI/UIScene_Keyboard.h b/Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.h similarity index 100% rename from Common/UI/UIScene_Keyboard.h rename to Minecraft.Client/Platform/Common/UI/UIScene_Keyboard.h diff --git a/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp similarity index 100% rename from Common/UI/UIScene_LaunchMoreOptionsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp diff --git a/Common/UI/UIScene_LaunchMoreOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.h similarity index 100% rename from Common/UI/UIScene_LaunchMoreOptionsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_LaunchMoreOptionsMenu.h diff --git a/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp similarity index 100% rename from Common/UI/UIScene_LeaderboardsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.cpp diff --git a/Common/UI/UIScene_LeaderboardsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.h similarity index 100% rename from Common/UI/UIScene_LeaderboardsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_LeaderboardsMenu.h diff --git a/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp similarity index 100% rename from Common/UI/UIScene_LoadMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp diff --git a/Common/UI/UIScene_LoadMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h similarity index 100% rename from Common/UI/UIScene_LoadMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h diff --git a/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp similarity index 100% rename from Common/UI/UIScene_LoadOrJoinMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp diff --git a/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h similarity index 100% rename from Common/UI/UIScene_LoadOrJoinMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h diff --git a/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp similarity index 100% rename from Common/UI/UIScene_MainMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp diff --git a/Common/UI/UIScene_MainMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.h similarity index 100% rename from Common/UI/UIScene_MainMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.h diff --git a/Common/UI/UIScene_MessageBox.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp similarity index 100% rename from Common/UI/UIScene_MessageBox.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.cpp diff --git a/Common/UI/UIScene_MessageBox.h b/Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h similarity index 100% rename from Common/UI/UIScene_MessageBox.h rename to Minecraft.Client/Platform/Common/UI/UIScene_MessageBox.h diff --git a/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp similarity index 100% rename from Common/UI/UIScene_PauseMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.cpp diff --git a/Common/UI/UIScene_PauseMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.h similarity index 100% rename from Common/UI/UIScene_PauseMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_PauseMenu.h diff --git a/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp similarity index 100% rename from Common/UI/UIScene_QuadrantSignin.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp diff --git a/Common/UI/UIScene_QuadrantSignin.h b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h similarity index 100% rename from Common/UI/UIScene_QuadrantSignin.h rename to Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.h diff --git a/Common/UI/UIScene_ReinstallMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp similarity index 100% rename from Common/UI/UIScene_ReinstallMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.cpp diff --git a/Common/UI/UIScene_ReinstallMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.h similarity index 100% rename from Common/UI/UIScene_ReinstallMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_ReinstallMenu.h diff --git a/Common/UI/UIScene_SaveMessage.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.cpp similarity index 100% rename from Common/UI/UIScene_SaveMessage.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.cpp diff --git a/Common/UI/UIScene_SaveMessage.h b/Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.h similarity index 100% rename from Common/UI/UIScene_SaveMessage.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SaveMessage.h diff --git a/Common/UI/UIScene_SettingsAudioMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp similarity index 100% rename from Common/UI/UIScene_SettingsAudioMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.cpp diff --git a/Common/UI/UIScene_SettingsAudioMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.h similarity index 100% rename from Common/UI/UIScene_SettingsAudioMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsAudioMenu.h diff --git a/Common/UI/UIScene_SettingsControlMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.cpp similarity index 100% rename from Common/UI/UIScene_SettingsControlMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.cpp diff --git a/Common/UI/UIScene_SettingsControlMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.h similarity index 100% rename from Common/UI/UIScene_SettingsControlMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsControlMenu.h diff --git a/Common/UI/UIScene_SettingsGraphicsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.cpp similarity index 100% rename from Common/UI/UIScene_SettingsGraphicsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.cpp diff --git a/Common/UI/UIScene_SettingsGraphicsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.h similarity index 100% rename from Common/UI/UIScene_SettingsGraphicsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsGraphicsMenu.h diff --git a/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp similarity index 100% rename from Common/UI/UIScene_SettingsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.cpp diff --git a/Common/UI/UIScene_SettingsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.h similarity index 100% rename from Common/UI/UIScene_SettingsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsMenu.h diff --git a/Common/UI/UIScene_SettingsOptionsMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.cpp similarity index 100% rename from Common/UI/UIScene_SettingsOptionsMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.cpp diff --git a/Common/UI/UIScene_SettingsOptionsMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.h similarity index 100% rename from Common/UI/UIScene_SettingsOptionsMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsOptionsMenu.h diff --git a/Common/UI/UIScene_SettingsUIMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.cpp similarity index 100% rename from Common/UI/UIScene_SettingsUIMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.cpp diff --git a/Common/UI/UIScene_SettingsUIMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.h similarity index 100% rename from Common/UI/UIScene_SettingsUIMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SettingsUIMenu.h diff --git a/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp similarity index 100% rename from Common/UI/UIScene_SignEntryMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.cpp diff --git a/Common/UI/UIScene_SignEntryMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h similarity index 100% rename from Common/UI/UIScene_SignEntryMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SignEntryMenu.h diff --git a/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp similarity index 100% rename from Common/UI/UIScene_SkinSelectMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.cpp diff --git a/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h similarity index 100% rename from Common/UI/UIScene_SkinSelectMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_SkinSelectMenu.h diff --git a/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp similarity index 100% rename from Common/UI/UIScene_TeleportMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.cpp diff --git a/Common/UI/UIScene_TeleportMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.h similarity index 100% rename from Common/UI/UIScene_TeleportMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_TeleportMenu.h diff --git a/Common/UI/UIScene_Timer.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Timer.cpp similarity index 100% rename from Common/UI/UIScene_Timer.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_Timer.cpp diff --git a/Common/UI/UIScene_Timer.h b/Minecraft.Client/Platform/Common/UI/UIScene_Timer.h similarity index 100% rename from Common/UI/UIScene_Timer.h rename to Minecraft.Client/Platform/Common/UI/UIScene_Timer.h diff --git a/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp similarity index 100% rename from Common/UI/UIScene_TradingMenu.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp diff --git a/Common/UI/UIScene_TradingMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.h similarity index 100% rename from Common/UI/UIScene_TradingMenu.h rename to Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.h diff --git a/Common/UI/UIScene_TrialExitUpsell.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp similarity index 100% rename from Common/UI/UIScene_TrialExitUpsell.cpp rename to Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.cpp diff --git a/Common/UI/UIScene_TrialExitUpsell.h b/Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.h similarity index 100% rename from Common/UI/UIScene_TrialExitUpsell.h rename to Minecraft.Client/Platform/Common/UI/UIScene_TrialExitUpsell.h diff --git a/Common/UI/UIStructs.h b/Minecraft.Client/Platform/Common/UI/UIStructs.h similarity index 100% rename from Common/UI/UIStructs.h rename to Minecraft.Client/Platform/Common/UI/UIStructs.h diff --git a/Common/UI/UITTFFont.cpp b/Minecraft.Client/Platform/Common/UI/UITTFFont.cpp similarity index 100% rename from Common/UI/UITTFFont.cpp rename to Minecraft.Client/Platform/Common/UI/UITTFFont.cpp diff --git a/Common/UI/UITTFFont.h b/Minecraft.Client/Platform/Common/UI/UITTFFont.h similarity index 100% rename from Common/UI/UITTFFont.h rename to Minecraft.Client/Platform/Common/UI/UITTFFont.h diff --git a/Common/XUI/SlotProgressControl.cpp b/Minecraft.Client/Platform/Common/XUI/SlotProgressControl.cpp similarity index 100% rename from Common/XUI/SlotProgressControl.cpp rename to Minecraft.Client/Platform/Common/XUI/SlotProgressControl.cpp diff --git a/Common/XUI/SlotProgressControl.h b/Minecraft.Client/Platform/Common/XUI/SlotProgressControl.h similarity index 100% rename from Common/XUI/SlotProgressControl.h rename to Minecraft.Client/Platform/Common/XUI/SlotProgressControl.h diff --git a/Common/XUI/XUI_BasePlayer.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_BasePlayer.cpp similarity index 100% rename from Common/XUI/XUI_BasePlayer.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_BasePlayer.cpp diff --git a/Common/XUI/XUI_BasePlayer.h b/Minecraft.Client/Platform/Common/XUI/XUI_BasePlayer.h similarity index 100% rename from Common/XUI/XUI_BasePlayer.h rename to Minecraft.Client/Platform/Common/XUI/XUI_BasePlayer.h diff --git a/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Chat.cpp similarity index 100% rename from Common/XUI/XUI_Chat.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Chat.cpp diff --git a/Common/XUI/XUI_Chat.h b/Minecraft.Client/Platform/Common/XUI/XUI_Chat.h similarity index 100% rename from Common/XUI/XUI_Chat.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Chat.h diff --git a/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_ConnectingProgress.cpp similarity index 100% rename from Common/XUI/XUI_ConnectingProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_ConnectingProgress.cpp diff --git a/Common/XUI/XUI_ConnectingProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_ConnectingProgress.h similarity index 100% rename from Common/XUI/XUI_ConnectingProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_ConnectingProgress.h diff --git a/Common/XUI/XUI_Control_ComboBox.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.cpp similarity index 100% rename from Common/XUI/XUI_Control_ComboBox.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.cpp diff --git a/Common/XUI/XUI_Control_ComboBox.h b/Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h similarity index 100% rename from Common/XUI/XUI_Control_ComboBox.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h diff --git a/Common/XUI/XUI_Controls.h b/Minecraft.Client/Platform/Common/XUI/XUI_Controls.h similarity index 100% rename from Common/XUI/XUI_Controls.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Controls.h diff --git a/Common/XUI/XUI_Ctrl_4JEdit.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JEdit.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_4JEdit.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JEdit.cpp diff --git a/Common/XUI/XUI_Ctrl_4JEdit.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JEdit.h similarity index 100% rename from Common/XUI/XUI_Ctrl_4JEdit.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JEdit.h diff --git a/Common/XUI/XUI_Ctrl_4JIcon.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JIcon.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_4JIcon.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JIcon.cpp diff --git a/Common/XUI/XUI_Ctrl_4JIcon.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JIcon.h similarity index 100% rename from Common/XUI/XUI_Ctrl_4JIcon.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JIcon.h diff --git a/Common/XUI/XUI_Ctrl_4JList.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_4JList.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.cpp diff --git a/Common/XUI/XUI_Ctrl_4JList.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h similarity index 100% rename from Common/XUI/XUI_Ctrl_4JList.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h diff --git a/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BrewProgress.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_BrewProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BrewProgress.cpp diff --git a/Common/XUI/XUI_Ctrl_BrewProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BrewProgress.h similarity index 100% rename from Common/XUI/XUI_Ctrl_BrewProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BrewProgress.h diff --git a/Common/XUI/XUI_Ctrl_BubblesProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BubblesProgress.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_BubblesProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BubblesProgress.cpp diff --git a/Common/XUI/XUI_Ctrl_BubblesProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BubblesProgress.h similarity index 100% rename from Common/XUI/XUI_Ctrl_BubblesProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BubblesProgress.h diff --git a/Common/XUI/XUI_Ctrl_BurnProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BurnProgress.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_BurnProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BurnProgress.cpp diff --git a/Common/XUI/XUI_Ctrl_BurnProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BurnProgress.h similarity index 100% rename from Common/XUI/XUI_Ctrl_BurnProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_BurnProgress.h diff --git a/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp diff --git a/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h similarity index 100% rename from Common/XUI/XUI_Ctrl_CraftIngredientSlot.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_CraftIngredientSlot.h diff --git a/Common/XUI/XUI_Ctrl_EnchantButton.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantButton.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_EnchantButton.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantButton.cpp diff --git a/Common/XUI/XUI_Ctrl_EnchantButton.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantButton.h similarity index 100% rename from Common/XUI/XUI_Ctrl_EnchantButton.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantButton.h diff --git a/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_EnchantmentBook.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp diff --git a/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h similarity index 100% rename from Common/XUI/XUI_Ctrl_EnchantmentBook.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h diff --git a/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp diff --git a/Common/XUI/XUI_Ctrl_EnchantmentButtonText.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentButtonText.h similarity index 100% rename from Common/XUI/XUI_Ctrl_EnchantmentButtonText.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentButtonText.h diff --git a/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_FireProgress.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_FireProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_FireProgress.cpp diff --git a/Common/XUI/XUI_Ctrl_FireProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_FireProgress.h similarity index 100% rename from Common/XUI/XUI_Ctrl_FireProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_FireProgress.h diff --git a/Common/XUI/XUI_Ctrl_LoadingProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_LoadingProgress.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_LoadingProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_LoadingProgress.cpp diff --git a/Common/XUI/XUI_Ctrl_LoadingProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_LoadingProgress.h similarity index 100% rename from Common/XUI/XUI_Ctrl_LoadingProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_LoadingProgress.h diff --git a/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp diff --git a/Common/XUI/XUI_Ctrl_MinecraftPlayer.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h similarity index 100% rename from Common/XUI/XUI_Ctrl_MinecraftPlayer.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h diff --git a/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp diff --git a/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h similarity index 100% rename from Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h diff --git a/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_MinecraftSlot.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp diff --git a/Common/XUI/XUI_Ctrl_MinecraftSlot.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h similarity index 100% rename from Common/XUI/XUI_Ctrl_MinecraftSlot.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h diff --git a/Common/XUI/XUI_Ctrl_MobEffect.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MobEffect.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_MobEffect.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MobEffect.cpp diff --git a/Common/XUI/XUI_Ctrl_MobEffect.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MobEffect.h similarity index 100% rename from Common/XUI/XUI_Ctrl_MobEffect.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MobEffect.h diff --git a/Common/XUI/XUI_Ctrl_PassThroughList.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_PassThroughList.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_PassThroughList.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_PassThroughList.cpp diff --git a/Common/XUI/XUI_Ctrl_PassthroughList.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_PassthroughList.h similarity index 100% rename from Common/XUI/XUI_Ctrl_PassthroughList.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_PassthroughList.h diff --git a/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_ProgressCtrlBase.cpp diff --git a/Common/XUI/XUI_Ctrl_ProgressCtrlBase.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_ProgressCtrlBase.h similarity index 100% rename from Common/XUI/XUI_Ctrl_ProgressCtrlBase.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_ProgressCtrlBase.h diff --git a/Common/XUI/XUI_Ctrl_SliderWrapper.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SliderWrapper.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_SliderWrapper.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SliderWrapper.cpp diff --git a/Common/XUI/XUI_Ctrl_SliderWrapper.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SliderWrapper.h similarity index 100% rename from Common/XUI/XUI_Ctrl_SliderWrapper.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SliderWrapper.h diff --git a/Common/XUI/XUI_Ctrl_SlotItem.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItem.h similarity index 100% rename from Common/XUI/XUI_Ctrl_SlotItem.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItem.h diff --git a/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp diff --git a/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h similarity index 100% rename from Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h diff --git a/Common/XUI/XUI_Ctrl_SlotItemListItem.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemListItem.h similarity index 100% rename from Common/XUI/XUI_Ctrl_SlotItemListItem.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemListItem.h diff --git a/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_SlotList.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.cpp diff --git a/Common/XUI/XUI_Ctrl_SlotList.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.h similarity index 100% rename from Common/XUI/XUI_Ctrl_SlotList.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotList.h diff --git a/Common/XUI/XUI_Ctrl_SplashPulser.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.cpp similarity index 100% rename from Common/XUI/XUI_Ctrl_SplashPulser.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.cpp diff --git a/Common/XUI/XUI_Ctrl_SplashPulser.h b/Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h similarity index 100% rename from Common/XUI/XUI_Ctrl_SplashPulser.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h diff --git a/Common/XUI/XUI_CustomMessages.h b/Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h similarity index 100% rename from Common/XUI/XUI_CustomMessages.h rename to Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h diff --git a/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp similarity index 100% rename from Common/XUI/XUI_DLCOffers.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.cpp diff --git a/Common/XUI/XUI_DLCOffers.h b/Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.h similarity index 100% rename from Common/XUI/XUI_DLCOffers.h rename to Minecraft.Client/Platform/Common/XUI/XUI_DLCOffers.h diff --git a/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp similarity index 100% rename from Common/XUI/XUI_Death.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Death.cpp diff --git a/Common/XUI/XUI_Death.h b/Minecraft.Client/Platform/Common/XUI/XUI_Death.h similarity index 100% rename from Common/XUI/XUI_Death.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Death.h diff --git a/Common/XUI/XUI_Debug.h b/Minecraft.Client/Platform/Common/XUI/XUI_Debug.h similarity index 100% rename from Common/XUI/XUI_Debug.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Debug.h diff --git a/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DebugItemEditor.cpp similarity index 100% rename from Common/XUI/XUI_DebugItemEditor.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugItemEditor.cpp diff --git a/Common/XUI/XUI_DebugItemEditor.h b/Minecraft.Client/Platform/Common/XUI/XUI_DebugItemEditor.h similarity index 100% rename from Common/XUI/XUI_DebugItemEditor.h rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugItemEditor.h diff --git a/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DebugOverlay.cpp similarity index 100% rename from Common/XUI/XUI_DebugOverlay.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugOverlay.cpp diff --git a/Common/XUI/XUI_DebugOverlay.h b/Minecraft.Client/Platform/Common/XUI/XUI_DebugOverlay.h similarity index 100% rename from Common/XUI/XUI_DebugOverlay.h rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugOverlay.h diff --git a/Common/XUI/XUI_DebugSchematicCreator.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DebugSchematicCreator.cpp similarity index 100% rename from Common/XUI/XUI_DebugSchematicCreator.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugSchematicCreator.cpp diff --git a/Common/XUI/XUI_DebugSchematicCreator.h b/Minecraft.Client/Platform/Common/XUI/XUI_DebugSchematicCreator.h similarity index 100% rename from Common/XUI/XUI_DebugSchematicCreator.h rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugSchematicCreator.h diff --git a/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DebugSetCamera.cpp similarity index 100% rename from Common/XUI/XUI_DebugSetCamera.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugSetCamera.cpp diff --git a/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Platform/Common/XUI/XUI_DebugSetCamera.h similarity index 100% rename from Common/XUI/XUI_DebugSetCamera.h rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugSetCamera.h diff --git a/Common/XUI/XUI_DebugTips.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_DebugTips.cpp similarity index 100% rename from Common/XUI/XUI_DebugTips.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugTips.cpp diff --git a/Common/XUI/XUI_DebugTips.h b/Minecraft.Client/Platform/Common/XUI/XUI_DebugTips.h similarity index 100% rename from Common/XUI/XUI_DebugTips.h rename to Minecraft.Client/Platform/Common/XUI/XUI_DebugTips.h diff --git a/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_FullscreenProgress.cpp similarity index 100% rename from Common/XUI/XUI_FullscreenProgress.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_FullscreenProgress.cpp diff --git a/Common/XUI/XUI_FullscreenProgress.h b/Minecraft.Client/Platform/Common/XUI/XUI_FullscreenProgress.h similarity index 100% rename from Common/XUI/XUI_FullscreenProgress.h rename to Minecraft.Client/Platform/Common/XUI/XUI_FullscreenProgress.h diff --git a/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HUD.cpp similarity index 100% rename from Common/XUI/XUI_HUD.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_HUD.cpp diff --git a/Common/XUI/XUI_HUD.h b/Minecraft.Client/Platform/Common/XUI/XUI_HUD.h similarity index 100% rename from Common/XUI/XUI_HUD.h rename to Minecraft.Client/Platform/Common/XUI/XUI_HUD.h diff --git a/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp similarity index 100% rename from Common/XUI/XUI_HelpAndOptions.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.cpp diff --git a/Common/XUI/XUI_HelpAndOptions.h b/Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.h similarity index 100% rename from Common/XUI/XUI_HelpAndOptions.h rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpAndOptions.h diff --git a/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp similarity index 100% rename from Common/XUI/XUI_HelpControls.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.cpp diff --git a/Common/XUI/XUI_HelpControls.h b/Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.h similarity index 100% rename from Common/XUI/XUI_HelpControls.h rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpControls.h diff --git a/Common/XUI/XUI_HelpCredits.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp similarity index 100% rename from Common/XUI/XUI_HelpCredits.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.cpp diff --git a/Common/XUI/XUI_HelpCredits.h b/Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.h similarity index 100% rename from Common/XUI/XUI_HelpCredits.h rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpCredits.h diff --git a/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HelpHowToPlay.cpp similarity index 100% rename from Common/XUI/XUI_HelpHowToPlay.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpHowToPlay.cpp diff --git a/Common/XUI/XUI_HelpHowToPlay.h b/Minecraft.Client/Platform/Common/XUI/XUI_HelpHowToPlay.h similarity index 100% rename from Common/XUI/XUI_HelpHowToPlay.h rename to Minecraft.Client/Platform/Common/XUI/XUI_HelpHowToPlay.h diff --git a/Common/XUI/XUI_Helper.h b/Minecraft.Client/Platform/Common/XUI/XUI_Helper.h similarity index 100% rename from Common/XUI/XUI_Helper.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Helper.h diff --git a/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_HowToPlayMenu.cpp similarity index 100% rename from Common/XUI/XUI_HowToPlayMenu.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_HowToPlayMenu.cpp diff --git a/Common/XUI/XUI_HowToPlayMenu.h b/Minecraft.Client/Platform/Common/XUI/XUI_HowToPlayMenu.h similarity index 100% rename from Common/XUI/XUI_HowToPlayMenu.h rename to Minecraft.Client/Platform/Common/XUI/XUI_HowToPlayMenu.h diff --git a/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_InGameHostOptions.cpp similarity index 100% rename from Common/XUI/XUI_InGameHostOptions.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_InGameHostOptions.cpp diff --git a/Common/XUI/XUI_InGameHostOptions.h b/Minecraft.Client/Platform/Common/XUI/XUI_InGameHostOptions.h similarity index 100% rename from Common/XUI/XUI_InGameHostOptions.h rename to Minecraft.Client/Platform/Common/XUI/XUI_InGameHostOptions.h diff --git a/Common/XUI/XUI_InGameInfo.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_InGameInfo.cpp similarity index 100% rename from Common/XUI/XUI_InGameInfo.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_InGameInfo.cpp diff --git a/Common/XUI/XUI_InGameInfo.h b/Minecraft.Client/Platform/Common/XUI/XUI_InGameInfo.h similarity index 100% rename from Common/XUI/XUI_InGameInfo.h rename to Minecraft.Client/Platform/Common/XUI/XUI_InGameInfo.h diff --git a/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp similarity index 100% rename from Common/XUI/XUI_InGamePlayerOptions.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.cpp diff --git a/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.h similarity index 100% rename from Common/XUI/XUI_InGamePlayerOptions.h rename to Minecraft.Client/Platform/Common/XUI/XUI_InGamePlayerOptions.h diff --git a/Common/XUI/XUI_Intro.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Intro.cpp similarity index 100% rename from Common/XUI/XUI_Intro.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Intro.cpp diff --git a/Common/XUI/XUI_Intro.h b/Minecraft.Client/Platform/Common/XUI/XUI_Intro.h similarity index 100% rename from Common/XUI/XUI_Intro.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Intro.h diff --git a/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp similarity index 100% rename from Common/XUI/XUI_Leaderboards.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.cpp diff --git a/Common/XUI/XUI_Leaderboards.h b/Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.h similarity index 100% rename from Common/XUI/XUI_Leaderboards.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Leaderboards.h diff --git a/Common/XUI/XUI_LoadSettings.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_LoadSettings.cpp similarity index 100% rename from Common/XUI/XUI_LoadSettings.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_LoadSettings.cpp diff --git a/Common/XUI/XUI_LoadSettings.h b/Minecraft.Client/Platform/Common/XUI/XUI_LoadSettings.h similarity index 100% rename from Common/XUI/XUI_LoadSettings.h rename to Minecraft.Client/Platform/Common/XUI/XUI_LoadSettings.h diff --git a/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_MainMenu.cpp similarity index 100% rename from Common/XUI/XUI_MainMenu.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_MainMenu.cpp diff --git a/Common/XUI/XUI_MainMenu.h b/Minecraft.Client/Platform/Common/XUI/XUI_MainMenu.h similarity index 100% rename from Common/XUI/XUI_MainMenu.h rename to Minecraft.Client/Platform/Common/XUI/XUI_MainMenu.h diff --git a/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameCreate.cpp similarity index 100% rename from Common/XUI/XUI_MultiGameCreate.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameCreate.cpp diff --git a/Common/XUI/XUI_MultiGameCreate.h b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameCreate.h similarity index 100% rename from Common/XUI/XUI_MultiGameCreate.h rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameCreate.h diff --git a/Common/XUI/XUI_MultiGameInfo.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameInfo.cpp similarity index 100% rename from Common/XUI/XUI_MultiGameInfo.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameInfo.cpp diff --git a/Common/XUI/XUI_MultiGameInfo.h b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameInfo.h similarity index 100% rename from Common/XUI/XUI_MultiGameInfo.h rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameInfo.h diff --git a/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp similarity index 100% rename from Common/XUI/XUI_MultiGameJoinLoad.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.cpp diff --git a/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h similarity index 100% rename from Common/XUI/XUI_MultiGameJoinLoad.h rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameJoinLoad.h diff --git a/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp similarity index 100% rename from Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp diff --git a/Common/XUI/XUI_MultiGameLaunchMoreOptions.h b/Minecraft.Client/Platform/Common/XUI/XUI_MultiGameLaunchMoreOptions.h similarity index 100% rename from Common/XUI/XUI_MultiGameLaunchMoreOptions.h rename to Minecraft.Client/Platform/Common/XUI/XUI_MultiGameLaunchMoreOptions.h diff --git a/Common/XUI/XUI_NewUpdateMessage.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_NewUpdateMessage.cpp similarity index 100% rename from Common/XUI/XUI_NewUpdateMessage.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_NewUpdateMessage.cpp diff --git a/Common/XUI/XUI_NewUpdateMessage.h b/Minecraft.Client/Platform/Common/XUI/XUI_NewUpdateMessage.h similarity index 100% rename from Common/XUI/XUI_NewUpdateMessage.h rename to Minecraft.Client/Platform/Common/XUI/XUI_NewUpdateMessage.h diff --git a/Common/XUI/XUI_PartnernetPassword.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_PartnernetPassword.cpp similarity index 100% rename from Common/XUI/XUI_PartnernetPassword.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_PartnernetPassword.cpp diff --git a/Common/XUI/XUI_PartnernetPassword.h b/Minecraft.Client/Platform/Common/XUI/XUI_PartnernetPassword.h similarity index 100% rename from Common/XUI/XUI_PartnernetPassword.h rename to Minecraft.Client/Platform/Common/XUI/XUI_PartnernetPassword.h diff --git a/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp similarity index 100% rename from Common/XUI/XUI_PauseMenu.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.cpp diff --git a/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.h similarity index 100% rename from Common/XUI/XUI_PauseMenu.h rename to Minecraft.Client/Platform/Common/XUI/XUI_PauseMenu.h diff --git a/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Reinstall.cpp similarity index 100% rename from Common/XUI/XUI_Reinstall.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Reinstall.cpp diff --git a/Common/XUI/XUI_Reinstall.h b/Minecraft.Client/Platform/Common/XUI/XUI_Reinstall.h similarity index 100% rename from Common/XUI/XUI_Reinstall.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Reinstall.h diff --git a/Common/XUI/XUI_SaveMessage.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SaveMessage.cpp similarity index 100% rename from Common/XUI/XUI_SaveMessage.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SaveMessage.cpp diff --git a/Common/XUI/XUI_SaveMessage.h b/Minecraft.Client/Platform/Common/XUI/XUI_SaveMessage.h similarity index 100% rename from Common/XUI/XUI_SaveMessage.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SaveMessage.h diff --git a/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_AbstractContainer.cpp similarity index 100% rename from Common/XUI/XUI_Scene_AbstractContainer.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_AbstractContainer.cpp diff --git a/Common/XUI/XUI_Scene_AbstractContainer.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_AbstractContainer.h similarity index 100% rename from Common/XUI/XUI_Scene_AbstractContainer.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_AbstractContainer.h diff --git a/Common/XUI/XUI_Scene_Anvil.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Anvil.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Anvil.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Anvil.cpp diff --git a/Common/XUI/XUI_Scene_Anvil.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Anvil.h similarity index 100% rename from Common/XUI/XUI_Scene_Anvil.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Anvil.h diff --git a/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Base.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Base.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Base.cpp diff --git a/Common/XUI/XUI_Scene_Base.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Base.h similarity index 100% rename from Common/XUI/XUI_Scene_Base.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Base.h diff --git a/Common/XUI/XUI_Scene_BrewingStand.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_BrewingStand.cpp similarity index 100% rename from Common/XUI/XUI_Scene_BrewingStand.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_BrewingStand.cpp diff --git a/Common/XUI/XUI_Scene_BrewingStand.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_BrewingStand.h similarity index 100% rename from Common/XUI/XUI_Scene_BrewingStand.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_BrewingStand.h diff --git a/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Container.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Container.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Container.cpp diff --git a/Common/XUI/XUI_Scene_Container.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Container.h similarity index 100% rename from Common/XUI/XUI_Scene_Container.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Container.h diff --git a/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp similarity index 100% rename from Common/XUI/XUI_Scene_CraftingPanel.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.cpp diff --git a/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.h similarity index 100% rename from Common/XUI/XUI_Scene_CraftingPanel.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_CraftingPanel.h diff --git a/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Enchant.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Enchant.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Enchant.cpp diff --git a/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Enchant.h similarity index 100% rename from Common/XUI/XUI_Scene_Enchant.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Enchant.h diff --git a/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Furnace.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Furnace.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Furnace.cpp diff --git a/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Furnace.h similarity index 100% rename from Common/XUI/XUI_Scene_Furnace.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Furnace.h diff --git a/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Inventory.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory.cpp diff --git a/Common/XUI/XUI_Scene_Inventory.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory.h similarity index 100% rename from Common/XUI/XUI_Scene_Inventory.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory.h diff --git a/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory_Creative.cpp similarity index 99% rename from Common/XUI/XUI_Scene_Inventory_Creative.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory_Creative.cpp index 06b783e5a..7ca4d9239 100644 --- a/Common/XUI/XUI_Scene_Inventory_Creative.cpp +++ b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory_Creative.cpp @@ -20,7 +20,7 @@ #include "XUI_Ctrl_SlotList.h" #include "XUI_Ctrl_SlotItemListItem.h" -#include "../../Common/Potion_macros.h" +#include "../Platform/Common/Potion_macros.h" //-------------------------------------------------------------------------------------- // Name: CXuiSceneInventoryCreative::OnInit diff --git a/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory_Creative.h similarity index 100% rename from Common/XUI/XUI_Scene_Inventory_Creative.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Inventory_Creative.h diff --git a/Common/XUI/XUI_Scene_Trading.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trading.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Trading.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trading.cpp diff --git a/Common/XUI/XUI_Scene_Trading.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trading.h similarity index 100% rename from Common/XUI/XUI_Scene_Trading.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trading.h diff --git a/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trap.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Trap.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trap.cpp diff --git a/Common/XUI/XUI_Scene_Trap.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trap.h similarity index 100% rename from Common/XUI/XUI_Scene_Trap.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Trap.h diff --git a/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Win.cpp similarity index 100% rename from Common/XUI/XUI_Scene_Win.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Win.cpp diff --git a/Common/XUI/XUI_Scene_Win.h b/Minecraft.Client/Platform/Common/XUI/XUI_Scene_Win.h similarity index 100% rename from Common/XUI/XUI_Scene_Win.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Scene_Win.h diff --git a/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsAll.cpp similarity index 100% rename from Common/XUI/XUI_SettingsAll.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsAll.cpp diff --git a/Common/XUI/XUI_SettingsAll.h b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsAll.h similarity index 100% rename from Common/XUI/XUI_SettingsAll.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsAll.h diff --git a/Common/XUI/XUI_SettingsAudio.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsAudio.cpp similarity index 100% rename from Common/XUI/XUI_SettingsAudio.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsAudio.cpp diff --git a/Common/XUI/XUI_SettingsAudio.h b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsAudio.h similarity index 100% rename from Common/XUI/XUI_SettingsAudio.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsAudio.h diff --git a/Common/XUI/XUI_SettingsControl.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsControl.cpp similarity index 100% rename from Common/XUI/XUI_SettingsControl.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsControl.cpp diff --git a/Common/XUI/XUI_SettingsControl.h b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsControl.h similarity index 100% rename from Common/XUI/XUI_SettingsControl.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsControl.h diff --git a/Common/XUI/XUI_SettingsGraphics.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsGraphics.cpp similarity index 100% rename from Common/XUI/XUI_SettingsGraphics.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsGraphics.cpp diff --git a/Common/XUI/XUI_SettingsGraphics.h b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsGraphics.h similarity index 100% rename from Common/XUI/XUI_SettingsGraphics.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsGraphics.h diff --git a/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsOptions.cpp similarity index 100% rename from Common/XUI/XUI_SettingsOptions.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsOptions.cpp diff --git a/Common/XUI/XUI_SettingsOptions.h b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsOptions.h similarity index 100% rename from Common/XUI/XUI_SettingsOptions.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsOptions.h diff --git a/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsUI.cpp similarity index 100% rename from Common/XUI/XUI_SettingsUI.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsUI.cpp diff --git a/Common/XUI/XUI_SettingsUI.h b/Minecraft.Client/Platform/Common/XUI/XUI_SettingsUI.h similarity index 100% rename from Common/XUI/XUI_SettingsUI.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SettingsUI.h diff --git a/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SignEntry.cpp similarity index 100% rename from Common/XUI/XUI_SignEntry.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SignEntry.cpp diff --git a/Common/XUI/XUI_SignEntry.h b/Minecraft.Client/Platform/Common/XUI/XUI_SignEntry.h similarity index 100% rename from Common/XUI/XUI_SignEntry.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SignEntry.h diff --git a/Common/XUI/XUI_SkinSelect.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SkinSelect.cpp similarity index 100% rename from Common/XUI/XUI_SkinSelect.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SkinSelect.cpp diff --git a/Common/XUI/XUI_SkinSelect.h b/Minecraft.Client/Platform/Common/XUI/XUI_SkinSelect.h similarity index 100% rename from Common/XUI/XUI_SkinSelect.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SkinSelect.h diff --git a/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_SocialPost.cpp similarity index 100% rename from Common/XUI/XUI_SocialPost.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_SocialPost.cpp diff --git a/Common/XUI/XUI_SocialPost.h b/Minecraft.Client/Platform/Common/XUI/XUI_SocialPost.h similarity index 100% rename from Common/XUI/XUI_SocialPost.h rename to Minecraft.Client/Platform/Common/XUI/XUI_SocialPost.h diff --git a/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp similarity index 100% rename from Common/XUI/XUI_Teleport.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_Teleport.cpp diff --git a/Common/XUI/XUI_Teleport.h b/Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h similarity index 100% rename from Common/XUI/XUI_Teleport.h rename to Minecraft.Client/Platform/Common/XUI/XUI_Teleport.h diff --git a/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_TextEntry.cpp similarity index 100% rename from Common/XUI/XUI_TextEntry.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_TextEntry.cpp diff --git a/Common/XUI/XUI_TextEntry.h b/Minecraft.Client/Platform/Common/XUI/XUI_TextEntry.h similarity index 100% rename from Common/XUI/XUI_TextEntry.h rename to Minecraft.Client/Platform/Common/XUI/XUI_TextEntry.h diff --git a/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp similarity index 100% rename from Common/XUI/XUI_TransferToXboxOne.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.cpp diff --git a/Common/XUI/XUI_TransferToXboxOne.h b/Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.h similarity index 100% rename from Common/XUI/XUI_TransferToXboxOne.h rename to Minecraft.Client/Platform/Common/XUI/XUI_TransferToXboxOne.h diff --git a/Common/XUI/XUI_TrialExitUpsell.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_TrialExitUpsell.cpp similarity index 100% rename from Common/XUI/XUI_TrialExitUpsell.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_TrialExitUpsell.cpp diff --git a/Common/XUI/XUI_TrialExitUpsell.h b/Minecraft.Client/Platform/Common/XUI/XUI_TrialExitUpsell.h similarity index 100% rename from Common/XUI/XUI_TrialExitUpsell.h rename to Minecraft.Client/Platform/Common/XUI/XUI_TrialExitUpsell.h diff --git a/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_TutorialPopup.cpp similarity index 100% rename from Common/XUI/XUI_TutorialPopup.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_TutorialPopup.cpp diff --git a/Common/XUI/XUI_TutorialPopup.h b/Minecraft.Client/Platform/Common/XUI/XUI_TutorialPopup.h similarity index 100% rename from Common/XUI/XUI_TutorialPopup.h rename to Minecraft.Client/Platform/Common/XUI/XUI_TutorialPopup.h diff --git a/Common/XUI/XUI_XZP_Icons.h b/Minecraft.Client/Platform/Common/XUI/XUI_XZP_Icons.h similarity index 100% rename from Common/XUI/XUI_XZP_Icons.h rename to Minecraft.Client/Platform/Common/XUI/XUI_XZP_Icons.h diff --git a/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Platform/Common/XUI/XUI_debug.cpp similarity index 100% rename from Common/XUI/XUI_debug.cpp rename to Minecraft.Client/Platform/Common/XUI/XUI_debug.cpp diff --git a/Common/xuiscene_base.h b/Minecraft.Client/Platform/Common/xuiscene_base.h similarity index 100% rename from Common/xuiscene_base.h rename to Minecraft.Client/Platform/Common/xuiscene_base.h diff --git a/Common/zlib/adler32.c b/Minecraft.Client/Platform/Common/zlib/adler32.c similarity index 100% rename from Common/zlib/adler32.c rename to Minecraft.Client/Platform/Common/zlib/adler32.c diff --git a/Common/zlib/compress.c b/Minecraft.Client/Platform/Common/zlib/compress.c similarity index 100% rename from Common/zlib/compress.c rename to Minecraft.Client/Platform/Common/zlib/compress.c diff --git a/Common/zlib/crc32.c b/Minecraft.Client/Platform/Common/zlib/crc32.c similarity index 100% rename from Common/zlib/crc32.c rename to Minecraft.Client/Platform/Common/zlib/crc32.c diff --git a/Common/zlib/crc32.h b/Minecraft.Client/Platform/Common/zlib/crc32.h similarity index 100% rename from Common/zlib/crc32.h rename to Minecraft.Client/Platform/Common/zlib/crc32.h diff --git a/Common/zlib/deflate.c b/Minecraft.Client/Platform/Common/zlib/deflate.c similarity index 100% rename from Common/zlib/deflate.c rename to Minecraft.Client/Platform/Common/zlib/deflate.c diff --git a/Common/zlib/deflate.h b/Minecraft.Client/Platform/Common/zlib/deflate.h similarity index 100% rename from Common/zlib/deflate.h rename to Minecraft.Client/Platform/Common/zlib/deflate.h diff --git a/Common/zlib/gzclose.c b/Minecraft.Client/Platform/Common/zlib/gzclose.c similarity index 100% rename from Common/zlib/gzclose.c rename to Minecraft.Client/Platform/Common/zlib/gzclose.c diff --git a/Common/zlib/gzguts.h b/Minecraft.Client/Platform/Common/zlib/gzguts.h similarity index 100% rename from Common/zlib/gzguts.h rename to Minecraft.Client/Platform/Common/zlib/gzguts.h diff --git a/Common/zlib/gzlib.c b/Minecraft.Client/Platform/Common/zlib/gzlib.c similarity index 100% rename from Common/zlib/gzlib.c rename to Minecraft.Client/Platform/Common/zlib/gzlib.c diff --git a/Common/zlib/gzread.c b/Minecraft.Client/Platform/Common/zlib/gzread.c similarity index 100% rename from Common/zlib/gzread.c rename to Minecraft.Client/Platform/Common/zlib/gzread.c diff --git a/Common/zlib/gzwrite.c b/Minecraft.Client/Platform/Common/zlib/gzwrite.c similarity index 100% rename from Common/zlib/gzwrite.c rename to Minecraft.Client/Platform/Common/zlib/gzwrite.c diff --git a/Common/zlib/infback.c b/Minecraft.Client/Platform/Common/zlib/infback.c similarity index 100% rename from Common/zlib/infback.c rename to Minecraft.Client/Platform/Common/zlib/infback.c diff --git a/Common/zlib/inffast.c b/Minecraft.Client/Platform/Common/zlib/inffast.c similarity index 100% rename from Common/zlib/inffast.c rename to Minecraft.Client/Platform/Common/zlib/inffast.c diff --git a/Common/zlib/inffast.h b/Minecraft.Client/Platform/Common/zlib/inffast.h similarity index 100% rename from Common/zlib/inffast.h rename to Minecraft.Client/Platform/Common/zlib/inffast.h diff --git a/Common/zlib/inffixed.h b/Minecraft.Client/Platform/Common/zlib/inffixed.h similarity index 100% rename from Common/zlib/inffixed.h rename to Minecraft.Client/Platform/Common/zlib/inffixed.h diff --git a/Common/zlib/inflate.c b/Minecraft.Client/Platform/Common/zlib/inflate.c similarity index 100% rename from Common/zlib/inflate.c rename to Minecraft.Client/Platform/Common/zlib/inflate.c diff --git a/Common/zlib/inflate.h b/Minecraft.Client/Platform/Common/zlib/inflate.h similarity index 100% rename from Common/zlib/inflate.h rename to Minecraft.Client/Platform/Common/zlib/inflate.h diff --git a/Common/zlib/inftrees.c b/Minecraft.Client/Platform/Common/zlib/inftrees.c similarity index 100% rename from Common/zlib/inftrees.c rename to Minecraft.Client/Platform/Common/zlib/inftrees.c diff --git a/Common/zlib/inftrees.h b/Minecraft.Client/Platform/Common/zlib/inftrees.h similarity index 100% rename from Common/zlib/inftrees.h rename to Minecraft.Client/Platform/Common/zlib/inftrees.h diff --git a/Common/zlib/trees.c b/Minecraft.Client/Platform/Common/zlib/trees.c similarity index 100% rename from Common/zlib/trees.c rename to Minecraft.Client/Platform/Common/zlib/trees.c diff --git a/Common/zlib/trees.h b/Minecraft.Client/Platform/Common/zlib/trees.h similarity index 100% rename from Common/zlib/trees.h rename to Minecraft.Client/Platform/Common/zlib/trees.h diff --git a/Common/zlib/uncompr.c b/Minecraft.Client/Platform/Common/zlib/uncompr.c similarity index 100% rename from Common/zlib/uncompr.c rename to Minecraft.Client/Platform/Common/zlib/uncompr.c diff --git a/Common/zlib/zconf.h b/Minecraft.Client/Platform/Common/zlib/zconf.h similarity index 100% rename from Common/zlib/zconf.h rename to Minecraft.Client/Platform/Common/zlib/zconf.h diff --git a/Common/zlib/zlib.h b/Minecraft.Client/Platform/Common/zlib/zlib.h similarity index 100% rename from Common/zlib/zlib.h rename to Minecraft.Client/Platform/Common/zlib/zlib.h diff --git a/Common/zlib/zutil.c b/Minecraft.Client/Platform/Common/zlib/zutil.c similarity index 100% rename from Common/zlib/zutil.c rename to Minecraft.Client/Platform/Common/zlib/zutil.c diff --git a/Common/zlib/zutil.h b/Minecraft.Client/Platform/Common/zlib/zutil.h similarity index 100% rename from Common/zlib/zutil.h rename to Minecraft.Client/Platform/Common/zlib/zutil.h diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build index 40ca970e5..5ef5cd0e9 100644 --- a/Minecraft.Client/meson.build +++ b/Minecraft.Client/meson.build @@ -1,40 +1,38 @@ -# sources that shouldn't be compiled for whatever reason -exclude_sources = [ - ' ! -path "*/Platform/*"', - ' ! -path "*/../Common/Network/Sony/*"', - ' ! -path "*/../Common/XUI/*"', - ' ! -path "*/../Common/zlib/*"', -] - -# get all those files +# all sources except ./Platform/* client_sources = run_command( 'sh', '-c', 'find "' + meson.current_source_dir() - + '" \\( -name "*.cpp" -o -name "*.c" \\) ' - + ' '.join(exclude_sources), + + '" \\( -name "*.cpp" -o -name "*.c" \\) ! -path "*/Platform/*"', check : true, ).stdout().strip().split('\n') -# Common/ sources (previously lived in Minecraft.Client/Build/Common/) -common_exclude = [ - ' ! -path "*/Network/Sony/*"', - ' ! -path "*/XUI/*"', - ' ! -path "*/zlib/*"', - ' ! -path "*/Media/*"', - ' ! -path "*/DummyTexturePack/*"', -] - -common_sources = run_command( +# all sources in ./Platform (top-level files only) +platform_sources = run_command( 'sh', '-c', 'find "' - + meson.current_source_dir() / '../Common' - + '" \\( -name "*.cpp" -o -name "*.c" \\) ' - + ' '.join(common_exclude), + + meson.current_source_dir() / 'Platform' + + '" -maxdepth 1 \\( -name "*.cpp" -o -name "*.c" \\)', check : true, ).stdout().strip().split('\n') -platform_sources = [] +# some platform-specific sources that are for some stupid reason in Platform/Common +exclude_platform_common_sources = [ + ' ! -path "*/Network/Sony/*"', + ' ! -path "*/XUI/*"', + # we use system zlib instead, since this one is old as hell and isn't configured for linux correctly + ' ! -path "*/zlib/*"', +] + +# all sources in in ./Platform/Common +platform_sources += run_command( + 'sh', '-c', + 'find "' + + meson.current_source_dir() / 'Platform/Common' + + '" \\( -name "*.cpp" -o -name "*.c" \\)' + + ' '.join(exclude_platform_common_sources), + check : true, +).stdout().strip().split('\n') # linux-specific files (everything in Platform/Linux) if host_machine.system() == 'linux' @@ -47,9 +45,9 @@ if host_machine.system() == 'linux' ).stdout().strip().split('\n') endif -executable('Minecraft.Client', - client_sources + platform_sources + common_sources + localisation[1], - include_directories : include_directories('Build'), +client = executable('Minecraft.Client', + client_sources + platform_sources + localisation[1], + include_directories : include_directories('Platform'), dependencies : [ render_dep, input_dep, @@ -66,10 +64,26 @@ executable('Minecraft.Client', ], cpp_args : global_cpp_args + global_cpp_defs + [ '-DUNICODE', '-D_UNICODE', - '-include', meson.current_source_dir() / 'Build/stdafx.h', + '-include', meson.current_source_dir() / 'Platform/stdafx.h', ], c_args : global_cpp_defs + ['-DUNICODE', '-D_UNICODE'], install : true, install_dir : '' ) +# To support actually running the client from the build folder, we need to +# copy the generated assets from Minecraft.Assets into the working directory +# of the client. +custom_target('copy_assets_to_client', + input: [client, media_archive], + output: 'assets.stamp', # using a stamp file to avoid copying assets every time + command : [ + python, meson.project_source_root() / 'scripts/copy_assets_to_client.py', + meson.project_source_root(), + meson.build_root(), + meson.current_build_dir(), + '@INPUT1@', + '@OUTPUT@', + ], + build_by_default: true, +) \ No newline at end of file diff --git a/Minecraft.World/Blocks/StemTile.cpp b/Minecraft.World/Blocks/StemTile.cpp index d2a18607e..22e1603ca 100644 --- a/Minecraft.World/Blocks/StemTile.cpp +++ b/Minecraft.World/Blocks/StemTile.cpp @@ -4,7 +4,7 @@ #include "../Headers/net.minecraft.world.level.h" #include "../Headers/net.minecraft.world.h" #include "../../Minecraft.Client/Minecraft.h" -#include "../../Common/Colours/ColourTable.h" +#include "../../Minecraft.Client/Platform/Common/Colours/ColourTable.h" #include "StemTile.h" const std::wstring StemTile::TEXTURE_ANGLED = L"stem_bent"; diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp index 45e98e276..a5bce2de1 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp +++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp @@ -9,7 +9,7 @@ #include "../../../Minecraft.Client/Level/ServerLevel.h" #include "../../Headers/net.minecraft.world.level.h" #include "../../Level/LevelData.h" -#include "../../../Common/GameRules/LevelGenerationOptions.h" +#include "../../../Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h" #include "../../Headers/net.minecraft.world.level.chunk.storage.h" #ifdef _XBOX diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp index a9a843f7f..5b088f628 100644 --- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp +++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp @@ -10,7 +10,7 @@ #include "../../../Minecraft.Client/Level/ServerLevel.h" #include "../../Headers/net.minecraft.world.level.h" #include "../../Level/LevelData.h" -#include "../../../Common/GameRules/LevelGenerationOptions.h" +#include "../../../Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h" #include "../../Headers/net.minecraft.world.level.chunk.storage.h" #define RESERVE_ALLOCATION MEM_RESERVE diff --git a/Minecraft.World/Level/Dimensions/Dimension.cpp b/Minecraft.World/Level/Dimensions/Dimension.cpp index aef8ee2c6..e9ec5db0d 100644 --- a/Minecraft.World/Level/Dimensions/Dimension.cpp +++ b/Minecraft.World/Level/Dimensions/Dimension.cpp @@ -11,7 +11,7 @@ #include "TheEndDimension.h" #include "../../Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.Client/Minecraft.h" -#include "../../../Common/Colours/ColourTable.h" +#include "../../../Minecraft.Client/Platform/Common/Colours/ColourTable.h" void Dimension::init(Level *level) { diff --git a/Minecraft.World/Level/Dimensions/HellDimension.cpp b/Minecraft.World/Level/Dimensions/HellDimension.cpp index 154af6100..8ad5bea3c 100644 --- a/Minecraft.World/Level/Dimensions/HellDimension.cpp +++ b/Minecraft.World/Level/Dimensions/HellDimension.cpp @@ -6,7 +6,7 @@ #include "../../Headers/net.minecraft.world.level.biome.h" #include "../../Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.Client/Minecraft.h" -#include "../../../Common/Colours/ColourTable.h" +#include "../../../Minecraft.Client/Platform/Common/Colours/ColourTable.h" void HellDimension::init() { diff --git a/Minecraft.World/Level/Dimensions/TheEndDimension.cpp b/Minecraft.World/Level/Dimensions/TheEndDimension.cpp index a3735c3f2..3c726eeec 100644 --- a/Minecraft.World/Level/Dimensions/TheEndDimension.cpp +++ b/Minecraft.World/Level/Dimensions/TheEndDimension.cpp @@ -5,7 +5,7 @@ #include "../../Headers/net.minecraft.world.level.h" #include "../../Headers/net.minecraft.world.level.tile.h" #include "../../../Minecraft.Client/Minecraft.h" -#include "../../../Common/Colours/ColourTable.h" +#include "../../../Minecraft.Client/Platform/Common/Colours/ColourTable.h" void TheEndDimension::init() { diff --git a/Minecraft.World/Level/Level.cpp b/Minecraft.World/Level/Level.cpp index 1e09626ce..c09680f92 100644 --- a/Minecraft.World/Level/Level.cpp +++ b/Minecraft.World/Level/Level.cpp @@ -39,7 +39,7 @@ #include "../../Minecraft.Client/Textures/Textures.h" #include "../../Minecraft.Client/Textures/Packs/TexturePackRepository.h" #include "../../Minecraft.Client/Textures/Packs/DLCTexturePack.h" -#include "../../Common/DLC/DLCPack.h" +#include "../../Minecraft.Client/Platform/Common/DLC/DLCPack.h" #include "../../Minecraft.Client/Platform/PS3/PS3Extras/ShutdownManager.h" diff --git a/Minecraft.World/Network/Packets/SetHealthPacket.cpp b/Minecraft.World/Network/Packets/SetHealthPacket.cpp index 7a311fe51..3d9425302 100644 --- a/Minecraft.World/Network/Packets/SetHealthPacket.cpp +++ b/Minecraft.World/Network/Packets/SetHealthPacket.cpp @@ -3,7 +3,7 @@ #include "../../IO/Streams/InputOutputStream.h" #include "PacketListener.h" #include "SetHealthPacket.h" -#include "../../../Common/Telemetry/TelemetryManager.h" +#include "../../../Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h" SetHealthPacket::SetHealthPacket() diff --git a/Minecraft.World/Platform/stdafx.h b/Minecraft.World/Platform/stdafx.h index 68e088fad..feae2432f 100644 --- a/Minecraft.World/Platform/stdafx.h +++ b/Minecraft.World/Platform/stdafx.h @@ -187,25 +187,25 @@ void MemSect(int sect); #include "../../Minecraft.Client/Platform/Orbis/4JLibs/inc/4J_Input.h" #endif -#include "../../Common/Network/GameNetworkManager.h" +#include "../../Minecraft.Client/Platform/Common/Network/GameNetworkManager.h" // #ifdef _XBOX -#include "../../Common/UI/UIEnums.h" -#include "../../Common/App_Defines.h" -#include "../../Common/App_enums.h" -#include "../../Common/Tutorial/TutorialEnum.h" -#include "../../Common/App_structs.h" +#include "../../Minecraft.Client/Platform/Common/UI/UIEnums.h" +#include "../../Minecraft.Client/Platform/Common/App_Defines.h" +#include "../../Minecraft.Client/Platform/Common/App_enums.h" +#include "../../Minecraft.Client/Platform/Common/Tutorial/TutorialEnum.h" +#include "../../Minecraft.Client/Platform/Common/App_structs.h" //#endif #ifdef _XBOX -#include "../../Common/XUI/XUI_Helper.h" -#include "../../Common/XUI/XUI_Scene_Base.h" +#include "../../Minecraft.Client/Platform/Common/XUI/XUI_Helper.h" +#include "../../Minecraft.Client/Platform/Common/XUI/XUI_Scene_Base.h" #endif -#include "../../Common/Consoles_App.h" -#include "../../Common/Minecraft_Macros.h" -#include "../../Common/Colours/ColourTable.h" +#include "../../Minecraft.Client/Platform/Common/Consoles_App.h" +#include "../../Minecraft.Client/Platform/Common/Minecraft_Macros.h" +#include "../../Minecraft.Client/Platform/Common/Colours/ColourTable.h" -#include "../../Common/BuildVer.h" +#include "../../Minecraft.Client/Platform/Common/BuildVer.h" // This is generated at build time via scripts/pack_loc.py #include "strings.h" @@ -254,10 +254,10 @@ void MemSect(int sect); #include "../../Minecraft.Client/Platform/Orbis/Sentient/MinecraftTelemetry.h" #endif -#include "../../Common/DLC/DLCSkinFile.h" -#include "../../Common/Console_Awards_enum.h" -#include "../../Common/Potion_Macros.h" -#include "../../Common/Console_Debug_enum.h" -#include "../../Common/GameRules/ConsoleGameRulesConstants.h" -#include "../../Common/GameRules/ConsoleGameRules.h" -#include "../../Common/Telemetry/TelemetryManager.h" +#include "../../Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h" +#include "../../Minecraft.Client/Platform/Common/Console_Awards_enum.h" +#include "../../Minecraft.Client/Platform/Common/Potion_Macros.h" +#include "../../Minecraft.Client/Platform/Common/Console_Debug_enum.h" +#include "../../Minecraft.Client/Platform/Common/GameRules/ConsoleGameRulesConstants.h" +#include "../../Minecraft.Client/Platform/Common/GameRules/ConsoleGameRules.h" +#include "../../Minecraft.Client/Platform/Common/Telemetry/TelemetryManager.h" diff --git a/Minecraft.World/Stats/GenericStats.h b/Minecraft.World/Stats/GenericStats.h index 011e6f169..85ba86aa2 100644 --- a/Minecraft.World/Stats/GenericStats.h +++ b/Minecraft.World/Stats/GenericStats.h @@ -5,7 +5,7 @@ //#include "../Util/DamageSource.h" -//#include "../../Common/Console_Awards_enum.h" +//#include "../../Minecraft.Client/Platform/Common/Console_Awards_enum.h" /** 4J-JEV: diff --git a/Minecraft.World/meson.build b/Minecraft.World/meson.build index 6e94c8c7a..1d15515ee 100644 --- a/Minecraft.World/meson.build +++ b/Minecraft.World/meson.build @@ -29,7 +29,7 @@ lib_world = static_library('Minecraft.World', include_directories : include_directories('Platform', 'Platform/x64headers'), dependencies : [ assets_localisation_dep ], cpp_args : global_cpp_args + global_cpp_defs + [ - '-include', meson.current_source_dir() / 'Platform/stdafx.h', + '-include', 'Platform/stdafx.h', ], ) @@ -40,4 +40,4 @@ world_dep = declare_dependency( link_with : lib_world, dependencies : [dep_crypto, dep_zlib], include_directories : include_directories('Platform/x64headers'), -) +) \ No newline at end of file