From 11f9bd60468208701d7fa1f7ee50df2bf8f606be Mon Sep 17 00:00:00 2001 From: MatthewBeshay <92357869+MatthewBeshay@users.noreply.github.com> Date: Thu, 2 Apr 2026 16:09:32 +1100 Subject: [PATCH] refactor: move Minecraft.Client into app --- meson.build | 2 +- .../Common/src/GameRules/ConsoleGameRules.h | 25 --- targets/Minecraft.Client/include/stdafx.h | 21 --- .../Network Implementation Notes.md | 0 targets/{Minecraft.Client => app}/ReadMe.txt | 0 .../Common => app/common}/App_Defines.h | 0 .../Common => app/common}/App_enums.h | 0 .../Common => app/common}/App_structs.h | 14 +- .../Common => app/common}/Consoles_App.cpp | 54 +++---- .../Common => app/common}/Consoles_App.h | 24 +-- .../Common => app/common}/Minecraft_Macros.h | 0 .../Common => app/common}/ShutdownManager.h | 0 .../src/Audio/Consoles_SoundEngine.cpp | 0 .../common}/src/Audio/Consoles_SoundEngine.h | 0 .../common}/src/Audio/SoundEngine.cpp | 25 ++- .../common}/src/Audio/SoundEngine.h | 6 +- .../common}/src/Audio/SoundNames.cpp | 0 .../common}/src/BuildVer/BuildVer.h | 0 .../common}/src/Colours/ColourTable.cpp | 2 +- .../common}/src/Colours/ColourTable.h | 2 +- .../common}/src/ConsoleGameMode.cpp | 4 +- .../common}/src/ConsoleGameMode.h | 2 +- .../common}/src/Console_Awards_enum.h | 0 .../common}/src/Console_Debug_enum.h | 0 .../common}/src/DLC/DLCAudioFile.cpp | 10 +- .../common}/src/DLC/DLCAudioFile.h | 0 .../common}/src/DLC/DLCCapeFile.cpp | 4 +- .../common}/src/DLC/DLCCapeFile.h | 0 .../common}/src/DLC/DLCColourTableFile.cpp | 6 +- .../common}/src/DLC/DLCColourTableFile.h | 0 .../Common => app/common}/src/DLC/DLCFile.cpp | 4 +- .../Common => app/common}/src/DLC/DLCFile.h | 0 .../common}/src/DLC/DLCGameRules.h | 2 +- .../common}/src/DLC/DLCGameRulesFile.cpp | 2 +- .../common}/src/DLC/DLCGameRulesFile.h | 0 .../common}/src/DLC/DLCGameRulesHeader.cpp | 6 +- .../common}/src/DLC/DLCGameRulesHeader.h | 2 +- .../common}/src/DLC/DLCLocalisationFile.cpp | 4 +- .../common}/src/DLC/DLCLocalisationFile.h | 0 .../common}/src/DLC/DLCManager.cpp | 6 +- .../common}/src/DLC/DLCManager.h | 0 .../Common => app/common}/src/DLC/DLCPack.cpp | 14 +- .../Common => app/common}/src/DLC/DLCPack.h | 2 +- .../common}/src/DLC/DLCSkinFile.cpp | 8 +- .../common}/src/DLC/DLCSkinFile.h | 4 +- .../common}/src/DLC/DLCTextureFile.cpp | 2 +- .../common}/src/DLC/DLCTextureFile.h | 2 +- .../common}/src/DLC/DLCUIDataFile.cpp | 4 +- .../common}/src/DLC/DLCUIDataFile.h | 0 .../common/src/GameRules/ConsoleGameRules.h | 25 +++ .../src/GameRules/ConsoleGameRulesConstants.h | 0 .../common}/src/GameRules/GameRuleManager.cpp | 26 +-- .../common}/src/GameRules/GameRuleManager.h | 8 +- .../ApplySchematicRuleDefinition.cpp | 6 +- .../ApplySchematicRuleDefinition.h | 4 +- .../LevelGeneration/BiomeOverride.cpp | 6 +- .../GameRules/LevelGeneration/BiomeOverride.h | 4 +- .../ConsoleGenerateStructure.cpp | 16 +- .../ConsoleGenerateStructure.h | 4 +- .../ConsoleGenerateStructureAction.h | 2 +- .../LevelGeneration/ConsoleSchematicFile.cpp | 4 +- .../LevelGeneration/ConsoleSchematicFile.h | 2 +- .../LevelGenerationOptions.cpp | 28 ++-- .../LevelGeneration/LevelGenerationOptions.h | 8 +- .../LevelGeneration/LevelGenerators.cpp | 0 .../LevelGeneration/LevelGenerators.h | 0 .../LevelGeneration/StartFeature.cpp | 6 +- .../GameRules/LevelGeneration/StartFeature.h | 4 +- .../XboxStructureActionGenerateBox.cpp | 8 +- .../XboxStructureActionGenerateBox.h | 4 +- .../XboxStructureActionPlaceBlock.cpp | 8 +- .../XboxStructureActionPlaceBlock.h | 4 +- .../XboxStructureActionPlaceContainer.cpp | 8 +- .../XboxStructureActionPlaceContainer.h | 2 +- .../XboxStructureActionPlaceSpawner.cpp | 4 +- .../XboxStructureActionPlaceSpawner.h | 2 +- .../src/GameRules/LevelRules/LevelRules.cpp | 0 .../src/GameRules/LevelRules/LevelRules.h | 0 .../AddEnchantmentRuleDefinition.cpp | 6 +- .../AddEnchantmentRuleDefinition.h | 2 +- .../RuleDefinitions/AddItemRuleDefinition.cpp | 4 +- .../RuleDefinitions/AddItemRuleDefinition.h | 2 +- .../CollectItemRuleDefinition.cpp | 10 +- .../CollectItemRuleDefinition.h | 4 +- .../CompleteAllRuleDefinition.cpp | 8 +- .../CompleteAllRuleDefinition.h | 2 +- .../CompoundGameRuleDefinition.cpp | 16 +- .../CompoundGameRuleDefinition.h | 4 +- .../RuleDefinitions/GameRuleDefinition.cpp | 14 +- .../RuleDefinitions/GameRuleDefinition.h | 4 +- .../RuleDefinitions/LevelRuleset.cpp | 8 +- .../LevelRules/RuleDefinitions/LevelRuleset.h | 2 +- .../NamedAreaRuleDefinition.cpp | 6 +- .../RuleDefinitions/NamedAreaRuleDefinition.h | 2 +- .../UpdatePlayerRuleDefinition.cpp | 8 +- .../UpdatePlayerRuleDefinition.h | 2 +- .../RuleDefinitions/UseTileRuleDefinition.cpp | 6 +- .../RuleDefinitions/UseTileRuleDefinition.h | 2 +- .../GameRules/LevelRules/Rules/GameRule.cpp | 6 +- .../src/GameRules/LevelRules/Rules/GameRule.h | 0 .../LevelRules/Rules/GameRulesInstance.h | 0 .../common}/src/GameRules/WstringLookup.cpp | 0 .../common}/src/GameRules/WstringLookup.h | 0 .../src/Leaderboards/LeaderboardInterface.cpp | 2 +- .../src/Leaderboards/LeaderboardInterface.h | 0 .../src/Leaderboards/LeaderboardManager.cpp | 2 +- .../src/Leaderboards/LeaderboardManager.h | 0 .../common}/src/Leaderboards/base64.cpp | 0 .../common}/src/Leaderboards/base64.h | 0 .../common}/src/Localisation/StringTable.cpp | 4 +- .../common}/src/Localisation/StringTable.h | 0 .../src/Network/GameNetworkManager.cpp | 24 +-- .../common}/src/Network/GameNetworkManager.h | 2 +- .../src/Network/NetworkPlayerInterface.h | 0 .../common}/src/Network/NetworkPlayerQNet.cpp | 2 +- .../common}/src/Network/NetworkPlayerQNet.h | 0 .../Network/PlatformNetworkManagerInterface.h | 6 +- .../Network/PlatformNetworkManagerStub.cpp | 10 +- .../src/Network/PlatformNetworkManagerStub.h | 6 +- .../common}/src/Network/SessionInfo.h | 2 +- .../common}/src/Network/Socket.cpp | 8 +- .../common}/src/Network/Socket.h | 4 +- .../common}/src/Trial/TrialMode.cpp | 4 +- .../common}/src/Trial/TrialMode.h | 2 +- .../Tutorial/Constraints/AreaConstraint.cpp | 2 +- .../src/Tutorial/Constraints/AreaConstraint.h | 0 .../Constraints/ChangeStateConstraint.cpp | 8 +- .../Constraints/ChangeStateConstraint.h | 2 +- .../Tutorial/Constraints/InputConstraint.cpp | 0 .../Tutorial/Constraints/InputConstraint.h | 0 .../Tutorial/Constraints/TutorialConstraint.h | 0 .../Constraints/TutorialConstraints.h | 0 .../common}/src/Tutorial/FullTutorial.cpp | 42 ++--- .../common}/src/Tutorial/FullTutorial.h | 2 +- .../common}/src/Tutorial/FullTutorialMode.cpp | 4 +- .../common}/src/Tutorial/FullTutorialMode.h | 0 .../common}/src/Tutorial/Hints/AreaHint.cpp | 6 +- .../common}/src/Tutorial/Hints/AreaHint.h | 2 +- .../src/Tutorial/Hints/DiggerItemHint.cpp | 4 +- .../src/Tutorial/Hints/DiggerItemHint.h | 2 +- .../src/Tutorial/Hints/LookAtEntityHint.cpp | 6 +- .../src/Tutorial/Hints/LookAtEntityHint.h | 2 +- .../src/Tutorial/Hints/LookAtTileHint.cpp | 6 +- .../src/Tutorial/Hints/LookAtTileHint.h | 2 +- .../src/Tutorial/Hints/TakeItemHint.cpp | 6 +- .../common}/src/Tutorial/Hints/TakeItemHint.h | 2 +- .../src/Tutorial/Hints/TutorialHint.cpp | 4 +- .../common}/src/Tutorial/Hints/TutorialHint.h | 2 +- .../src/Tutorial/Hints/TutorialHints.h | 0 .../common}/src/Tutorial/Tasks/AreaTask.cpp | 8 +- .../common}/src/Tutorial/Tasks/AreaTask.h | 2 +- .../common}/src/Tutorial/Tasks/ChoiceTask.cpp | 10 +- .../common}/src/Tutorial/Tasks/ChoiceTask.h | 2 +- .../Tutorial/Tasks/CompleteUsingItemTask.cpp | 2 +- .../Tutorial/Tasks/CompleteUsingItemTask.h | 0 .../src/Tutorial/Tasks/ControllerTask.cpp | 8 +- .../src/Tutorial/Tasks/ControllerTask.h | 0 .../common}/src/Tutorial/Tasks/CraftTask.cpp | 2 +- .../common}/src/Tutorial/Tasks/CraftTask.h | 0 .../src/Tutorial/Tasks/EffectChangedTask.cpp | 2 +- .../src/Tutorial/Tasks/EffectChangedTask.h | 0 .../Tutorial/Tasks/FullTutorialActiveTask.cpp | 6 +- .../Tutorial/Tasks/FullTutorialActiveTask.h | 2 +- .../src/Tutorial/Tasks/HorseChoiceTask.cpp | 4 +- .../src/Tutorial/Tasks/HorseChoiceTask.h | 2 +- .../common}/src/Tutorial/Tasks/InfoTask.cpp | 8 +- .../common}/src/Tutorial/Tasks/InfoTask.h | 0 .../common}/src/Tutorial/Tasks/PickupTask.cpp | 0 .../common}/src/Tutorial/Tasks/PickupTask.h | 0 .../Tutorial/Tasks/ProcedureCompoundTask.cpp | 4 +- .../Tutorial/Tasks/ProcedureCompoundTask.h | 2 +- .../src/Tutorial/Tasks/ProgressFlagTask.cpp | 0 .../src/Tutorial/Tasks/ProgressFlagTask.h | 4 +- .../src/Tutorial/Tasks/RideEntityTask.cpp | 2 +- .../src/Tutorial/Tasks/RideEntityTask.h | 0 .../common}/src/Tutorial/Tasks/StatTask.cpp | 2 +- .../common}/src/Tutorial/Tasks/StatTask.h | 0 .../src/Tutorial/Tasks/StateChangeTask.h | 2 +- .../src/Tutorial/Tasks/TutorialTask.cpp | 4 +- .../common}/src/Tutorial/Tasks/TutorialTask.h | 2 +- .../src/Tutorial/Tasks/TutorialTasks.h | 0 .../src/Tutorial/Tasks/UseItemTask.cpp | 2 +- .../common}/src/Tutorial/Tasks/UseItemTask.h | 0 .../src/Tutorial/Tasks/UseTileTask.cpp | 2 +- .../common}/src/Tutorial/Tasks/UseTileTask.h | 0 .../src/Tutorial/Tasks/XuiCraftingTask.cpp | 4 +- .../src/Tutorial/Tasks/XuiCraftingTask.h | 0 .../common}/src/Tutorial/Tutorial.cpp | 32 ++-- .../common}/src/Tutorial/Tutorial.h | 8 +- .../common}/src/Tutorial/TutorialEnum.h | 0 .../common}/src/Tutorial/TutorialMessage.cpp | 2 +- .../common}/src/Tutorial/TutorialMessage.h | 0 .../common}/src/Tutorial/TutorialMode.cpp | 2 +- .../common}/src/Tutorial/TutorialMode.h | 0 .../src/UI/All Platforms/ArchiveFile.cpp | 4 +- .../src/UI/All Platforms/ArchiveFile.h | 0 .../src/UI/All Platforms/IUIController.h | 0 .../IUIScene_AbstractContainerMenu.cpp | 12 +- .../IUIScene_AbstractContainerMenu.h | 4 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 4 +- .../src/UI/All Platforms/IUIScene_AnvilMenu.h | 0 .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 6 +- .../UI/All Platforms/IUIScene_BeaconMenu.h | 0 .../UI/All Platforms/IUIScene_BrewingMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_BrewingMenu.h | 0 .../IUIScene_CommandBlockMenu.cpp | 0 .../All Platforms/IUIScene_CommandBlockMenu.h | 0 .../All Platforms/IUIScene_ContainerMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_ContainerMenu.h | 0 .../All Platforms/IUIScene_CraftingMenu.cpp | 14 +- .../UI/All Platforms/IUIScene_CraftingMenu.h | 4 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 6 +- .../UI/All Platforms/IUIScene_CreativeMenu.h | 4 +- .../All Platforms/IUIScene_DispenserMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_DispenserMenu.h | 0 .../All Platforms/IUIScene_EnchantingMenu.cpp | 2 +- .../All Platforms/IUIScene_EnchantingMenu.h | 0 .../All Platforms/IUIScene_FireworksMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_FireworksMenu.h | 0 .../UI/All Platforms/IUIScene_FurnaceMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_FurnaceMenu.h | 0 .../src/UI/All Platforms/IUIScene_HUD.cpp | 6 +- .../src/UI/All Platforms/IUIScene_HUD.h | 0 .../UI/All Platforms/IUIScene_HopperMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_HopperMenu.h | 0 .../IUIScene_HorseInventoryMenu.cpp | 2 +- .../IUIScene_HorseInventoryMenu.h | 0 .../All Platforms/IUIScene_InventoryMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_InventoryMenu.h | 0 .../UI/All Platforms/IUIScene_PauseMenu.cpp | 18 +-- .../src/UI/All Platforms/IUIScene_PauseMenu.h | 4 +- .../UI/All Platforms/IUIScene_TradingMenu.cpp | 8 +- .../UI/All Platforms/IUIScene_TradingMenu.h | 4 +- .../common}/src/UI/All Platforms/UIEnums.h | 0 .../common}/src/UI/All Platforms/UIStructs.h | 2 +- .../src/UI/Components/UIComponent_Chat.cpp | 14 +- .../src/UI/Components/UIComponent_Chat.h | 10 +- .../Components/UIComponent_DebugUIConsole.cpp | 4 +- .../Components/UIComponent_DebugUIConsole.h | 6 +- .../UIComponent_DebugUIMarketingGuide.cpp | 6 +- .../UIComponent_DebugUIMarketingGuide.h | 8 +- .../src/UI/Components/UIComponent_Logo.cpp | 4 +- .../src/UI/Components/UIComponent_Logo.h | 4 +- .../Components/UIComponent_MenuBackground.cpp | 10 +- .../Components/UIComponent_MenuBackground.h | 6 +- .../UI/Components/UIComponent_Panorama.cpp | 10 +- .../src/UI/Components/UIComponent_Panorama.h | 8 +- .../UIComponent_PressStartToPlay.cpp | 8 +- .../Components/UIComponent_PressStartToPlay.h | 10 +- .../UI/Components/UIComponent_Tooltips.cpp | 18 +-- .../src/UI/Components/UIComponent_Tooltips.h | 12 +- .../Components/UIComponent_TutorialPopup.cpp | 16 +- .../UI/Components/UIComponent_TutorialPopup.h | 14 +- .../common}/src/UI/Components/UIScene_HUD.cpp | 14 +- .../common}/src/UI/Components/UIScene_HUD.h | 14 +- .../common}/src/UI/Controls/UIControl.cpp | 10 +- .../common}/src/UI/Controls/UIControl.h | 4 +- .../src/UI/Controls/UIControl_Base.cpp | 12 +- .../common}/src/UI/Controls/UIControl_Base.h | 8 +- .../Controls/UIControl_BeaconEffectButton.cpp | 6 +- .../Controls/UIControl_BeaconEffectButton.h | 8 +- .../src/UI/Controls/UIControl_BitmapIcon.cpp | 6 +- .../src/UI/Controls/UIControl_BitmapIcon.h | 8 +- .../src/UI/Controls/UIControl_Button.cpp | 10 +- .../src/UI/Controls/UIControl_Button.h | 10 +- .../src/UI/Controls/UIControl_ButtonList.cpp | 12 +- .../src/UI/Controls/UIControl_ButtonList.h | 10 +- .../src/UI/Controls/UIControl_CheckBox.cpp | 12 +- .../src/UI/Controls/UIControl_CheckBox.h | 10 +- .../src/UI/Controls/UIControl_Cursor.cpp | 6 +- .../src/UI/Controls/UIControl_Cursor.h | 8 +- .../src/UI/Controls/UIControl_DLCList.cpp | 10 +- .../src/UI/Controls/UIControl_DLCList.h | 6 +- .../UI/Controls/UIControl_DynamicLabel.cpp | 10 +- .../src/UI/Controls/UIControl_DynamicLabel.h | 10 +- .../UI/Controls/UIControl_EnchantmentBook.cpp | 6 +- .../UI/Controls/UIControl_EnchantmentBook.h | 8 +- .../Controls/UIControl_EnchantmentButton.cpp | 14 +- .../UI/Controls/UIControl_EnchantmentButton.h | 6 +- .../src/UI/Controls/UIControl_HTMLLabel.cpp | 10 +- .../src/UI/Controls/UIControl_HTMLLabel.h | 12 +- .../src/UI/Controls/UIControl_Label.cpp | 10 +- .../common}/src/UI/Controls/UIControl_Label.h | 10 +- .../UI/Controls/UIControl_LeaderboardList.cpp | 8 +- .../UI/Controls/UIControl_LeaderboardList.h | 8 +- .../UI/Controls/UIControl_MinecraftHorse.cpp | 8 +- .../UI/Controls/UIControl_MinecraftHorse.h | 4 +- .../UI/Controls/UIControl_MinecraftPlayer.cpp | 6 +- .../UI/Controls/UIControl_MinecraftPlayer.h | 4 +- .../src/UI/Controls/UIControl_PlayerList.cpp | 10 +- .../src/UI/Controls/UIControl_PlayerList.h | 6 +- .../Controls/UIControl_PlayerSkinPreview.cpp | 8 +- .../UI/Controls/UIControl_PlayerSkinPreview.h | 4 +- .../src/UI/Controls/UIControl_Progress.cpp | 10 +- .../src/UI/Controls/UIControl_Progress.h | 10 +- .../src/UI/Controls/UIControl_SaveList.cpp | 10 +- .../src/UI/Controls/UIControl_SaveList.h | 6 +- .../src/UI/Controls/UIControl_Slider.cpp | 14 +- .../src/UI/Controls/UIControl_Slider.h | 12 +- .../src/UI/Controls/UIControl_SlotList.cpp | 8 +- .../src/UI/Controls/UIControl_SlotList.h | 8 +- .../Controls/UIControl_SpaceIndicatorBar.cpp | 10 +- .../UI/Controls/UIControl_SpaceIndicatorBar.h | 10 +- .../src/UI/Controls/UIControl_TextInput.cpp | 10 +- .../src/UI/Controls/UIControl_TextInput.h | 10 +- .../UI/Controls/UIControl_TexturePackList.cpp | 12 +- .../UI/Controls/UIControl_TexturePackList.h | 10 +- .../src/UI/Controls/UIControl_Touch.cpp | 6 +- .../common}/src/UI/Controls/UIControl_Touch.h | 8 +- .../Debug/UIScene_DebugCreateSchematic.cpp | 22 +-- .../Debug/UIScene_DebugCreateSchematic.h | 16 +- .../UI/Scenes/Debug/UIScene_DebugOptions.cpp | 10 +- .../UI/Scenes/Debug/UIScene_DebugOptions.h | 8 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 24 +-- .../UI/Scenes/Debug/UIScene_DebugOverlay.h | 14 +- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 22 +-- .../UI/Scenes/Debug/UIScene_DebugSetCamera.h | 16 +- .../IUIScene_StartGame.cpp | 16 +- .../IUIScene_StartGame.h | 14 +- .../UIScene_CreateWorldMenu.cpp | 32 ++-- .../UIScene_CreateWorldMenu.h | 24 +-- .../UIScene_DLCMainMenu.cpp | 14 +- .../UIScene_DLCMainMenu.h | 12 +- .../UIScene_DLCOffersMenu.cpp | 14 +- .../UIScene_DLCOffersMenu.h | 16 +- .../Frontend Menu screens/UIScene_EULA.cpp | 16 +- .../Frontend Menu screens/UIScene_EULA.h | 10 +- .../Frontend Menu screens/UIScene_Intro.cpp | 8 +- .../Frontend Menu screens/UIScene_Intro.h | 6 +- .../UIScene_JoinMenu.cpp | 24 +-- .../Frontend Menu screens/UIScene_JoinMenu.h | 12 +- .../UIScene_LaunchMoreOptionsMenu.cpp | 22 +-- .../UIScene_LaunchMoreOptionsMenu.h | 22 +-- .../UIScene_LeaderboardsMenu.cpp | 20 +-- .../UIScene_LeaderboardsMenu.h | 16 +- .../UIScene_LoadMenu.cpp | 34 ++-- .../Frontend Menu screens/UIScene_LoadMenu.h | 22 +-- .../UIScene_LoadOrJoinMenu.cpp | 26 +-- .../UIScene_LoadOrJoinMenu.h | 14 +- .../UIScene_MainMenu.cpp | 24 +-- .../Frontend Menu screens/UIScene_MainMenu.h | 12 +- .../UIScene_NewUpdateMessage.cpp | 16 +- .../UIScene_NewUpdateMessage.h | 10 +- .../UIScene_SaveMessage.cpp | 14 +- .../UIScene_SaveMessage.h | 12 +- .../UIScene_TrialExitUpsell.cpp | 8 +- .../UIScene_TrialExitUpsell.h | 4 +- .../Help & Options/UIScene_ControlsMenu.cpp | 16 +- .../Help & Options/UIScene_ControlsMenu.h | 16 +- .../Scenes/Help & Options/UIScene_Credits.cpp | 8 +- .../Scenes/Help & Options/UIScene_Credits.h | 10 +- .../UIScene_HelpAndOptionsMenu.cpp | 10 +- .../UIScene_HelpAndOptionsMenu.h | 8 +- .../Help & Options/UIScene_HowToPlay.cpp | 10 +- .../Scenes/Help & Options/UIScene_HowToPlay.h | 10 +- .../Help & Options/UIScene_HowToPlayMenu.cpp | 10 +- .../Help & Options/UIScene_HowToPlayMenu.h | 8 +- .../UIScene_LanguageSelector.cpp | 10 +- .../Help & Options/UIScene_LanguageSelector.h | 18 +-- .../Help & Options/UIScene_ReinstallMenu.cpp | 8 +- .../Help & Options/UIScene_ReinstallMenu.h | 8 +- .../UIScene_SettingsAudioMenu.cpp | 12 +- .../UIScene_SettingsAudioMenu.h | 8 +- .../UIScene_SettingsControlMenu.cpp | 12 +- .../UIScene_SettingsControlMenu.h | 8 +- .../UIScene_SettingsGraphicsMenu.cpp | 16 +- .../UIScene_SettingsGraphicsMenu.h | 10 +- .../Help & Options/UIScene_SettingsMenu.cpp | 10 +- .../Help & Options/UIScene_SettingsMenu.h | 8 +- .../UIScene_SettingsOptionsMenu.cpp | 20 +-- .../UIScene_SettingsOptionsMenu.h | 14 +- .../Help & Options/UIScene_SettingsUIMenu.cpp | 14 +- .../Help & Options/UIScene_SettingsUIMenu.h | 10 +- .../Help & Options/UIScene_SkinSelectMenu.cpp | 24 +-- .../Help & Options/UIScene_SkinSelectMenu.h | 18 +-- .../UIScene_AbstractContainerMenu.cpp | 20 +-- .../UIScene_AbstractContainerMenu.h | 16 +- .../Containers/UIScene_AnvilMenu.cpp | 16 +- .../Containers/UIScene_AnvilMenu.h | 20 +-- .../Containers/UIScene_BeaconMenu.cpp | 16 +- .../Containers/UIScene_BeaconMenu.h | 18 +-- .../Containers/UIScene_BrewingStandMenu.cpp | 18 +-- .../Containers/UIScene_BrewingStandMenu.h | 16 +- .../Containers/UIScene_ContainerMenu.cpp | 16 +- .../Containers/UIScene_ContainerMenu.h | 14 +- .../Containers/UIScene_CreativeMenu.cpp | 26 +-- .../Containers/UIScene_CreativeMenu.h | 16 +- .../Containers/UIScene_DispenserMenu.cpp | 16 +- .../Containers/UIScene_DispenserMenu.h | 14 +- .../Containers/UIScene_EnchantingMenu.cpp | 20 +-- .../Containers/UIScene_EnchantingMenu.h | 20 +-- .../Containers/UIScene_FireworksMenu.cpp | 14 +- .../Containers/UIScene_FireworksMenu.h | 16 +- .../Containers/UIScene_FurnaceMenu.cpp | 16 +- .../Containers/UIScene_FurnaceMenu.h | 16 +- .../Containers/UIScene_HopperMenu.cpp | 16 +- .../Containers/UIScene_HopperMenu.h | 14 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 22 +-- .../Containers/UIScene_HorseInventoryMenu.h | 18 +-- .../Containers/UIScene_InventoryMenu.cpp | 16 +- .../Containers/UIScene_InventoryMenu.h | 16 +- .../Containers/UIScene_TradingMenu.cpp | 18 +-- .../Containers/UIScene_TradingMenu.h | 16 +- .../UIScene_CraftingMenu.cpp | 20 +-- .../UIScene_CraftingMenu.h | 16 +- .../UIScene_DeathMenu.cpp | 20 +-- .../In-Game Menu Screens/UIScene_DeathMenu.h | 10 +- .../In-Game Menu Screens/UIScene_EndPoem.cpp | 10 +- .../In-Game Menu Screens/UIScene_EndPoem.h | 8 +- .../UIScene_InGameHostOptionsMenu.cpp | 18 +-- .../UIScene_InGameHostOptionsMenu.h | 10 +- .../UIScene_InGameInfoMenu.cpp | 26 +-- .../UIScene_InGameInfoMenu.h | 14 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 22 +-- .../UIScene_InGamePlayerOptionsMenu.h | 16 +- .../UIScene_InGameSaveManagementMenu.cpp | 0 .../UIScene_InGameSaveManagementMenu.h | 6 +- .../UIScene_PauseMenu.cpp | 24 +-- .../In-Game Menu Screens/UIScene_PauseMenu.h | 10 +- .../UIScene_SignEntryMenu.cpp | 16 +- .../UIScene_SignEntryMenu.h | 12 +- .../UIScene_TeleportMenu.cpp | 20 +-- .../UIScene_TeleportMenu.h | 14 +- .../UI/Scenes/UIScene_ConnectingProgress.cpp | 20 +-- .../UI/Scenes/UIScene_ConnectingProgress.h | 14 +- .../UI/Scenes/UIScene_FullscreenProgress.cpp | 22 +-- .../UI/Scenes/UIScene_FullscreenProgress.h | 16 +- .../src/UI/Scenes/UIScene_Keyboard.cpp | 16 +- .../common}/src/UI/Scenes/UIScene_Keyboard.h | 14 +- .../src/UI/Scenes/UIScene_MessageBox.cpp | 14 +- .../src/UI/Scenes/UIScene_MessageBox.h | 12 +- .../src/UI/Scenes/UIScene_QuadrantSignin.cpp | 12 +- .../src/UI/Scenes/UIScene_QuadrantSignin.h | 14 +- .../common}/src/UI/Scenes/UIScene_Timer.cpp | 4 +- .../common}/src/UI/Scenes/UIScene_Timer.h | 6 +- .../common}/src/UI/UIBitmapFont.cpp | 6 +- .../common}/src/UI/UIBitmapFont.h | 4 +- .../common}/src/UI/UIController.cpp | 52 +++--- .../common}/src/UI/UIController.h | 16 +- .../common}/src/UI/UIFontData.cpp | 2 +- .../Common => app/common}/src/UI/UIFontData.h | 0 .../Common => app/common}/src/UI/UIGroup.cpp | 14 +- .../Common => app/common}/src/UI/UIGroup.h | 4 +- .../Common => app/common}/src/UI/UILayer.cpp | 152 +++++++++--------- .../Common => app/common}/src/UI/UILayer.h | 4 +- .../Common => app/common}/src/UI/UIScene.cpp | 24 +-- .../Common => app/common}/src/UI/UIScene.h | 10 +- .../Common => app/common}/src/UI/UIString.cpp | 4 +- .../Common => app/common}/src/UI/UIString.h | 0 .../common}/src/UI/UITTFFont.cpp | 6 +- .../Common => app/common}/src/UI/UITTFFont.h | 2 +- .../include/BufferedImage.h | 0 .../include/FrameProfiler.h | 0 .../include/MemTexture.h | 0 .../include/MemTextureProcessor.h | 0 .../include/MobSkinMemTextureProcessor.h | 2 +- .../include/NetTypes.h | 0 .../include/SkinBox.h | 0 .../include/XboxStubs.h | 0 targets/app/include/stdafx.h | 21 +++ .../{Minecraft.Client => app}/include/stubs.h | 0 .../Linux => app/linux}/Iggy/gdraw/gdraw.c | 5 +- .../Linux => app/linux}/Iggy/gdraw/gdraw.h | 6 +- .../Linux => app/linux}/Iggy/include/gdraw.h | 0 .../Linux => app/linux}/Iggy/include/iggy.h | 0 .../Linux => app/linux}/Iggy/include/rrCore.h | 0 .../Leaderboards/LinuxLeaderboardManager.cpp | 2 +- .../Leaderboards/LinuxLeaderboardManager.h | 2 +- .../Linux => app/linux}/LinuxGL.cpp | 2 +- .../Linux => app/linux}/LinuxGL.h | 0 .../Linux => app/linux}/Linux_App.cpp | 8 +- .../Linux => app/linux}/Linux_App.h | 4 +- .../Linux => app/linux}/Linux_Minecraft.cpp | 12 +- .../linux}/Linux_ShutdownManager.cpp | 2 +- .../linux}/Linux_UIController.cpp | 12 +- .../Linux => app/linux}/Linux_UIController.h | 8 +- .../Stubs/DirectXMath/DirectXCollision.h | 0 .../Stubs/DirectXMath/DirectXCollision.inl | 0 .../linux}/Stubs/DirectXMath/DirectXColors.h | 0 .../linux}/Stubs/DirectXMath/DirectXMath.h | 0 .../Stubs/DirectXMath/DirectXMathConvert.inl | 0 .../Stubs/DirectXMath/DirectXMathMatrix.inl | 0 .../Stubs/DirectXMath/DirectXMathMisc.inl | 0 .../Stubs/DirectXMath/DirectXMathVector.inl | 0 .../Stubs/DirectXMath/DirectXPackedVector.h | 0 .../Stubs/DirectXMath/DirectXPackedVector.inl | 0 .../linux}/Stubs/DirectXMath/sal.h | 0 .../Linux => app/linux}/Stubs/LinuxStubs.h | 0 .../Linux => app/linux}/Stubs/d3d11_stubs.h | 2 +- .../Linux => app/linux}/Stubs/iggy_stubs.h | 2 +- .../Linux => app/linux}/Stubs/winapi_stubs.h | 0 .../Linux => app/linux}/Stubs/xbox_stubs.h | 0 .../Linux => app/linux}/linux_game_stubs.cpp | 4 +- targets/{Minecraft.Client => app}/meson.build | 22 ++- .../src/BufferedImage.cpp | 12 +- .../src/Extrax64Stubs.cpp | 6 +- .../src/FrameProfiler.cpp | 0 .../{Minecraft.Client => app}/src/stubs.cpp | 4 +- .../Iggy/gdraw/gdraw_d3d10_shaders.inl | 0 .../windows}/Iggy/gdraw/gdraw_d3d11.cpp | 0 .../windows}/Iggy/gdraw/gdraw_d3d11.h | 0 .../Iggy/gdraw/gdraw_d3d1x_shared.inl | 0 .../windows}/Iggy/gdraw/gdraw_gl_shaders.inl | 0 .../windows}/Iggy/gdraw/gdraw_gl_shared.inl | 0 .../windows}/Iggy/gdraw/gdraw_shared.inl | 0 .../windows}/Iggy/include/gdraw.h | 0 .../windows}/Iggy/include/iggy.h | 0 .../windows}/Iggy/include/iggyexpruntime.h | 0 .../windows}/Iggy/include/iggyperfmon.h | 0 .../windows}/Iggy/include/rrCore.h | 0 .../WindowsLeaderboardManager.cpp | 0 .../Leaderboards/WindowsLeaderboardManager.h | 2 +- .../Source Files/Windows64_Minecraft.cpp | 4 +- .../windows}/Windows64_App.cpp | 2 +- .../Windows64 => app/windows}/Windows64_App.h | 0 .../windows}/Windows64_UIController.cpp | 0 .../windows}/Windows64_UIController.h | 2 +- .../windows}/XML/ATGXmlParser.cpp | 0 .../windows}/XML/ATGXmlParser.h | 0 .../windows}/XML/xmlFilesCallback.h | 0 targets/console_helpers/src/C4JThread.cpp | 2 +- targets/console_helpers/src/compression.cpp | 2 +- targets/minecraft/client/Camera.cpp | 4 +- targets/minecraft/client/ClientConstants.cpp | 2 +- targets/minecraft/client/Lighting.cpp | 2 +- targets/minecraft/client/Minecraft.cpp | 40 ++--- targets/minecraft/client/Options.cpp | 6 +- targets/minecraft/client/gui/ChatScreen.cpp | 2 +- .../client/gui/CreateWorldScreen.cpp | 16 +- targets/minecraft/client/gui/EditBox.cpp | 2 +- targets/minecraft/client/gui/Font.cpp | 2 +- targets/minecraft/client/gui/Gui.cpp | 12 +- targets/minecraft/client/gui/GuiComponent.cpp | 2 +- .../minecraft/client/gui/InBedChatScreen.cpp | 2 +- .../client/gui/JoinMultiplayerScreen.cpp | 2 +- targets/minecraft/client/gui/Minimap.cpp | 6 +- .../minecraft/client/gui/NameEntryScreen.cpp | 2 +- targets/minecraft/client/gui/PauseScreen.cpp | 6 +- .../client/gui/RenameWorldScreen.cpp | 2 +- targets/minecraft/client/gui/Screen.cpp | 10 +- .../client/gui/SelectWorldScreen.cpp | 4 +- .../gui/achievement/AchievementScreen.cpp | 2 +- .../client/gui/achievement/StatsScreen.cpp | 4 +- .../gui/inventory/AbstractContainerScreen.cpp | 4 +- .../gui/inventory/BeaconPowerButton.cpp | 2 +- .../gui/inventory/CreativeInventoryScreen.cpp | 6 +- .../gui/inventory/CreativeInventoryScreen.h | 2 +- .../client/gui/inventory/TextEditScreen.cpp | 2 +- .../client/gui/particle/GuiParticle.cpp | 2 +- .../minecraft/client/model/HumanoidModel.cpp | 2 +- .../minecraft/client/model/HumanoidModel.h | 2 +- targets/minecraft/client/model/geom/Model.h | 2 +- .../minecraft/client/model/geom/ModelPart.h | 2 +- .../client/multiplayer/ClientConnection.cpp | 40 ++--- .../multiplayer/MultiPlayerChunkCache.cpp | 4 +- .../multiplayer/MultiPlayerGameMode.cpp | 2 +- .../client/multiplayer/MultiPlayerLevel.cpp | 8 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 8 +- .../client/particle/DragonBreathParticle.cpp | 4 +- .../client/particle/DripParticle.cpp | 4 +- .../particle/EnchantmentTableParticle.cpp | 4 +- .../client/particle/EnderParticle.cpp | 4 +- .../client/particle/ExplodeParticle.cpp | 4 +- .../client/particle/HugeExplosionParticle.cpp | 4 +- .../client/particle/NetherPortalParticle.cpp | 4 +- .../client/particle/NoteParticle.cpp | 4 +- .../minecraft/client/particle/Particle.cpp | 2 +- .../client/particle/SmokeParticle.cpp | 4 +- .../client/particle/SuspendedParticle.cpp | 4 +- targets/minecraft/client/player/Input.cpp | 4 +- .../minecraft/client/player/LocalPlayer.cpp | 18 +-- .../minecraft/client/player/RemotePlayer.cpp | 2 +- targets/minecraft/client/renderer/Chunk.cpp | 4 +- .../client/renderer/GameRenderer.cpp | 16 +- .../minecraft/client/renderer/GameRenderer.h | 2 +- .../client/renderer/ItemInHandRenderer.cpp | 6 +- .../client/renderer/LevelRenderer.cpp | 16 +- .../minecraft/client/renderer/LevelRenderer.h | 6 +- .../minecraft/client/renderer/MemTexture.cpp | 4 +- .../renderer/MobSkinMemTextureProcessor.cpp | 6 +- .../renderer/MobSkinTextureProcessor.cpp | 4 +- .../minecraft/client/renderer/Tesselator.cpp | 4 +- .../minecraft/client/renderer/Textures.cpp | 10 +- .../client/renderer/TileRenderer.cpp | 6 +- .../entity/EntityRenderDispatcher.cpp | 2 +- .../renderer/entity/LivingEntityRenderer.cpp | 4 +- .../client/renderer/entity/MobRenderer.cpp | 4 +- .../client/renderer/entity/PlayerRenderer.cpp | 4 +- .../client/renderer/entity/PlayerRenderer.h | 6 +- .../texture/PreStitchedTextureMap.cpp | 6 +- .../client/renderer/texture/Stitcher.cpp | 4 +- .../client/renderer/texture/Texture.cpp | 4 +- .../renderer/texture/TextureManager.cpp | 4 +- .../client/renderer/texture/TextureMap.cpp | 6 +- .../renderer/tileentity/SignRenderer.cpp | 8 +- .../client/skins/AbstractTexturePack.cpp | 10 +- .../minecraft/client/skins/DLCTexturePack.cpp | 44 ++--- .../minecraft/client/skins/DLCTexturePack.h | 2 +- .../client/skins/DefaultTexturePack.h | 4 +- .../minecraft/client/skins/TexturePack.cpp | 2 +- targets/minecraft/client/skins/TexturePack.h | 2 +- .../client/skins/TexturePackRepository.cpp | 10 +- .../minecraft/client/title/TitleScreen.cpp | 6 +- .../minecraft/commands/CommandDispatcher.cpp | 2 +- .../minecraft/core/ItemDispenseBehaviors.cpp | 4 +- targets/minecraft/network/Connection.cpp | 8 +- targets/minecraft/network/Connection.h | 4 +- .../packet/BlockRegionUpdatePacket.cpp | 2 +- .../network/packet/CustomPayloadPacket.cpp | 4 +- .../network/packet/GameCommandPacket.cpp | 4 +- .../minecraft/network/packet/LoginPacket.cpp | 2 +- .../network/packet/MoveEntityPacket.cpp | 2 +- .../network/packet/MoveEntityPacketSmall.cpp | 2 +- targets/minecraft/network/packet/Packet.cpp | 4 +- .../network/packet/PlayerInfoPacket.cpp | 2 +- .../network/packet/PreLoginPacket.cpp | 6 +- .../network/packet/RespawnPacket.cpp | 2 +- .../network/packet/SetPlayerTeamPacket.cpp | 4 +- .../packet/TextureAndGeometryChangePacket.cpp | 2 +- .../packet/TextureAndGeometryPacket.cpp | 4 +- .../network/packet/TextureAndGeometryPacket.h | 2 +- .../packet/UpdateGameRuleProgressPacket.h | 2 +- targets/minecraft/server/MinecraftServer.cpp | 22 +-- targets/minecraft/server/PlayerList.cpp | 24 +-- .../minecraft/server/level/EntityTracker.cpp | 4 +- .../minecraft/server/level/PlayerChunkMap.cpp | 6 +- .../server/level/ServerChunkCache.cpp | 4 +- .../minecraft/server/level/ServerLevel.cpp | 12 +- .../server/level/ServerLevelListener.cpp | 2 +- .../minecraft/server/level/ServerPlayer.cpp | 10 +- .../server/level/ServerPlayerGameMode.cpp | 2 +- .../minecraft/server/level/TrackedEntity.cpp | 4 +- .../server/network/PendingConnection.cpp | 12 +- .../server/network/PlayerConnection.cpp | 18 +-- .../server/network/ServerConnection.cpp | 2 +- targets/minecraft/stats/Achievements.cpp | 2 +- targets/minecraft/stats/CommonStats.h | 2 +- targets/minecraft/stats/GenericStats.h | 4 +- targets/minecraft/stats/Stat.h | 2 +- targets/minecraft/stats/StatsCounter.cpp | 6 +- targets/minecraft/stdafx.h | 4 +- targets/minecraft/util/HtmlString.cpp | 2 +- targets/minecraft/util/HtmlString.h | 2 +- targets/minecraft/util/WeighedRandom.cpp | 2 +- targets/minecraft/world/CompoundContainer.cpp | 2 +- targets/minecraft/world/SimpleContainer.cpp | 2 +- .../world/effect/AbsoptionMobEffect.h | 2 +- .../world/effect/AttackDamageMobEffect.h | 2 +- .../world/effect/HealthBoostMobEffect.h | 2 +- .../world/effect/InstantaneousMobEffect.cpp | 2 +- .../world/effect/InstantaneousMobEffect.h | 2 +- targets/minecraft/world/effect/MobEffect.cpp | 2 +- targets/minecraft/world/effect/MobEffect.h | 2 +- .../world/effect/MobEffectInstance.cpp | 2 +- targets/minecraft/world/entity/Entity.cpp | 6 +- targets/minecraft/world/entity/EntityIO.cpp | 2 +- targets/minecraft/world/entity/EntityIO.h | 4 +- .../minecraft/world/entity/LivingEntity.cpp | 2 +- targets/minecraft/world/entity/Painting.cpp | 2 +- .../world/entity/SyncedEntityData.cpp | 2 +- .../ai/attributes/AttributeModifier.cpp | 4 +- .../world/entity/animal/EntityHorse.cpp | 2 +- .../minecraft/world/entity/animal/Ocelot.cpp | 2 +- .../entity/boss/enderdragon/EnderDragon.h | 2 +- .../world/entity/boss/wither/WitherBoss.h | 2 +- .../world/entity/item/ItemEntity.cpp | 2 +- .../world/entity/item/MinecartContainer.cpp | 2 +- .../world/entity/monster/EnderMan.cpp | 2 +- .../world/entity/monster/Monster.cpp | 2 +- .../world/entity/monster/PigZombie.cpp | 2 +- .../monster/SharedMonsterAttributes.cpp | 2 +- .../world/entity/monster/Silverfish.cpp | 2 +- .../minecraft/world/entity/monster/Spider.cpp | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 2 +- .../world/entity/player/Inventory.cpp | 2 +- .../minecraft/world/entity/player/Player.cpp | 12 +- .../world/entity/projectile/Arrow.cpp | 2 +- .../world/entity/projectile/Fireball.cpp | 2 +- .../minecraft/world/inventory/AnvilMenu.cpp | 2 +- targets/minecraft/world/item/ArmorItem.cpp | 4 +- targets/minecraft/world/item/ArmorItem.h | 2 +- targets/minecraft/world/item/BucketItem.cpp | 2 +- targets/minecraft/world/item/EnderEyeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 2 +- .../minecraft/world/item/FireworksItem.cpp | 2 +- .../world/item/HangingEntityItem.cpp | 4 +- targets/minecraft/world/item/Item.cpp | 2 +- .../minecraft/world/item/PlanterTileItem.cpp | 4 +- targets/minecraft/world/item/PotionItem.cpp | 4 +- targets/minecraft/world/item/Rarity.h | 2 +- .../minecraft/world/item/RecordingItem.cpp | 2 +- targets/minecraft/world/item/SpawnEggItem.cpp | 4 +- targets/minecraft/world/item/TileItem.cpp | 4 +- .../world/item/alchemy/PotionBrewing.cpp | 4 +- .../minecraft/world/item/crafting/Recipes.cpp | 2 +- .../world/item/crafting/ShapedRecipy.cpp | 2 +- .../world/item/enchantment/Enchantment.cpp | 4 +- targets/minecraft/world/level/Explosion.cpp | 2 +- .../minecraft/world/level/FoliageColor.cpp | 4 +- targets/minecraft/world/level/GameRules.cpp | 4 +- targets/minecraft/world/level/Level.cpp | 14 +- .../minecraft/world/level/PortalForcer.cpp | 2 +- targets/minecraft/world/level/biome/Biome.cpp | 4 +- targets/minecraft/world/level/biome/Biome.h | 2 +- .../world/level/biome/BiomeCache.cpp | 2 +- .../world/level/biome/BiomeDecorator.cpp | 4 +- .../world/level/biome/BiomeSource.cpp | 4 +- .../level/chunk/CompressedTileStorage.cpp | 4 +- .../world/level/chunk/LevelChunk.cpp | 4 +- .../world/level/chunk/SparseDataStorage.cpp | 4 +- .../world/level/chunk/SparseLightStorage.cpp | 4 +- .../storage/ChunkStorageProfileDecorator.cpp | 2 +- .../chunk/storage/McRegionChunkStorage.cpp | 4 +- .../level/chunk/storage/OldChunkStorage.cpp | 4 +- .../world/level/chunk/storage/RegionFile.cpp | 2 +- .../world/level/dimension/Dimension.cpp | 8 +- .../world/level/dimension/HellDimension.cpp | 8 +- .../world/level/dimension/TheEndDimension.cpp | 4 +- .../world/level/levelgen/CanyonFeature.cpp | 4 +- .../level/levelgen/CustomLevelSource.cpp | 6 +- .../world/level/levelgen/FlatLevelSource.cpp | 2 +- .../level/levelgen/HellFlatLevelSource.cpp | 2 +- .../level/levelgen/HellRandomLevelSource.cpp | 2 +- .../level/levelgen/RandomLevelSource.cpp | 4 +- .../levelgen/TheEndLevelRandomLevelSource.cpp | 2 +- .../levelgen/feature/BasicTreeFeature.cpp | 4 +- .../level/levelgen/feature/BirchFeature.cpp | 4 +- .../level/levelgen/feature/CaveFeature.cpp | 4 +- .../level/levelgen/feature/FlowerFeature.cpp | 4 +- .../level/levelgen/feature/LakeFeature.cpp | 4 +- .../levelgen/feature/MegaTreeFeature.cpp | 4 +- .../level/levelgen/feature/OreFeature.cpp | 4 +- .../level/levelgen/feature/PineFeature.cpp | 4 +- .../level/levelgen/feature/ReedsFeature.cpp | 4 +- .../level/levelgen/feature/SandFeature.cpp | 4 +- .../level/levelgen/feature/SpikeFeature.cpp | 2 +- .../level/levelgen/feature/SpringFeature.cpp | 4 +- .../level/levelgen/feature/SpruceFeature.cpp | 4 +- .../levelgen/feature/SwampTreeFeature.cpp | 4 +- .../level/levelgen/feature/TreeFeature.cpp | 4 +- .../levelgen/structure/MineShaftFeature.cpp | 6 +- .../structure/NetherBridgeFeature.cpp | 4 +- .../structure/RandomScatteredLargeFeature.cpp | 4 +- .../structure/ScatteredFeaturePieces.cpp | 4 +- .../levelgen/structure/StrongholdFeature.cpp | 8 +- .../levelgen/structure/StrongholdPieces.cpp | 4 +- .../levelgen/structure/StructureFeatureIO.cpp | 2 +- .../levelgen/structure/VillageFeature.cpp | 6 +- .../world/level/material/MaterialColor.h | 2 +- .../newbiome/layer/BiomeOverrideLayer.cpp | 4 +- .../world/level/newbiome/layer/Layer.cpp | 4 +- .../ConsoleSaveFileConverter.cpp | 2 +- .../ConsoleSaveFileOriginal.cpp | 10 +- .../ConsoleSaveFileSplit.cpp | 10 +- .../storage/ConsoleSaveFileIO/FileHeader.cpp | 4 +- .../level/storage/DirectoryLevelStorage.cpp | 8 +- .../world/level/storage/LevelData.cpp | 6 +- .../level/storage/McRegionLevelStorage.cpp | 2 +- .../world/level/storage/SavedDataStorage.cpp | 2 +- .../minecraft/world/level/tile/FireTile.cpp | 4 +- .../minecraft/world/level/tile/GrassTile.cpp | 4 +- .../minecraft/world/level/tile/LeafTile.cpp | 4 +- .../world/level/tile/NotGateTile.cpp | 2 +- .../world/level/tile/NoteBlockTile.cpp | 2 +- .../world/level/tile/PressurePlateTile.cpp | 2 +- .../world/level/tile/RedStoneDustTile.cpp | 4 +- .../minecraft/world/level/tile/StemTile.cpp | 4 +- .../world/level/tile/StoneMonsterTile.cpp | 2 +- .../world/level/tile/TallGrassPlantTile.cpp | 4 +- targets/minecraft/world/level/tile/Tile.cpp | 2 +- .../minecraft/world/level/tile/TntTile.cpp | 4 +- .../world/level/tile/WaterLilyTile.cpp | 4 +- .../level/tile/entity/BeaconTileEntity.cpp | 2 +- .../tile/entity/BrewingStandTileEntity.cpp | 2 +- .../level/tile/entity/ChestTileEntity.cpp | 2 +- .../level/tile/entity/DispenserTileEntity.cpp | 2 +- .../level/tile/entity/DropperTileEntity.cpp | 2 +- .../entity/EnchantmentTableTileEntity.cpp | 2 +- .../level/tile/entity/FurnaceTileEntity.cpp | 2 +- .../level/tile/entity/HopperTileEntity.cpp | 2 +- .../level/tile/entity/SignTileEntity.cpp | 2 +- .../level/tile/entity/TheEndPortalTile.cpp | 4 +- .../world/level/tile/entity/TileEntity.cpp | 2 +- targets/platform/IPlatformNetwork.h | 2 +- 784 files changed, 2598 insertions(+), 2604 deletions(-) delete mode 100644 targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h delete mode 100644 targets/Minecraft.Client/include/stdafx.h rename targets/{Minecraft.Client => app}/Network Implementation Notes.md (100%) rename targets/{Minecraft.Client => app}/ReadMe.txt (100%) rename targets/{Minecraft.Client/Common => app/common}/App_Defines.h (100%) rename targets/{Minecraft.Client/Common => app/common}/App_enums.h (100%) rename targets/{Minecraft.Client/Common => app/common}/App_structs.h (94%) rename targets/{Minecraft.Client/Common => app/common}/Consoles_App.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/Consoles_App.h (98%) rename targets/{Minecraft.Client/Common => app/common}/Minecraft_Macros.h (100%) rename targets/{Minecraft.Client/Common => app/common}/ShutdownManager.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Audio/Consoles_SoundEngine.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Audio/Consoles_SoundEngine.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Audio/SoundEngine.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Audio/SoundEngine.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Audio/SoundNames.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/BuildVer/BuildVer.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Colours/ColourTable.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/Colours/ColourTable.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/ConsoleGameMode.cpp (70%) rename targets/{Minecraft.Client/Common => app/common}/src/ConsoleGameMode.h (80%) rename targets/{Minecraft.Client/Common => app/common}/src/Console_Awards_enum.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Console_Debug_enum.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCAudioFile.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCAudioFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCCapeFile.cpp (74%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCCapeFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCColourTableFile.cpp (84%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCColourTableFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCFile.cpp (84%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCGameRules.h (67%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCGameRulesFile.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCGameRulesFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCGameRulesHeader.cpp (85%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCGameRulesHeader.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCLocalisationFile.cpp (76%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCLocalisationFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCManager.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCManager.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCPack.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCPack.h (98%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCSkinFile.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCSkinFile.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCTextureFile.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCTextureFile.h (92%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCUIDataFile.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/DLC/DLCUIDataFile.h (100%) create mode 100644 targets/app/common/src/GameRules/ConsoleGameRules.h rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/ConsoleGameRulesConstants.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/GameRuleManager.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/GameRuleManager.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/BiomeOverride.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/BiomeOverride.h (79%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h (65%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/ConsoleSchematicFile.h (98%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/LevelGenerationOptions.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/LevelGenerators.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/LevelGenerators.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StartFeature.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StartFeature.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h (83%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h (91%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/LevelRules.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/LevelRules.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h (89%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h (92%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h (88%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h (91%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp (83%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h (84%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp (80%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h (91%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h (91%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/Rules/GameRule.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/Rules/GameRule.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/LevelRules/Rules/GameRulesInstance.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/WstringLookup.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/GameRules/WstringLookup.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Leaderboards/LeaderboardInterface.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/Leaderboards/LeaderboardInterface.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Leaderboards/LeaderboardManager.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Leaderboards/LeaderboardManager.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Leaderboards/base64.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Leaderboards/base64.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Localisation/StringTable.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/Localisation/StringTable.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/GameNetworkManager.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/GameNetworkManager.h (99%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/NetworkPlayerInterface.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/NetworkPlayerQNet.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/NetworkPlayerQNet.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/PlatformNetworkManagerInterface.h (97%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/PlatformNetworkManagerStub.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/PlatformNetworkManagerStub.h (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/SessionInfo.h (95%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/Socket.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Network/Socket.h (97%) rename targets/{Minecraft.Client/Common => app/common}/src/Trial/TrialMode.cpp (67%) rename targets/{Minecraft.Client/Common => app/common}/src/Trial/TrialMode.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/AreaConstraint.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/AreaConstraint.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/ChangeStateConstraint.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/ChangeStateConstraint.h (95%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/InputConstraint.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/InputConstraint.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/TutorialConstraint.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Constraints/TutorialConstraints.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/FullTutorial.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/FullTutorial.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/FullTutorialMode.cpp (79%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/FullTutorialMode.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/AreaHint.cpp (87%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/AreaHint.h (92%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/DiggerItemHint.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/DiggerItemHint.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/LookAtEntityHint.cpp (79%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/LookAtEntityHint.h (88%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/LookAtTileHint.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/LookAtTileHint.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/TakeItemHint.cpp (86%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/TakeItemHint.h (88%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/TutorialHint.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/TutorialHint.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Hints/TutorialHints.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/AreaTask.cpp (87%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/AreaTask.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ChoiceTask.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ChoiceTask.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/CompleteUsingItemTask.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/CompleteUsingItemTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ControllerTask.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ControllerTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/CraftTask.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/CraftTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/EffectChangedTask.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/EffectChangedTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/FullTutorialActiveTask.cpp (75%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/FullTutorialActiveTask.h (88%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/HorseChoiceTask.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/HorseChoiceTask.h (91%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/InfoTask.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/InfoTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/PickupTask.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/PickupTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ProcedureCompoundTask.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ProcedureCompoundTask.h (95%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ProgressFlagTask.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/ProgressFlagTask.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/RideEntityTask.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/RideEntityTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/StatTask.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/StatTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/StateChangeTask.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/TutorialTask.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/TutorialTask.h (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/TutorialTasks.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/UseItemTask.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/UseItemTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/UseTileTask.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/UseTileTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/XuiCraftingTask.cpp (83%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tasks/XuiCraftingTask.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tutorial.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/Tutorial.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/TutorialEnum.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/TutorialMessage.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/TutorialMessage.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/TutorialMode.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/Tutorial/TutorialMode.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/ArchiveFile.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/ArchiveFile.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIController.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_AnvilMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_AnvilMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_BeaconMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_BeaconMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_BrewingMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_BrewingMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_CommandBlockMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_ContainerMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_ContainerMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_CraftingMenu.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_CraftingMenu.h (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_CreativeMenu.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_CreativeMenu.h (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_DispenserMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_DispenserMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_EnchantingMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_FireworksMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_FireworksMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_FurnaceMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_HUD.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_HUD.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_HopperMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_HopperMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_InventoryMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_InventoryMenu.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_PauseMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_PauseMenu.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_TradingMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/IUIScene_TradingMenu.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/UIEnums.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/All Platforms/UIStructs.h (99%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Chat.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Chat.h (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_DebugUIConsole.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_DebugUIConsole.h (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp (83%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_DebugUIMarketingGuide.h (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Logo.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Logo.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_MenuBackground.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_MenuBackground.h (84%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Panorama.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Panorama.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_PressStartToPlay.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_PressStartToPlay.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Tooltips.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_Tooltips.h (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_TutorialPopup.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIComponent_TutorialPopup.h (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIScene_HUD.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Components/UIScene_HUD.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl.h (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Base.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Base.h (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_BeaconEffectButton.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_BeaconEffectButton.h (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_BitmapIcon.cpp (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_BitmapIcon.h (58%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Button.cpp (85%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Button.h (63%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_ButtonList.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_ButtonList.h (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_CheckBox.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_CheckBox.h (67%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Cursor.cpp (68%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Cursor.h (53%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_DLCList.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_DLCList.h (74%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_DynamicLabel.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_DynamicLabel.h (67%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_EnchantmentBook.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_EnchantmentBook.h (73%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_EnchantmentButton.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_EnchantmentButton.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_HTMLLabel.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_HTMLLabel.h (64%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Label.cpp (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Label.h (59%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_LeaderboardList.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_LeaderboardList.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_MinecraftHorse.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_MinecraftHorse.h (67%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_MinecraftPlayer.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_MinecraftPlayer.h (67%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_PlayerList.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_PlayerList.h (75%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_PlayerSkinPreview.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_PlayerSkinPreview.h (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Progress.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Progress.h (66%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_SaveList.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_SaveList.h (84%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Slider.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Slider.h (72%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_SlotList.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_SlotList.h (75%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_SpaceIndicatorBar.h (75%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_TextInput.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_TextInput.h (63%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_TexturePackList.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_TexturePackList.h (72%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Touch.cpp (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Controls/UIControl_Touch.h (58%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugOptions.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugOverlay.h (83%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp (88%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h (79%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h (79%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h (79%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h (77%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h (84%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h (88%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp (89%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h (77%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_Credits.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_Credits.h (85%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h (85%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h (83%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h (84%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h (83%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h (76%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h (85%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h (75%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h (74%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h (76%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp (91%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h (75%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h (77%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h (85%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h (76%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h (81%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h (82%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h (86%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp (94%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h (78%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_ConnectingProgress.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_ConnectingProgress.h (77%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_FullscreenProgress.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_FullscreenProgress.h (79%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_Keyboard.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_Keyboard.h (87%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_MessageBox.cpp (92%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_MessageBox.h (83%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_QuadrantSignin.cpp (95%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_QuadrantSignin.h (90%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_Timer.cpp (85%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/Scenes/UIScene_Timer.h (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIBitmapFont.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIBitmapFont.h (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIController.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIController.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIFontData.cpp (99%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIFontData.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIGroup.cpp (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIGroup.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UILayer.cpp (80%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UILayer.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIScene.cpp (98%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIScene.h (96%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIString.cpp (97%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UIString.h (100%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UITTFFont.cpp (93%) rename targets/{Minecraft.Client/Common => app/common}/src/UI/UITTFFont.h (85%) rename targets/{Minecraft.Client => app}/include/BufferedImage.h (100%) rename targets/{Minecraft.Client => app}/include/FrameProfiler.h (100%) rename targets/{Minecraft.Client => app}/include/MemTexture.h (100%) rename targets/{Minecraft.Client => app}/include/MemTextureProcessor.h (100%) rename targets/{Minecraft.Client => app}/include/MobSkinMemTextureProcessor.h (86%) rename targets/{Minecraft.Client => app}/include/NetTypes.h (100%) rename targets/{Minecraft.Client => app}/include/SkinBox.h (100%) rename targets/{Minecraft.Client => app}/include/XboxStubs.h (100%) create mode 100644 targets/app/include/stdafx.h rename targets/{Minecraft.Client => app}/include/stubs.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Iggy/gdraw/gdraw.c (99%) rename targets/{Minecraft.Client/Linux => app/linux}/Iggy/gdraw/gdraw.h (92%) rename targets/{Minecraft.Client/Linux => app/linux}/Iggy/include/gdraw.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Iggy/include/iggy.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Iggy/include/rrCore.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Leaderboards/LinuxLeaderboardManager.cpp (74%) rename targets/{Minecraft.Client/Linux => app/linux}/Leaderboards/LinuxLeaderboardManager.h (95%) rename targets/{Minecraft.Client/Linux => app/linux}/LinuxGL.cpp (99%) rename targets/{Minecraft.Client/Linux => app/linux}/LinuxGL.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Linux_App.cpp (95%) rename targets/{Minecraft.Client/Linux => app/linux}/Linux_App.h (93%) rename targets/{Minecraft.Client/Linux => app/linux}/Linux_Minecraft.cpp (99%) rename targets/{Minecraft.Client/Linux => app/linux}/Linux_ShutdownManager.cpp (92%) rename targets/{Minecraft.Client/Linux => app/linux}/Linux_UIController.cpp (91%) rename targets/{Minecraft.Client/Linux => app/linux}/Linux_UIController.h (79%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXCollision.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXCollision.inl (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXColors.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXMath.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXMathConvert.inl (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXMathMatrix.inl (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXMathMisc.inl (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXMathVector.inl (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXPackedVector.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/DirectXPackedVector.inl (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/DirectXMath/sal.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/LinuxStubs.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/d3d11_stubs.h (96%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/iggy_stubs.h (99%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/winapi_stubs.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/Stubs/xbox_stubs.h (100%) rename targets/{Minecraft.Client/Linux => app/linux}/linux_game_stubs.cpp (57%) rename targets/{Minecraft.Client => app}/meson.build (74%) rename targets/{Minecraft.Client => app}/src/BufferedImage.cpp (96%) rename targets/{Minecraft.Client => app}/src/Extrax64Stubs.cpp (97%) rename targets/{Minecraft.Client => app}/src/FrameProfiler.cpp (100%) rename targets/{Minecraft.Client => app}/src/stubs.cpp (93%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_d3d10_shaders.inl (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_d3d11.cpp (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_d3d11.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_d3d1x_shared.inl (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_gl_shaders.inl (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_gl_shared.inl (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/gdraw/gdraw_shared.inl (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/include/gdraw.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/include/iggy.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/include/iggyexpruntime.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/include/iggyperfmon.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Iggy/include/rrCore.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Source Files/Leaderboards/WindowsLeaderboardManager.cpp (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Source Files/Leaderboards/WindowsLeaderboardManager.h (95%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Source Files/Windows64_Minecraft.cpp (99%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Windows64_App.cpp (98%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Windows64_App.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Windows64_UIController.cpp (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/Windows64_UIController.h (95%) rename targets/{Minecraft.Client/Windows64 => app/windows}/XML/ATGXmlParser.cpp (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/XML/ATGXmlParser.h (100%) rename targets/{Minecraft.Client/Windows64 => app/windows}/XML/xmlFilesCallback.h (100%) diff --git a/meson.build b/meson.build index 6fa0bdc03..d6c7a6082 100644 --- a/meson.build +++ b/meson.build @@ -84,5 +84,5 @@ subdir('targets/platform') subdir('targets/resources') subdir('targets/minecraft') -subdir('targets/Minecraft.Client') +subdir('targets/app') diff --git a/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h b/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h deleted file mode 100644 index 268f37adb..000000000 --- a/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once -#include "ConsoleGameRulesConstants.h" -#include "GameRuleManager.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/targets/Minecraft.Client/include/stdafx.h b/targets/Minecraft.Client/include/stdafx.h deleted file mode 100644 index b31881dc2..000000000 --- a/targets/Minecraft.Client/include/stdafx.h +++ /dev/null @@ -1,21 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#ifdef _WINDOWS64 -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h" -#include "Minecraft.Client/Windows64/Iggy/include/iggy.h" -#include "Minecraft.Client/Windows64/Windows64_App.h" -#include "Minecraft.Client/Windows64/Windows64_UIController.h" -#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" -#else -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h" -#endif diff --git a/targets/Minecraft.Client/Network Implementation Notes.md b/targets/app/Network Implementation Notes.md similarity index 100% rename from targets/Minecraft.Client/Network Implementation Notes.md rename to targets/app/Network Implementation Notes.md diff --git a/targets/Minecraft.Client/ReadMe.txt b/targets/app/ReadMe.txt similarity index 100% rename from targets/Minecraft.Client/ReadMe.txt rename to targets/app/ReadMe.txt diff --git a/targets/Minecraft.Client/Common/App_Defines.h b/targets/app/common/App_Defines.h similarity index 100% rename from targets/Minecraft.Client/Common/App_Defines.h rename to targets/app/common/App_Defines.h diff --git a/targets/Minecraft.Client/Common/App_enums.h b/targets/app/common/App_enums.h similarity index 100% rename from targets/Minecraft.Client/Common/App_enums.h rename to targets/app/common/App_enums.h diff --git a/targets/Minecraft.Client/Common/App_structs.h b/targets/app/common/App_structs.h similarity index 94% rename from targets/Minecraft.Client/Common/App_structs.h rename to targets/app/common/App_structs.h index f8fe05f0b..c11531165 100644 --- a/targets/Minecraft.Client/Common/App_structs.h +++ b/targets/app/common/App_structs.h @@ -3,13 +3,13 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" typedef struct { wchar_t* wchFilename; diff --git a/targets/Minecraft.Client/Common/Consoles_App.cpp b/targets/app/common/Consoles_App.cpp similarity index 99% rename from targets/Minecraft.Client/Common/Consoles_App.cpp rename to targets/app/common/Consoles_App.cpp index 8a1edad51..c03be09ab 100644 --- a/targets/Minecraft.Client/Common/Consoles_App.cpp +++ b/targets/app/common/Consoles_App.cpp @@ -1,27 +1,27 @@ -#include "Common/Consoles_App.h" +#include "app/common/Consoles_App.h" #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Common/App_structs.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/App_structs.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Scenes/UIScene_FullscreenProgress.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "SkinBox.h" #include "XboxStubs.h" #include "console_helpers/PathHelper.h" @@ -51,8 +51,8 @@ #include "minecraft/world/level/tile/entity/HopperTileEntity.h" #include "strings.h" #if defined(_WINDOWS64) -#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" -#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" +#include "app/windows/XML/ATGXmlParser.h" +#include "app/windows/XML/xmlFilesCallback.h" #endif #include #include @@ -74,12 +74,12 @@ #include #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/Localisation/StringTable.h" +#include "app/common/src/UI/All Platforms/ArchiveFile.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "Minecraft_Macros.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" @@ -3647,7 +3647,7 @@ void CMinecraftApp::loadMediaArchive() { #if _WINDOWS64 mediapath = L"Common\\Media\\MediaWindows64.arc"; #elif __linux__ - mediapath = L"Minecraft.Client/Common/Media/MediaLinux.arc"; + mediapath = L"app/common/Media/MediaLinux.arc"; #endif if (!mediapath.empty()) { diff --git a/targets/Minecraft.Client/Common/Consoles_App.h b/targets/app/common/Consoles_App.h similarity index 98% rename from targets/Minecraft.Client/Common/Consoles_App.h rename to targets/app/common/Consoles_App.h index 42301a405..d8145afed 100644 --- a/targets/Minecraft.Client/Common/Consoles_App.h +++ b/targets/app/common/Consoles_App.h @@ -8,18 +8,18 @@ // using namespace std; -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/App_structs.h" +#include "app/common/src/Audio/Consoles_SoundEngine.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/Localisation/StringTable.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/UI/All Platforms/ArchiveFile.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" #include "minecraft/network/packet/DisconnectPacket.h" #include "minecraft/world/entity/item/MinecartHopper.h" diff --git a/targets/Minecraft.Client/Common/Minecraft_Macros.h b/targets/app/common/Minecraft_Macros.h similarity index 100% rename from targets/Minecraft.Client/Common/Minecraft_Macros.h rename to targets/app/common/Minecraft_Macros.h diff --git a/targets/Minecraft.Client/Common/ShutdownManager.h b/targets/app/common/ShutdownManager.h similarity index 100% rename from targets/Minecraft.Client/Common/ShutdownManager.h rename to targets/app/common/ShutdownManager.h diff --git a/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp b/targets/app/common/src/Audio/Consoles_SoundEngine.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp rename to targets/app/common/src/Audio/Consoles_SoundEngine.cpp diff --git a/targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h b/targets/app/common/src/Audio/Consoles_SoundEngine.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h rename to targets/app/common/src/Audio/Consoles_SoundEngine.h diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp b/targets/app/common/src/Audio/SoundEngine.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp rename to targets/app/common/src/Audio/SoundEngine.cpp index 88394ca1a..ba71c8281 100644 --- a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.cpp +++ b/targets/app/common/src/Audio/SoundEngine.cpp @@ -12,10 +12,10 @@ #include #include "4J.Common/4J_Compat.h" -#include "Common/App_Defines.h" -#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_Defines.h" +#include "app/common/src/Audio/Consoles_SoundEngine.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" #include "console_helpers/C4JThread.h" #include "console_helpers/PathHelper.h" #include "java/Random.h" @@ -59,8 +59,7 @@ int strcasecmp(const char* a, const char* b) { #undef FALSE #endif #if defined(_WINDOWS64) -#include "Minecraft.Client/Platform/Windows64/Miles/include/imssapi.h" -#include "Minecraft.Client/Windows64/Windows64_App.h" +#include "app/windows/Windows64_App.h" #endif // ASSETS @@ -105,8 +104,8 @@ const char* SoundEngine::m_szStreamFileA[eStream_Max] = {"calm1", "ward", "where_are_we_now"}; #if defined(__linux__) -char SoundEngine::m_szSoundPath[] = {"Minecraft.Client/Common/Sound/"}; -char SoundEngine::m_szMusicPath[] = {"Minecraft.Client/Common/"}; +char SoundEngine::m_szSoundPath[] = {"app/common/Sound/"}; +char SoundEngine::m_szMusicPath[] = {"app/common/"}; char SoundEngine::m_szRedistName[] = {"redist64"}; #endif @@ -187,8 +186,8 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, std::string base = PathHelper::GetExecutableDirA() + "/"; const char* roots[] = { - "Sound/Minecraft/", "Minecraft.Client/Common/Sound/Minecraft/", - "Minecraft.Client/Common/res/TitleUpdate/res/Sound/Minecraft/"}; + "Sound/Minecraft/", "app/common/Sound/Minecraft/", + "app/common/res/TitleUpdate/res/Sound/Minecraft/"}; char finalPath[512] = {0}; bool found = false; @@ -256,8 +255,8 @@ void SoundEngine::playUI(int iSound, float volume, float pitch) { const char* roots[] = { "Sound/Minecraft/UI/", "Sound/Minecraft/", - "Minecraft.Client/Common/Sound/Minecraft/UI/", - "Minecraft.Client/Common/Sound/Minecraft/", + "app/common/Sound/Minecraft/UI/", + "app/common/Sound/Minecraft/", }; char finalPath[512] = {0}; bool found = false; @@ -461,7 +460,7 @@ void SoundEngine::playMusicTick() { bool found = false; m_szStreamName[0] = '\0'; - const char* roots[] = {"Minecraft.Client/Common/music/", + const char* roots[] = {"app/common/music/", "music/", "./"}; for (const char* r : roots) { diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h b/targets/app/common/src/Audio/SoundEngine.h similarity index 96% rename from targets/Minecraft.Client/Common/src/Audio/SoundEngine.h rename to targets/app/common/src/Audio/SoundEngine.h index 754bcba6a..7a401503d 100644 --- a/targets/Minecraft.Client/Common/src/Audio/SoundEngine.h +++ b/targets/app/common/src/Audio/SoundEngine.h @@ -6,9 +6,9 @@ class Random; #include -#include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/App_Defines.h" +#include "app/common/src/Audio/Consoles_SoundEngine.h" +#include "app/linux/Iggy/include/rrCore.h" #include "minecraft/sounds/SoundTypes.h" #include "miniaudio.h" diff --git a/targets/Minecraft.Client/Common/src/Audio/SoundNames.cpp b/targets/app/common/src/Audio/SoundNames.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/Audio/SoundNames.cpp rename to targets/app/common/src/Audio/SoundNames.cpp diff --git a/targets/Minecraft.Client/Common/src/BuildVer/BuildVer.h b/targets/app/common/src/BuildVer/BuildVer.h similarity index 100% rename from targets/Minecraft.Client/Common/src/BuildVer/BuildVer.h rename to targets/app/common/src/BuildVer/BuildVer.h diff --git a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp b/targets/app/common/src/Colours/ColourTable.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp rename to targets/app/common/src/Colours/ColourTable.cpp index 3d259b5e9..9e712200b 100644 --- a/targets/Minecraft.Client/Common/src/Colours/ColourTable.cpp +++ b/targets/app/common/src/Colours/ColourTable.cpp @@ -4,7 +4,7 @@ #include #include -#include "Common/App_enums.h" +#include "app/common/App_enums.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/Colours/ColourTable.h b/targets/app/common/src/Colours/ColourTable.h similarity index 94% rename from targets/Minecraft.Client/Common/src/Colours/ColourTable.h rename to targets/app/common/src/Colours/ColourTable.h index cbc29280a..657ec9140 100644 --- a/targets/Minecraft.Client/Common/src/Colours/ColourTable.h +++ b/targets/app/common/src/Colours/ColourTable.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" class ColourTable { private: diff --git a/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp b/targets/app/common/src/ConsoleGameMode.cpp similarity index 70% rename from targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp rename to targets/app/common/src/ConsoleGameMode.cpp index 125d5ae46..5c6fa6b93 100644 --- a/targets/Minecraft.Client/Common/src/ConsoleGameMode.cpp +++ b/targets/app/common/src/ConsoleGameMode.cpp @@ -1,7 +1,7 @@ #include "ConsoleGameMode.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/Minecraft.Client/Common/src/ConsoleGameMode.h b/targets/app/common/src/ConsoleGameMode.h similarity index 80% rename from targets/Minecraft.Client/Common/src/ConsoleGameMode.h rename to targets/app/common/src/ConsoleGameMode.h index 38d9816f8..ab8a3632e 100644 --- a/targets/Minecraft.Client/Common/src/ConsoleGameMode.h +++ b/targets/app/common/src/ConsoleGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "app/common/src/Tutorial/TutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/Minecraft.Client/Common/src/Console_Awards_enum.h b/targets/app/common/src/Console_Awards_enum.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Console_Awards_enum.h rename to targets/app/common/src/Console_Awards_enum.h diff --git a/targets/Minecraft.Client/Common/src/Console_Debug_enum.h b/targets/app/common/src/Console_Debug_enum.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Console_Debug_enum.h rename to targets/app/common/src/Console_Debug_enum.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp b/targets/app/common/src/DLC/DLCAudioFile.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp rename to targets/app/common/src/DLC/DLCAudioFile.cpp index 4c9c9d6b5..2296bd958 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp +++ b/targets/app/common/src/DLC/DLCAudioFile.cpp @@ -8,12 +8,12 @@ #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/linux/Linux_App.h" +#include "app/include/XboxStubs.h" #if defined(_WINDOWS64) -#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" -#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" +#include "app/windows/XML/ATGXmlParser.h" +#include "app/windows/XML/xmlFilesCallback.h" #endif namespace { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.h b/targets/app/common/src/DLC/DLCAudioFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCAudioFile.h rename to targets/app/common/src/DLC/DLCAudioFile.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp b/targets/app/common/src/DLC/DLCCapeFile.cpp similarity index 74% rename from targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp rename to targets/app/common/src/DLC/DLCCapeFile.cpp index 33e73e83a..ad981e636 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp +++ b/targets/app/common/src/DLC/DLCCapeFile.cpp @@ -1,8 +1,8 @@ #include "DLCCapeFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/linux/Linux_App.h" DLCCapeFile::DLCCapeFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Cape, path) {} diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.h b/targets/app/common/src/DLC/DLCCapeFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCCapeFile.h rename to targets/app/common/src/DLC/DLCCapeFile.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp b/targets/app/common/src/DLC/DLCColourTableFile.cpp similarity index 84% rename from targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp rename to targets/app/common/src/DLC/DLCColourTableFile.cpp index 2c1ebb236..76a76ad87 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp +++ b/targets/app/common/src/DLC/DLCColourTableFile.cpp @@ -1,9 +1,9 @@ #include "DLCColourTableFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.h b/targets/app/common/src/DLC/DLCColourTableFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCColourTableFile.h rename to targets/app/common/src/DLC/DLCColourTableFile.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp b/targets/app/common/src/DLC/DLCFile.cpp similarity index 84% rename from targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp rename to targets/app/common/src/DLC/DLCFile.cpp index c52084f1b..30424e957 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCFile.cpp +++ b/targets/app/common/src/DLC/DLCFile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "app/common/Minecraft_Macros.h" +#include "app/common/src/DLC/DLCManager.h" DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) { m_type = type; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCFile.h b/targets/app/common/src/DLC/DLCFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCFile.h rename to targets/app/common/src/DLC/DLCFile.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRules.h b/targets/app/common/src/DLC/DLCGameRules.h similarity index 67% rename from targets/Minecraft.Client/Common/src/DLC/DLCGameRules.h rename to targets/app/common/src/DLC/DLCGameRules.h index cf1892dee..e1d34f70c 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRules.h +++ b/targets/app/common/src/DLC/DLCGameRules.h @@ -1,7 +1,7 @@ #pragma once #include "DLCFile.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" class DLCGameRules : public DLCFile { public: diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp b/targets/app/common/src/DLC/DLCGameRulesFile.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp rename to targets/app/common/src/DLC/DLCGameRulesFile.cpp index 83c235f9d..d523a9b89 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp +++ b/targets/app/common/src/DLC/DLCGameRulesFile.cpp @@ -1,7 +1,7 @@ #include "DLCGameRulesFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" +#include "app/common/src/DLC/DLCGameRules.h" DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path) : DLCGameRules(DLCManager::e_DLCType_GameRules, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h b/targets/app/common/src/DLC/DLCGameRulesFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h rename to targets/app/common/src/DLC/DLCGameRulesFile.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp b/targets/app/common/src/DLC/DLCGameRulesHeader.cpp similarity index 85% rename from targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp rename to targets/app/common/src/DLC/DLCGameRulesHeader.cpp index 8c7ddec5a..80097bb89 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp +++ b/targets/app/common/src/DLC/DLCGameRulesHeader.cpp @@ -3,9 +3,9 @@ #include #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/DLC/DLCGameRules.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/linux/Linux_App.h" class StringTable; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h b/targets/app/common/src/DLC/DLCGameRulesHeader.h similarity index 94% rename from targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h rename to targets/app/common/src/DLC/DLCGameRulesHeader.h index 7ae26fa9e..9063aa3d0 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h +++ b/targets/app/common/src/DLC/DLCGameRulesHeader.h @@ -4,7 +4,7 @@ #include #include "DLCGameRules.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" class StringTable; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp b/targets/app/common/src/DLC/DLCLocalisationFile.cpp similarity index 76% rename from targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp rename to targets/app/common/src/DLC/DLCLocalisationFile.cpp index 39009c54e..3775c074d 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp +++ b/targets/app/common/src/DLC/DLCLocalisationFile.cpp @@ -1,8 +1,8 @@ #include "DLCLocalisationFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/common/src/Localisation/StringTable.h" DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h b/targets/app/common/src/DLC/DLCLocalisationFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h rename to targets/app/common/src/DLC/DLCLocalisationFile.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/targets/app/common/src/DLC/DLCManager.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp rename to targets/app/common/src/DLC/DLCManager.cpp index 1e4c384de..6f216b25d 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCManager.cpp +++ b/targets/app/common/src/DLC/DLCManager.cpp @@ -17,9 +17,9 @@ #include "platform/sdl2/Storage.h" #include "DLCFile.h" #include "DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCManager.h b/targets/app/common/src/DLC/DLCManager.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCManager.h rename to targets/app/common/src/DLC/DLCManager.h diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp b/targets/app/common/src/DLC/DLCPack.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp rename to targets/app/common/src/DLC/DLCPack.cpp index 472c91434..cf9f848b6 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.cpp +++ b/targets/app/common/src/DLC/DLCPack.cpp @@ -15,13 +15,13 @@ #include "DLCLocalisationFile.h" #include "DLCTextureFile.h" #include "DLCUIDataFile.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/src/Localisation/StringTable.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" DLCPack::DLCPack(const std::wstring& name, std::uint32_t dwLicenseMask) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCPack.h b/targets/app/common/src/DLC/DLCPack.h similarity index 98% rename from targets/Minecraft.Client/Common/src/DLC/DLCPack.h rename to targets/app/common/src/DLC/DLCPack.h index ffb266a61..0b9fdfec0 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCPack.h +++ b/targets/app/common/src/DLC/DLCPack.h @@ -7,7 +7,7 @@ #include "4J.Common/4J_Compat.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" +#include "app/common/src/DLC/DLCSkinFile.h" class DLCFile; class DLCSkinFile; diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp b/targets/app/common/src/DLC/DLCSkinFile.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp rename to targets/app/common/src/DLC/DLCSkinFile.cpp index ca1b2cda0..1b84a495b 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp +++ b/targets/app/common/src/DLC/DLCSkinFile.cpp @@ -5,10 +5,10 @@ #include "platform/sdl2/Render.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/linux/Linux_App.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" DLCSkinFile::DLCSkinFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Skin, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h b/targets/app/common/src/DLC/DLCSkinFile.h similarity index 90% rename from targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h rename to targets/app/common/src/DLC/DLCSkinFile.h index 0027ce59c..350a2da66 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCSkinFile.h +++ b/targets/app/common/src/DLC/DLCSkinFile.h @@ -5,8 +5,8 @@ #include #include "DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/include/SkinBox.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/include/SkinBox.h" #include "minecraft/client/model/HumanoidModel.h" class DLCSkinFile : public DLCFile { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp b/targets/app/common/src/DLC/DLCTextureFile.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp rename to targets/app/common/src/DLC/DLCTextureFile.cpp index 096cd8970..964d497b7 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp +++ b/targets/app/common/src/DLC/DLCTextureFile.cpp @@ -1,7 +1,7 @@ #include "DLCTextureFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" +#include "app/common/src/DLC/DLCFile.h" DLCTextureFile::DLCTextureFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Texture, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h b/targets/app/common/src/DLC/DLCTextureFile.h similarity index 92% rename from targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h rename to targets/app/common/src/DLC/DLCTextureFile.h index b17d3ad9f..71c6b5c11 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCTextureFile.h +++ b/targets/app/common/src/DLC/DLCTextureFile.h @@ -3,7 +3,7 @@ #include #include "DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCManager.h" class DLCTextureFile : public DLCFile { private: diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp b/targets/app/common/src/DLC/DLCUIDataFile.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp rename to targets/app/common/src/DLC/DLCUIDataFile.cpp index 3175d72b6..123ffc9da 100644 --- a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp +++ b/targets/app/common/src/DLC/DLCUIDataFile.cpp @@ -1,8 +1,8 @@ #include "DLCUIDataFile.h" #include "DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/linux/Linux_App.h" DLCUIDataFile::DLCUIDataFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_UIData, path) { diff --git a/targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.h b/targets/app/common/src/DLC/DLCUIDataFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/DLC/DLCUIDataFile.h rename to targets/app/common/src/DLC/DLCUIDataFile.h diff --git a/targets/app/common/src/GameRules/ConsoleGameRules.h b/targets/app/common/src/GameRules/ConsoleGameRules.h new file mode 100644 index 000000000..7a4521fc0 --- /dev/null +++ b/targets/app/common/src/GameRules/ConsoleGameRules.h @@ -0,0 +1,25 @@ +#pragma once +#include "ConsoleGameRulesConstants.h" +#include "GameRuleManager.h" +#include "app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "app/common/src/GameRules/LevelGeneration/BiomeOverride.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/GameRules/LevelGeneration/StartFeature.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h b/targets/app/common/src/GameRules/ConsoleGameRulesConstants.h similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h rename to targets/app/common/src/GameRules/ConsoleGameRulesConstants.h diff --git a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp b/targets/app/common/src/GameRules/GameRuleManager.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp rename to targets/app/common/src/GameRules/GameRuleManager.cpp index 74d2fc7c3..0c6c6781d 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp +++ b/targets/app/common/src/GameRules/GameRuleManager.cpp @@ -7,19 +7,19 @@ #include #include -#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/DLC/DLCGameRulesFile.h" +#include "app/common/src/DLC/DLCGameRulesHeader.h" +#include "app/common/src/DLC/DLCLocalisationFile.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerators.h" +#include "app/common/src/GameRules/LevelRules/LevelRules.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/src/Localisation/StringTable.h" +#include "app/linux/Linux_App.h" #include "console_helpers/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h b/targets/app/common/src/GameRules/GameRuleManager.h similarity index 90% rename from targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h rename to targets/app/common/src/GameRules/GameRuleManager.h index 84affa6b1..63b837550 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/GameRuleManager.h +++ b/targets/app/common/src/GameRules/GameRuleManager.h @@ -7,10 +7,10 @@ #include #include -#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" +#include "app/common/src/DLC/DLCGameRulesHeader.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerators.h" +#include "app/common/src/GameRules/LevelRules/LevelRules.h" class LevelGenerationOptions; class RootGameRulesDefinition; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 27c212cc6..9e880ac13 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -5,9 +5,9 @@ #include "ConsoleSchematicFile.h" #include "LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h similarity index 90% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h rename to targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index f2ca030b6..ddd61f367 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -5,8 +5,8 @@ #include #include "ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp rename to targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp index f259abd06..458309d19 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.cpp @@ -1,8 +1,8 @@ #include "BiomeOverride.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h similarity index 79% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h rename to targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h index 76218f71d..f55cce44a 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h +++ b/targets/app/common/src/GameRules/LevelGeneration/BiomeOverride.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class BiomeOverride : public GameRuleDefinition { private: diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp rename to targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index d093c2ebe..caa601a00 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -4,14 +4,14 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/Direction.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h similarity index 90% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h rename to targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h index 501dc5bb6..207c6d4d0 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -2,8 +2,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "minecraft/world/level/levelgen/structure/StructureFeatureIO.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h similarity index 65% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h rename to targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h index a29672dd2..7e2cf7f14 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class ConsoleGenerateStructureAction : public GameRuleDefinition { public: diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp rename to targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index cb506f5b7..e157bef11 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -8,8 +8,8 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/compression.h" #include "java/Class.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h similarity index 98% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h rename to targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index 6dafad2c8..5f0ad5537 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/targets/app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -13,7 +13,7 @@ #include #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/compression.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp rename to targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index fd254542a..a6d3baa7e 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -10,20 +10,20 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCGameRulesHeader.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "app/common/src/GameRules/LevelGeneration/BiomeOverride.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/src/GameRules/LevelGeneration/StartFeature.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/Localisation/StringTable.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h similarity index 96% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h rename to targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h index 683a68331..f2a39f174 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -8,10 +8,10 @@ #include #include -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/Localisation/StringTable.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" class ApplySchematicRuleDefinition; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp rename to targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.cpp diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h b/targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.h similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h rename to targets/app/common/src/GameRules/LevelGeneration/LevelGenerators.h diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp rename to targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp index 4ff005a41..abc3c2ae1 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.cpp @@ -1,8 +1,8 @@ #include "StartFeature.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.h similarity index 82% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h rename to targets/app/common/src/GameRules/LevelGeneration/StartFeature.h index e2d3ce1a9..c54c671b2 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h +++ b/targets/app/common/src/GameRules/LevelGeneration/StartFeature.h @@ -3,8 +3,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "minecraft/world/level/levelgen/structure/StructureFeature.h" class StartFeature : public GameRuleDefinition { diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 02c9d339c..3b2305602 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -1,9 +1,9 @@ #include "XboxStructureActionGenerateBox.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h similarity index 83% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h index a07939229..2d20f138f 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" class StructurePiece; class Level; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index e0c8b7f01..bd52c5294 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -1,9 +1,9 @@ #include "XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h similarity index 82% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h index 7fdeec035..9d755899b 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" class StructurePiece; class Level; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index ceedea7b2..494a1b045 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -4,10 +4,10 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/world/Container.h" #include "minecraft/world/level/Level.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index 279c95b5e..2c5e2ae1e 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "XboxStructureActionPlaceBlock.h" class AddItemRuleDefinition; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 9404f0485..6596f5fcf 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -4,8 +4,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/structure/BoundingBox.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h similarity index 91% rename from targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h rename to targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h index ed73e5c89..23551dbb7 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h +++ b/targets/app/common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "XboxStructureActionPlaceBlock.h" class StructurePiece; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp b/targets/app/common/src/GameRules/LevelRules/LevelRules.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp rename to targets/app/common/src/GameRules/LevelRules/LevelRules.cpp diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h b/targets/app/common/src/GameRules/LevelRules/LevelRules.h similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h rename to targets/app/common/src/GameRules/LevelRules/LevelRules.h diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index 5e1e22b82..083694c70 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/item/EnchantedBookItem.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h similarity index 89% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h index 01a36db37..e1d3c1edd 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" class ItemInstance; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index 80df735b0..95bbf9a26 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -3,8 +3,8 @@ #include #include "AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/Container.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h similarity index 92% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h index 03138a668..dd21a0414 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" class Container; class AddEnchantmentRuleDefinition; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index 78ee127f6..1df6d61a4 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,10 +1,10 @@ #include "CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/Connection.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h similarity index 88% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index a5f4811a5..8e40a3dcf 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -4,8 +4,8 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" class Pos; class UseTileRuleDefinition; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index 0b9e95d4b..31f8e0295 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -4,10 +4,10 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/network/Connection.h" #include "minecraft/network/packet/UpdateGameRuleProgressPacket.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h similarity index 91% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h index d2166c1f2..de8cef785 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" class GameRule; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp similarity index 83% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index da47bd417..0315ca658 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -7,14 +7,14 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "console_helpers/StringHelpers.h" CompoundGameRuleDefinition::CompoundGameRuleDefinition() { diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h similarity index 84% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h index 320b86ebb..e9423599e 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h @@ -3,8 +3,8 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" class CompoundGameRuleDefinition : public GameRuleDefinition { protected: diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 9625e0858..9b2695642 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include #include @@ -8,12 +8,12 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h similarity index 94% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index d620162f0..179336f75 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -6,8 +6,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "minecraft/world/item/ItemInstance.h" class GameRule; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp similarity index 80% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index 8ed7b3b62..cfba4e883 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -1,9 +1,9 @@ #include "LevelRuleset.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "app/common/src/Localisation/StringTable.h" class AABB; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h similarity index 91% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h index 6ac68d3d3..2cb2f546e 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h @@ -4,7 +4,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition; class AABB; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 43aa326b0..c1ec25f2c 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h similarity index 90% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index fec1d6674..49394ff67 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "minecraft/world/phys/AABB.h" class NamedAreaRuleDefinition : public GameRuleDefinition { diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index a4b0f8721..42efd98f0 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -4,10 +4,10 @@ #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/Pos.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index d27ef79e0..a0e6c00ac 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class Pos; diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index c0169d5eb..9e063dfff 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -1,8 +1,8 @@ #include "UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h similarity index 91% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h rename to targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index cbcba9611..e07ff80ff 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/targets/app/common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "minecraft/Pos.h" class UseTileRuleDefinition : public GameRuleDefinition { diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp b/targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp rename to targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp index 7f8a0a302..1d6e93938 100644 --- a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp +++ b/targets/app/common/src/GameRules/LevelRules/Rules/GameRule.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRule.h" #include @@ -8,8 +8,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h b/targets/app/common/src/GameRules/LevelRules/Rules/GameRule.h similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h rename to targets/app/common/src/GameRules/LevelRules/Rules/GameRule.h diff --git a/targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h b/targets/app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h rename to targets/app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h diff --git a/targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp b/targets/app/common/src/GameRules/WstringLookup.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp rename to targets/app/common/src/GameRules/WstringLookup.cpp diff --git a/targets/Minecraft.Client/Common/src/GameRules/WstringLookup.h b/targets/app/common/src/GameRules/WstringLookup.h similarity index 100% rename from targets/Minecraft.Client/Common/src/GameRules/WstringLookup.h rename to targets/app/common/src/GameRules/WstringLookup.h diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp b/targets/app/common/src/Leaderboards/LeaderboardInterface.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp rename to targets/app/common/src/Leaderboards/LeaderboardInterface.cpp index 843ac7277..38274afe2 100644 --- a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp +++ b/targets/app/common/src/Leaderboards/LeaderboardInterface.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" LeaderboardInterface::LeaderboardInterface(IPlatformLeaderboard* man) { m_manager = man; diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h b/targets/app/common/src/Leaderboards/LeaderboardInterface.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h rename to targets/app/common/src/Leaderboards/LeaderboardInterface.h diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp b/targets/app/common/src/Leaderboards/LeaderboardManager.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp rename to targets/app/common/src/Leaderboards/LeaderboardManager.cpp index 4f54dadea..40b0a7a12 100644 --- a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp +++ b/targets/app/common/src/Leaderboards/LeaderboardManager.cpp @@ -1,6 +1,6 @@ #include "LeaderboardManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = { diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h b/targets/app/common/src/Leaderboards/LeaderboardManager.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h rename to targets/app/common/src/Leaderboards/LeaderboardManager.h diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/base64.cpp b/targets/app/common/src/Leaderboards/base64.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/Leaderboards/base64.cpp rename to targets/app/common/src/Leaderboards/base64.cpp diff --git a/targets/Minecraft.Client/Common/src/Leaderboards/base64.h b/targets/app/common/src/Leaderboards/base64.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Leaderboards/base64.h rename to targets/app/common/src/Leaderboards/base64.h diff --git a/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp b/targets/app/common/src/Localisation/StringTable.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp rename to targets/app/common/src/Localisation/StringTable.cpp index b96941db2..d425789df 100644 --- a/targets/Minecraft.Client/Common/src/Localisation/StringTable.cpp +++ b/targets/app/common/src/Localisation/StringTable.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/Localisation/StringTable.h b/targets/app/common/src/Localisation/StringTable.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Localisation/StringTable.h rename to targets/app/common/src/Localisation/StringTable.h diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/targets/app/common/src/Network/GameNetworkManager.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp rename to targets/app/common/src/Network/GameNetworkManager.cpp index 93687421e..920f872d2 100644 --- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp +++ b/targets/app/common/src/Network/GameNetworkManager.cpp @@ -15,18 +15,18 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "Common/App_enums.h" -#include "Common/Consoles_App.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/Consoles_App.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/PlatformNetworkManagerStub.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "Socket.h" #include "XboxStubs.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h b/targets/app/common/src/Network/GameNetworkManager.h similarity index 99% rename from targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h rename to targets/app/common/src/Network/GameNetworkManager.h index 34a050613..3783b33ca 100644 --- a/targets/Minecraft.Client/Common/src/Network/GameNetworkManager.h +++ b/targets/app/common/src/Network/GameNetworkManager.h @@ -9,7 +9,7 @@ #endif #include "4J.Common/4J_Compat.h" #include "platform/IPlatformNetwork.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/include/NetTypes.h" #include "NetworkPlayerInterface.h" #include "PlatformNetworkManagerStub.h" #include "SessionInfo.h" diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h b/targets/app/common/src/Network/NetworkPlayerInterface.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h rename to targets/app/common/src/Network/NetworkPlayerInterface.h diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp b/targets/app/common/src/Network/NetworkPlayerQNet.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp rename to targets/app/common/src/Network/NetworkPlayerQNet.cpp index eb8145875..6794dc586 100644 --- a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp +++ b/targets/app/common/src/Network/NetworkPlayerQNet.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/include/NetTypes.h" +#include "app/include/NetTypes.h" #include "java/System.h" NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) { diff --git a/targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h b/targets/app/common/src/Network/NetworkPlayerQNet.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h rename to targets/app/common/src/Network/NetworkPlayerQNet.h diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h b/targets/app/common/src/Network/PlatformNetworkManagerInterface.h similarity index 97% rename from targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h rename to targets/app/common/src/Network/PlatformNetworkManagerInterface.h index 0d414ca33..f4e9742f2 100644 --- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h +++ b/targets/app/common/src/Network/PlatformNetworkManagerInterface.h @@ -4,9 +4,9 @@ #if !defined(__linux__) #include #endif -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" #include "console_helpers/C4JThread.h" diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp rename to targets/app/common/src/Network/PlatformNetworkManagerStub.cpp index 150822406..e37d7744e 100644 --- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp +++ b/targets/app/common/src/Network/PlatformNetworkManagerStub.cpp @@ -5,11 +5,11 @@ #include -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "NetworkPlayerQNet.h" #include "Socket.h" #include "console_helpers/C4JThread.h" diff --git a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h b/targets/app/common/src/Network/PlatformNetworkManagerStub.h similarity index 98% rename from targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h rename to targets/app/common/src/Network/PlatformNetworkManagerStub.h index 4aadb32bf..4068f6b65 100644 --- a/targets/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h +++ b/targets/app/common/src/Network/PlatformNetworkManagerStub.h @@ -5,9 +5,9 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" #include "NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" #include "SessionInfo.h" diff --git a/targets/Minecraft.Client/Common/src/Network/SessionInfo.h b/targets/app/common/src/Network/SessionInfo.h similarity index 95% rename from targets/Minecraft.Client/Common/src/Network/SessionInfo.h rename to targets/app/common/src/Network/SessionInfo.h index b53f54c24..471bb4409 100644 --- a/targets/Minecraft.Client/Common/src/Network/SessionInfo.h +++ b/targets/app/common/src/Network/SessionInfo.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/include/NetTypes.h" +#include "app/include/NetTypes.h" // A struct that we store in the QoS data when we are hosting the session. Max // size 1020 bytes. diff --git a/targets/Minecraft.Client/Common/src/Network/Socket.cpp b/targets/app/common/src/Network/Socket.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Network/Socket.cpp rename to targets/app/common/src/Network/Socket.cpp index fdf3cd387..77f8d5e46 100644 --- a/targets/Minecraft.Client/Common/src/Network/Socket.cpp +++ b/targets/app/common/src/Network/Socket.cpp @@ -7,10 +7,10 @@ #include // 4jcraft TODO -#include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/ShutdownManager.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/include/NetTypes.h" #include "minecraft/server/network/ServerConnection.h" class SocketAddress {}; diff --git a/targets/Minecraft.Client/Common/src/Network/Socket.h b/targets/app/common/src/Network/Socket.h similarity index 97% rename from targets/Minecraft.Client/Common/src/Network/Socket.h rename to targets/app/common/src/Network/Socket.h index 2ff1d8d11..025f93257 100644 --- a/targets/Minecraft.Client/Common/src/Network/Socket.h +++ b/targets/app/common/src/Network/Socket.h @@ -10,8 +10,8 @@ #include #include -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" #include "console_helpers/C4JThread.h" // 4jcraft TODO #include "console_helpers/ThreadName.h" // 4jcraft TODO #include "java/InputOutputStream/InputStream.h" diff --git a/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp b/targets/app/common/src/Trial/TrialMode.cpp similarity index 67% rename from targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp rename to targets/app/common/src/Trial/TrialMode.cpp index 565a2c954..a1138b853 100644 --- a/targets/Minecraft.Client/Common/src/Trial/TrialMode.cpp +++ b/targets/app/common/src/Trial/TrialMode.cpp @@ -1,7 +1,7 @@ #include "TrialMode.h" -#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" +#include "app/common/src/Tutorial/FullTutorial.h" +#include "app/common/src/Tutorial/FullTutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/Minecraft.Client/Common/src/Trial/TrialMode.h b/targets/app/common/src/Trial/TrialMode.h similarity index 78% rename from targets/Minecraft.Client/Common/src/Trial/TrialMode.h rename to targets/app/common/src/Trial/TrialMode.h index 6db8a11e7..41a7d92d5 100644 --- a/targets/Minecraft.Client/Common/src/Trial/TrialMode.h +++ b/targets/app/common/src/Trial/TrialMode.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" +#include "app/common/src/Tutorial/FullTutorialMode.h" class ClientConnection; class Minecraft; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp b/targets/app/common/src/Tutorial/Constraints/AreaConstraint.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp rename to targets/app/common/src/Tutorial/Constraints/AreaConstraint.cpp index c0992c8f7..a49d44ecd 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp +++ b/targets/app/common/src/Tutorial/Constraints/AreaConstraint.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h b/targets/app/common/src/Tutorial/Constraints/AreaConstraint.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h rename to targets/app/common/src/Tutorial/Constraints/AreaConstraint.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp b/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp rename to targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.cpp index b8fb0c241..8669f4c5d 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h b/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.h similarity index 95% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h rename to targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.h index 41a346ea2..9c059151c 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h +++ b/targets/app/common/src/Tutorial/Constraints/ChangeStateConstraint.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialConstraint.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp b/targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp rename to targets/app/common/src/Tutorial/Constraints/InputConstraint.cpp diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h b/targets/app/common/src/Tutorial/Constraints/InputConstraint.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h rename to targets/app/common/src/Tutorial/Constraints/InputConstraint.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h b/targets/app/common/src/Tutorial/Constraints/TutorialConstraint.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h rename to targets/app/common/src/Tutorial/Constraints/TutorialConstraint.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h b/targets/app/common/src/Tutorial/Constraints/TutorialConstraints.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h rename to targets/app/common/src/Tutorial/Constraints/TutorialConstraints.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp b/targets/app/common/src/Tutorial/FullTutorial.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp rename to targets/app/common/src/Tutorial/FullTutorial.cpp index cac2e1585..68df8fe74 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp +++ b/targets/app/common/src/Tutorial/FullTutorial.cpp @@ -4,27 +4,27 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/src/Tutorial/Constraints/AreaConstraint.h" +#include "app/common/src/Tutorial/Constraints/ChangeStateConstraint.h" +#include "app/common/src/Tutorial/Hints/AreaHint.h" +#include "app/common/src/Tutorial/Tasks/AreaTask.h" +#include "app/common/src/Tutorial/Tasks/ChoiceTask.h" +#include "app/common/src/Tutorial/Tasks/CompleteUsingItemTask.h" +#include "app/common/src/Tutorial/Tasks/ControllerTask.h" +#include "app/common/src/Tutorial/Tasks/CraftTask.h" +#include "app/common/src/Tutorial/Tasks/EffectChangedTask.h" +#include "app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h" +#include "app/common/src/Tutorial/Tasks/InfoTask.h" +#include "app/common/src/Tutorial/Tasks/PickupTask.h" +#include "app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h" +#include "app/common/src/Tutorial/Tasks/ProgressFlagTask.h" +#include "app/common/src/Tutorial/Tasks/StateChangeTask.h" +#include "app/common/src/Tutorial/Tasks/UseItemTask.h" +#include "app/common/src/Tutorial/Tasks/UseTileTask.h" +#include "app/common/src/Tutorial/Tasks/XuiCraftingTask.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/effect/MobEffect.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/alchemy/PotionMacros.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h b/targets/app/common/src/Tutorial/FullTutorial.h similarity index 90% rename from targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h rename to targets/app/common/src/Tutorial/FullTutorial.h index 7b8406385..22c2d2ec8 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorial.h +++ b/targets/app/common/src/Tutorial/FullTutorial.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "Tutorial.h" #define FULL_TUTORIAL_PROGRESS_2_X_2_Crafting 1 diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp b/targets/app/common/src/Tutorial/FullTutorialMode.cpp similarity index 79% rename from targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp rename to targets/app/common/src/Tutorial/FullTutorialMode.cpp index d60e7df91..55a5b9621 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp +++ b/targets/app/common/src/Tutorial/FullTutorialMode.cpp @@ -1,8 +1,8 @@ #include "FullTutorialMode.h" #include "FullTutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" #include "minecraft/client/Minecraft.h" class ClientConnection; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h b/targets/app/common/src/Tutorial/FullTutorialMode.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h rename to targets/app/common/src/Tutorial/FullTutorialMode.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp b/targets/app/common/src/Tutorial/Hints/AreaHint.cpp similarity index 87% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp rename to targets/app/common/src/Tutorial/Hints/AreaHint.cpp index 6286fb683..c42ca2354 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp +++ b/targets/app/common/src/Tutorial/Hints/AreaHint.cpp @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h b/targets/app/common/src/Tutorial/Hints/AreaHint.h similarity index 92% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h rename to targets/app/common/src/Tutorial/Hints/AreaHint.h index 7689661d4..e3922e008 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h +++ b/targets/app/common/src/Tutorial/Hints/AreaHint.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialHint.h" #include "minecraft/world/phys/AABB.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp b/targets/app/common/src/Tutorial/Hints/DiggerItemHint.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp rename to targets/app/common/src/Tutorial/Hints/DiggerItemHint.cpp index 911701805..2742c963c 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp +++ b/targets/app/common/src/Tutorial/Hints/DiggerItemHint.cpp @@ -3,8 +3,8 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tutorial.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h b/targets/app/common/src/Tutorial/Hints/DiggerItemHint.h similarity index 90% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h rename to targets/app/common/src/Tutorial/Hints/DiggerItemHint.h index 5a7928ef6..45357afe1 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h +++ b/targets/app/common/src/Tutorial/Hints/DiggerItemHint.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialHint.h" class DiggerItem; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp b/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.cpp similarity index 79% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp rename to targets/app/common/src/Tutorial/Hints/LookAtEntityHint.cpp index 7f4dcec2e..94ce2a8a6 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp +++ b/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.cpp @@ -1,8 +1,8 @@ #include "LookAtEntityHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, int titleId, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h b/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.h similarity index 88% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h rename to targets/app/common/src/Tutorial/Hints/LookAtEntityHint.h index ecced69af..6633ae8cd 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h +++ b/targets/app/common/src/Tutorial/Hints/LookAtEntityHint.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialHint.h" #include "java/Class.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp b/targets/app/common/src/Tutorial/Hints/LookAtTileHint.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp rename to targets/app/common/src/Tutorial/Hints/LookAtTileHint.cpp index a390d325d..cf65ae02a 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp +++ b/targets/app/common/src/Tutorial/Hints/LookAtTileHint.cpp @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/world/item/Item.h" LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h b/targets/app/common/src/Tutorial/Hints/LookAtTileHint.h similarity index 90% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h rename to targets/app/common/src/Tutorial/Hints/LookAtTileHint.h index 6c0df16d0..dd133f291 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h +++ b/targets/app/common/src/Tutorial/Hints/LookAtTileHint.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialHint.h" class ItemInstance; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp b/targets/app/common/src/Tutorial/Hints/TakeItemHint.cpp similarity index 86% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp rename to targets/app/common/src/Tutorial/Hints/TakeItemHint.cpp index 6ae25b0b9..b059d5b31 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp +++ b/targets/app/common/src/Tutorial/Hints/TakeItemHint.cpp @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/world/item/ItemInstance.h" TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[], diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h b/targets/app/common/src/Tutorial/Hints/TakeItemHint.h similarity index 88% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h rename to targets/app/common/src/Tutorial/Hints/TakeItemHint.h index b72aa48d5..e836aa618 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h +++ b/targets/app/common/src/Tutorial/Hints/TakeItemHint.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialHint.h" class ItemInstance; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp b/targets/app/common/src/Tutorial/Hints/TutorialHint.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp rename to targets/app/common/src/Tutorial/Hints/TutorialHint.cpp index 5274bb17f..14f89c60f 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp +++ b/targets/app/common/src/Tutorial/Hints/TutorialHint.cpp @@ -1,7 +1,7 @@ #include "TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h b/targets/app/common/src/Tutorial/Hints/TutorialHint.h similarity index 96% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h rename to targets/app/common/src/Tutorial/Hints/TutorialHint.h index 40131d293..b30746df0 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h +++ b/targets/app/common/src/Tutorial/Hints/TutorialHint.h @@ -3,7 +3,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "java/Class.h" class Entity; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h b/targets/app/common/src/Tutorial/Hints/TutorialHints.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h rename to targets/app/common/src/Tutorial/Hints/TutorialHints.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp b/targets/app/common/src/Tutorial/Tasks/AreaTask.cpp similarity index 87% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp rename to targets/app/common/src/Tutorial/Tasks/AreaTask.cpp index 44e8ed6ca..c81e0f004 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/AreaTask.cpp @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial, std::vector* inConstraints, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h b/targets/app/common/src/Tutorial/Tasks/AreaTask.h similarity index 93% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h rename to targets/app/common/src/Tutorial/Tasks/AreaTask.h index aea913ff0..8b8111bea 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h +++ b/targets/app/common/src/Tutorial/Tasks/AreaTask.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp b/targets/app/common/src/Tutorial/Tasks/ChoiceTask.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp rename to targets/app/common/src/Tutorial/Tasks/ChoiceTask.cpp index e0f1b8839..fb243c15c 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/ChoiceTask.cpp @@ -4,11 +4,11 @@ #include #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Constraints/InputConstraint.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h b/targets/app/common/src/Tutorial/Tasks/ChoiceTask.h similarity index 93% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h rename to targets/app/common/src/Tutorial/Tasks/ChoiceTask.h index 61ebcc9b0..2e54de703 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h +++ b/targets/app/common/src/Tutorial/Tasks/ChoiceTask.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp b/targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp rename to targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp index 911c833c2..09a6f8fd6 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h b/targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h rename to targets/app/common/src/Tutorial/Tasks/CompleteUsingItemTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp b/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp rename to targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp index d8ceb0281..41e97c491 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/ControllerTask.cpp @@ -7,10 +7,10 @@ #include #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/Tutorial/Constraints/InputConstraint.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h b/targets/app/common/src/Tutorial/Tasks/ControllerTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h rename to targets/app/common/src/Tutorial/Tasks/ControllerTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp b/targets/app/common/src/Tutorial/Tasks/CraftTask.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp rename to targets/app/common/src/Tutorial/Tasks/CraftTask.cpp index 45a240f0b..bb8b59ca5 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/CraftTask.cpp @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h b/targets/app/common/src/Tutorial/Tasks/CraftTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h rename to targets/app/common/src/Tutorial/Tasks/CraftTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp b/targets/app/common/src/Tutorial/Tasks/EffectChangedTask.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp rename to targets/app/common/src/Tutorial/Tasks/EffectChangedTask.cpp index 30cb8cba5..afd13e041 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/EffectChangedTask.cpp @@ -1,6 +1,6 @@ #include "EffectChangedTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h b/targets/app/common/src/Tutorial/Tasks/EffectChangedTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h rename to targets/app/common/src/Tutorial/Tasks/EffectChangedTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp b/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp similarity index 75% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp rename to targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp index bb34fba39..27604b4cc 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp @@ -1,8 +1,8 @@ #include "FullTutorialActiveTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" FullTutorialActiveTask::FullTutorialActiveTask( Tutorial* tutorial, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h b/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h similarity index 88% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h rename to targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h index 0d0f04ed0..b150d764d 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h +++ b/targets/app/common/src/Tutorial/Tasks/FullTutorialActiveTask.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp b/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp rename to targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.cpp index 6ffb72905..be3373be3 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Tasks/ChoiceTask.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/animal/EntityHorse.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h b/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.h similarity index 91% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h rename to targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.h index 552fc2a57..9a8f537e6 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h +++ b/targets/app/common/src/Tutorial/Tasks/HorseChoiceTask.h @@ -1,7 +1,7 @@ #pragma once #include "ChoiceTask.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp b/targets/app/common/src/Tutorial/Tasks/InfoTask.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp rename to targets/app/common/src/Tutorial/Tasks/InfoTask.cpp index cc6c6d70d..9ef123d0a 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/InfoTask.cpp @@ -6,10 +6,10 @@ #include #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Constraints/InputConstraint.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h b/targets/app/common/src/Tutorial/Tasks/InfoTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h rename to targets/app/common/src/Tutorial/Tasks/InfoTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp b/targets/app/common/src/Tutorial/Tasks/PickupTask.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp rename to targets/app/common/src/Tutorial/Tasks/PickupTask.cpp diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h b/targets/app/common/src/Tutorial/Tasks/PickupTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h rename to targets/app/common/src/Tutorial/Tasks/PickupTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp b/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp rename to targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp index 9c7accbe9..cf4984645 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/TutorialEnum.h" ProcedureCompoundTask::~ProcedureCompoundTask() { for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) { diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h b/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h similarity index 95% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h rename to targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h index eac49f78e..f0338c425 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h +++ b/targets/app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.cpp b/targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.cpp rename to targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.cpp diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h b/targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.h similarity index 82% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h rename to targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.h index 9c30901ab..b0077521a 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h +++ b/targets/app/common/src/Tutorial/Tasks/ProgressFlagTask.h @@ -1,7 +1,7 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tutorial.h" #include "TutorialTask.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp b/targets/app/common/src/Tutorial/Tasks/RideEntityTask.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp rename to targets/app/common/src/Tutorial/Tasks/RideEntityTask.cpp index c7f4f1158..1e8d26807 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/RideEntityTask.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" #include "java/Class.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h b/targets/app/common/src/Tutorial/Tasks/RideEntityTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h rename to targets/app/common/src/Tutorial/Tasks/RideEntityTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp b/targets/app/common/src/Tutorial/Tasks/StatTask.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp rename to targets/app/common/src/Tutorial/Tasks/StatTask.cpp index fada67bc9..c6b129f8f 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/StatTask.cpp @@ -1,7 +1,7 @@ #include "StatTask.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/StatsCounter.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.h b/targets/app/common/src/Tutorial/Tasks/StatTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.h rename to targets/app/common/src/Tutorial/Tasks/StatTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h b/targets/app/common/src/Tutorial/Tasks/StateChangeTask.h similarity index 93% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h rename to targets/app/common/src/Tutorial/Tasks/StateChangeTask.h index 894ef62d0..660ce02ab 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h +++ b/targets/app/common/src/Tutorial/Tasks/StateChangeTask.h @@ -1,6 +1,6 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/Tutorial.h" #include "TutorialTask.h" class StateChangeTask : public TutorialTask { diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp b/targets/app/common/src/Tutorial/Tasks/TutorialTask.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp rename to targets/app/common/src/Tutorial/Tasks/TutorialTask.cpp index 3276a0a55..cfaf76275 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/TutorialTask.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/src/Tutorial/Tutorial.h" TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId, bool enablePreCompletion, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h b/targets/app/common/src/Tutorial/Tasks/TutorialTask.h similarity index 98% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h rename to targets/app/common/src/Tutorial/Tasks/TutorialTask.h index 8763580e8..a87cf704b 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h +++ b/targets/app/common/src/Tutorial/Tasks/TutorialTask.h @@ -4,7 +4,7 @@ #include // using namespace std; -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialEnum.h" class Level; class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h b/targets/app/common/src/Tutorial/Tasks/TutorialTasks.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h rename to targets/app/common/src/Tutorial/Tasks/TutorialTasks.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp b/targets/app/common/src/Tutorial/Tasks/UseItemTask.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp rename to targets/app/common/src/Tutorial/Tasks/UseItemTask.cpp index 0da47ee1d..d4ddacdd7 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/UseItemTask.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h b/targets/app/common/src/Tutorial/Tasks/UseItemTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h rename to targets/app/common/src/Tutorial/Tasks/UseItemTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp b/targets/app/common/src/Tutorial/Tasks/UseTileTask.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp rename to targets/app/common/src/Tutorial/Tasks/UseTileTask.cpp index 49469a07e..d9014956f 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/UseTileTask.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" #include "minecraft/world/level/Level.h" class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h b/targets/app/common/src/Tutorial/Tasks/UseTileTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h rename to targets/app/common/src/Tutorial/Tasks/UseTileTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp b/targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.cpp similarity index 83% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp rename to targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.cpp index 0654b8c27..66f177ce1 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp +++ b/targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.cpp @@ -1,7 +1,7 @@ #include "XuiCraftingTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" bool XuiCraftingTask::isCompleted() { // This doesn't seem to work diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h b/targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h rename to targets/app/common/src/Tutorial/Tasks/XuiCraftingTask.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/targets/app/common/src/Tutorial/Tutorial.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp rename to targets/app/common/src/Tutorial/Tutorial.cpp index 5233d412e..612960555 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp +++ b/targets/app/common/src/Tutorial/Tutorial.cpp @@ -8,22 +8,22 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Common/App_structs.h" -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/App_structs.h" +#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/src/Tutorial/Hints/DiggerItemHint.h" +#include "app/common/src/Tutorial/Hints/LookAtEntityHint.h" +#include "app/common/src/Tutorial/Hints/LookAtTileHint.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tasks/ChoiceTask.h" +#include "app/common/src/Tutorial/Tasks/HorseChoiceTask.h" +#include "app/common/src/Tutorial/Tasks/InfoTask.h" +#include "app/common/src/Tutorial/Tasks/ProcedureCompoundTask.h" +#include "app/common/src/Tutorial/Tasks/RideEntityTask.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "TutorialMessage.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h b/targets/app/common/src/Tutorial/Tutorial.h similarity index 96% rename from targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h rename to targets/app/common/src/Tutorial/Tutorial.h index 20e274e20..c70f87725 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/Tutorial.h +++ b/targets/app/common/src/Tutorial/Tutorial.h @@ -8,10 +8,10 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "app/common/src/Tutorial/Hints/TutorialHint.h" +#include "app/common/src/Tutorial/Tasks/TutorialTask.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "TutorialEnum.h" #include "TutorialMessage.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialEnum.h b/targets/app/common/src/Tutorial/TutorialEnum.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/TutorialEnum.h rename to targets/app/common/src/Tutorial/TutorialEnum.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp b/targets/app/common/src/Tutorial/TutorialMessage.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp rename to targets/app/common/src/Tutorial/TutorialMessage.cpp index e6287fcd1..729e8c98b 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp +++ b/targets/app/common/src/Tutorial/TutorialMessage.cpp @@ -1,6 +1,6 @@ #include "TutorialMessage.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" TutorialMessage::TutorialMessage( int messageId, bool limitRepeats /*= false*/, diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.h b/targets/app/common/src/Tutorial/TutorialMessage.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/TutorialMessage.h rename to targets/app/common/src/Tutorial/TutorialMessage.h diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp b/targets/app/common/src/Tutorial/TutorialMode.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp rename to targets/app/common/src/Tutorial/TutorialMode.cpp index 845260c65..7dcdb68d4 100644 --- a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp +++ b/targets/app/common/src/Tutorial/TutorialMode.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/Tutorial.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" diff --git a/targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.h b/targets/app/common/src/Tutorial/TutorialMode.h similarity index 100% rename from targets/Minecraft.Client/Common/src/Tutorial/TutorialMode.h rename to targets/app/common/src/Tutorial/TutorialMode.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp rename to targets/app/common/src/UI/All Platforms/ArchiveFile.cpp index 22ab6ed4a..757dd27e8 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp +++ b/targets/app/common/src/UI/All Platforms/ArchiveFile.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/compression.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h b/targets/app/common/src/UI/All Platforms/ArchiveFile.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h rename to targets/app/common/src/UI/All Platforms/ArchiveFile.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h b/targets/app/common/src/UI/All Platforms/IUIController.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h rename to targets/app/common/src/UI/All Platforms/IUIController.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 68c653b0c..e8703a381 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -10,12 +10,12 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h index 824d7876f..45feb362e 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h +++ b/targets/app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" #include "UIStructs.h" class HtmlString; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp index 24e3d3817..80853487f 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_AnvilMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp index 539636dc8..8a0b03e2a 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_BeaconMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp index 8303bd207..74ba96d52 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/BrewingStandMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_BrewingMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp index 7f4727623..a79b99bd7 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_ContainerMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index 74c748e13..8cd670144 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -10,13 +10,13 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/player/LocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h index 0e554974e..76aea9810 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/crafting/Recipy.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index c5a2cffbf..0103e8e36 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -7,9 +7,9 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h index fe23c535b..694de8d57 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h +++ b/targets/app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h @@ -5,8 +5,8 @@ #include #include "IUIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" class Inventory; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp index ad8337c0e..9473d9da5 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_DispenserMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp index 78f3960d8..517a7e4c5 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -4,7 +4,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp index f42a769f6..eca43ef42 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/FireworksMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_FireworksMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp index eeb8a9845..9be58df2a 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/FurnaceMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp index 8d20213b0..899c32c0a 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_HUD.cpp @@ -5,9 +5,9 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h b/targets/app/common/src/UI/All Platforms/IUIScene_HUD.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h rename to targets/app/common/src/UI/All Platforms/IUIScene_HUD.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.cpp index 077582066..6e85a142a 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/HopperMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_HopperMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index fc7b664a7..4f5441db1 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/entity/animal/EntityHorse.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp index c8afa4a59..57bcdcecb 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/InventoryMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_InventoryMenu.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index e0c7fd8a6..5e7234cfc 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -10,15 +10,15 @@ #include #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h index 9165477ca..224f75661 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h +++ b/targets/app/common/src/UI/All Platforms/IUIScene_PauseMenu.h @@ -2,8 +2,8 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/include/stdafx.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/include/stdafx.h" class DLCPack; diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp rename to targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index 49230666a..f11bfdd52 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -5,10 +5,10 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.h similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h rename to targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.h index f27f68bb7..266d73070 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h +++ b/targets/app/common/src/UI/All Platforms/IUIScene_TradingMenu.h @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/inventory/MerchantMenu.h" #include "minecraft/world/item/Rarity.h" diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h b/targets/app/common/src/UI/All Platforms/UIEnums.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h rename to targets/app/common/src/UI/All Platforms/UIEnums.h diff --git a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h b/targets/app/common/src/UI/All Platforms/UIStructs.h similarity index 99% rename from targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h rename to targets/app/common/src/UI/All Platforms/UIStructs.h index 5603d2ea4..5473162bb 100644 --- a/targets/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h +++ b/targets/app/common/src/UI/All Platforms/UIStructs.h @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/App_Defines.h" +#include "app/common/App_Defines.h" #include "UIEnums.h" #include "console_helpers/C4JThread.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp b/targets/app/common/src/UI/Components/UIComponent_Chat.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp rename to targets/app/common/src/UI/Components/UIComponent_Chat.cpp index ffaf6d67a..a784d42db 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Chat.cpp @@ -3,13 +3,13 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h b/targets/app/common/src/UI/Components/UIComponent_Chat.h similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h rename to targets/app/common/src/UI/Components/UIComponent_Chat.h index 1e71faa3a..1c6c1bd09 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h +++ b/targets/app/common/src/UI/Components/UIComponent_Chat.h @@ -3,11 +3,11 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp b/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp rename to targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.cpp index 1e8888195..3332970c3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.cpp @@ -1,7 +1,7 @@ #include "UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h b/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.h similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h rename to targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.h index 17913dcae..9fbb44404 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h +++ b/targets/app/common/src/UI/Components/UIComponent_DebugUIConsole.h @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp similarity index 83% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp rename to targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index 06a37b014..61ae04449 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -1,8 +1,8 @@ #include "UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h rename to targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h index bb33c97fb..f969736ec 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/targets/app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp b/targets/app/common/src/UI/Components/UIComponent_Logo.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp rename to targets/app/common/src/UI/Components/UIComponent_Logo.cpp index a6d014fbf..a805bf59b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Logo.cpp @@ -1,8 +1,8 @@ #include "UIComponent_Logo.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" UIComponent_Logo::UIComponent_Logo(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h b/targets/app/common/src/UI/Components/UIComponent_Logo.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h rename to targets/app/common/src/UI/Components/UIComponent_Logo.h index 457ad28d6..8f0b11757 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h +++ b/targets/app/common/src/UI/Components/UIComponent_Logo.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp b/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp rename to targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp index 36619d881..b4ed9897b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_MenuBackground.cpp @@ -1,11 +1,11 @@ #include "UIComponent_MenuBackground.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_UIController.h" UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData, UILayer* parentLayer) diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h b/targets/app/common/src/UI/Components/UIComponent_MenuBackground.h similarity index 84% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h rename to targets/app/common/src/UI/Components/UIComponent_MenuBackground.h index b1fcfe0c8..1d57c5fdd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h +++ b/targets/app/common/src/UI/Components/UIComponent_MenuBackground.h @@ -3,9 +3,9 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp b/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp rename to targets/app/common/src/UI/Components/UIComponent_Panorama.cpp index 9772b2406..bb9f6f746 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Panorama.cpp @@ -5,11 +5,11 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLevel.h" #include "minecraft/world/level/dimension/Dimension.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h b/targets/app/common/src/UI/Components/UIComponent_Panorama.h similarity index 82% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h rename to targets/app/common/src/UI/Components/UIComponent_Panorama.h index 05e435f1b..40fbdd131 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h +++ b/targets/app/common/src/UI/Components/UIComponent_Panorama.h @@ -3,10 +3,10 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp rename to targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp index cd4da419c..ee4eb55cd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.cpp @@ -1,9 +1,9 @@ #include "UIComponent_PressStartToPlay.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "strings.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h rename to targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h index 50e377f6a..a02f04325 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h +++ b/targets/app/common/src/UI/Components/UIComponent_PressStartToPlay.h @@ -3,11 +3,11 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp rename to targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp index 2c1f6457a..21b193c24 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.cpp @@ -2,15 +2,15 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h b/targets/app/common/src/UI/Components/UIComponent_Tooltips.h similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h rename to targets/app/common/src/UI/Components/UIComponent_Tooltips.h index d6da17e38..5a3bc8edc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h +++ b/targets/app/common/src/UI/Components/UIComponent_Tooltips.h @@ -5,12 +5,12 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp rename to targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp index 309cfd342..bbe944792 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp +++ b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -5,14 +5,14 @@ #include #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h rename to targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h index 4eae9d79b..8fbbd8f0c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h +++ b/targets/app/common/src/UI/Components/UIComponent_TutorialPopup.h @@ -4,13 +4,13 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class ItemInstance; class Tutorial; diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp b/targets/app/common/src/UI/Components/UIScene_HUD.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp rename to targets/app/common/src/UI/Components/UIScene_HUD.cpp index 64d556f2c..1b089d445 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp +++ b/targets/app/common/src/UI/Components/UIScene_HUD.cpp @@ -5,13 +5,13 @@ #include #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Components/UIComponent_Chat.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h b/targets/app/common/src/UI/Components/UIScene_HUD.h similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h rename to targets/app/common/src/UI/Components/UIScene_HUD.h index 020aa7231..b4a72d95b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h +++ b/targets/app/common/src/UI/Components/UIScene_HUD.h @@ -3,13 +3,13 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/IUIScene_HUD.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp b/targets/app/common/src/UI/Controls/UIControl.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp rename to targets/app/common/src/UI/Controls/UIControl.cpp index 7a755d3fe..bb61a84ad 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp +++ b/targets/app/common/src/UI/Controls/UIControl.cpp @@ -1,12 +1,12 @@ #include "UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" #include "java/JavaMath.h" #ifndef _ENABLESHIGGY -#include "Minecraft.Client/Linux/Stubs/iggy_stubs.h" +#include "app/linux/Stubs/iggy_stubs.h" #endif UIControl::UIControl() { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h b/targets/app/common/src/UI/Controls/UIControl.h similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h rename to targets/app/common/src/UI/Controls/UIControl.h index 3f7763d99..1d57c74da 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl.h +++ b/targets/app/common/src/UI/Controls/UIControl.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UIScene; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp b/targets/app/common/src/UI/Controls/UIControl_Base.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp rename to targets/app/common/src/UI/Controls/UIControl_Base.cpp index 4e0e7c50d..c5c3caf65 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Base.cpp @@ -1,13 +1,13 @@ -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" #include #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" UIControl_Base::UIControl_Base() { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h b/targets/app/common/src/UI/Controls/UIControl_Base.h similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h rename to targets/app/common/src/UI/Controls/UIControl_Base.h index 6a6dc4ea3..2ba58b458 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h +++ b/targets/app/common/src/UI/Controls/UIControl_Base.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" // This class maps to the FJ_Base class in actionscript class UIControl_Base : public UIControl { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp rename to targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp index 6bfa47ad6..201a460df 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -1,8 +1,8 @@ #include "UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() { m_data = 0; diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h rename to targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h index 51fa03235..1b1dd4101 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h +++ b/targets/app/common/src/UI/Controls/UIControl_BeaconEffectButton.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl.h" class UIControl_BeaconEffectButton : public UIControl { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp rename to targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp index 4ead03123..29b113f6d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.cpp @@ -1,8 +1,8 @@ #include "UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h similarity index 58% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h rename to targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h index 30872c64e..8a89f4069 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h +++ b/targets/app/common/src/UI/Controls/UIControl_BitmapIcon.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl.h" class UIControl_BitmapIcon : public UIControl { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp b/targets/app/common/src/UI/Controls/UIControl_Button.cpp similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp rename to targets/app/common/src/UI/Controls/UIControl_Button.cpp index 2055b1359..6f5ff5ad0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Button.cpp @@ -1,10 +1,10 @@ #include "UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" UIControl_Button::UIControl_Button() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h b/targets/app/common/src/UI/Controls/UIControl_Button.h similarity index 63% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h rename to targets/app/common/src/UI/Controls/UIControl_Button.h index 10bc98d06..a568fb743 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h +++ b/targets/app/common/src/UI/Controls/UIControl_Button.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_Button : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp b/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp rename to targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp index 54c8aa911..4e46679a6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_ButtonList.cpp @@ -1,11 +1,11 @@ #include "UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" UIControl_ButtonList::UIControl_ButtonList() { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h b/targets/app/common/src/UI/Controls/UIControl_ButtonList.h similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h rename to targets/app/common/src/UI/Controls/UIControl_ButtonList.h index e09cb166a..6dc895fd2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h +++ b/targets/app/common/src/UI/Controls/UIControl_ButtonList.h @@ -3,11 +3,11 @@ #include #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_ButtonList : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp b/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp rename to targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp index 106529933..52bf1132c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_CheckBox.cpp @@ -1,11 +1,11 @@ #include "UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" UIControl_CheckBox::UIControl_CheckBox() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h b/targets/app/common/src/UI/Controls/UIControl_CheckBox.h similarity index 67% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h rename to targets/app/common/src/UI/Controls/UIControl_CheckBox.h index 825da8030..3f54e1d5b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h +++ b/targets/app/common/src/UI/Controls/UIControl_CheckBox.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_CheckBox : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp b/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp similarity index 68% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp rename to targets/app/common/src/UI/Controls/UIControl_Cursor.cpp index 37a88d880..33816bede 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Cursor.cpp @@ -1,8 +1,8 @@ #include "UIControl_Cursor.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/linux/Iggy/include/iggy.h" UIControl_Cursor::UIControl_Cursor() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h b/targets/app/common/src/UI/Controls/UIControl_Cursor.h similarity index 53% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h rename to targets/app/common/src/UI/Controls/UIControl_Cursor.h index 03603dca2..727b09eec 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h +++ b/targets/app/common/src/UI/Controls/UIControl_Cursor.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Cursor.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_Cursor : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp b/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp rename to targets/app/common/src/UI/Controls/UIControl_DLCList.cpp index 886f8ed9b..e95abbb27 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_DLCList.cpp @@ -1,10 +1,10 @@ #include "UIControl_DLCList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h b/targets/app/common/src/UI/Controls/UIControl_DLCList.h similarity index 74% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h rename to targets/app/common/src/UI/Controls/UIControl_DLCList.h index 055990762..7ad28b3de 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h +++ b/targets/app/common/src/UI/Controls/UIControl_DLCList.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_DLCList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_ButtonList.h" class UIControl_DLCList : public UIControl_ButtonList { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp rename to targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp index 29b4796e8..e5cae77e4 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.cpp @@ -1,10 +1,10 @@ #include "UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" UIControl_DynamicLabel::UIControl_DynamicLabel() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h similarity index 67% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h rename to targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h index 7c4f35395..74b5469d5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h +++ b/targets/app/common/src/UI/Controls/UIControl_DynamicLabel.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" class UIControl_DynamicLabel : public UIControl_Label { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp rename to targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp index 7560f0c1f..22f887232 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -3,9 +3,9 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "app/linux/Iggy/include/iggy.h" #include "gl3_loader.h" #include "java/Class.h" #include "minecraft/client/Lighting.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h similarity index 73% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h rename to targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h index 86769affc..0709e7316 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentBook.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl.h" #include "java/Random.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp rename to targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp index 8f7edbd48..14e5a5934 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -6,13 +6,13 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h rename to targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h index c05781592..ebe161f16 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h +++ b/targets/app/common/src/UI/Controls/UIControl_EnchantmentButton.h @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Button.h" #include "java/Random.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp rename to targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp index 0e83db423..b7d1a55c2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.cpp @@ -1,10 +1,10 @@ #include "UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" UIControl_HTMLLabel::UIControl_HTMLLabel() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h similarity index 64% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h rename to targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h index 7110f58a5..bafbe3fb1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h +++ b/targets/app/common/src/UI/Controls/UIControl_HTMLLabel.h @@ -2,12 +2,12 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" class UIControl_HTMLLabel : public UIControl_Label { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp b/targets/app/common/src/UI/Controls/UIControl_Label.cpp similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp rename to targets/app/common/src/UI/Controls/UIControl_Label.cpp index a2fe34f8c..da9f4eac3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Label.cpp @@ -1,10 +1,10 @@ #include "UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" UIControl_Label::UIControl_Label() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h b/targets/app/common/src/UI/Controls/UIControl_Label.h similarity index 59% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h rename to targets/app/common/src/UI/Controls/UIControl_Label.h index 4633cebe9..6f9dafe25 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h +++ b/targets/app/common/src/UI/Controls/UIControl_Label.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_Label : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp rename to targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp index 9c4364345..6a4aa09a7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.cpp @@ -1,9 +1,9 @@ #include "UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" UIControl_LeaderboardList::UIControl_LeaderboardList() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h rename to targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h index 088c72f5e..52391382b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h +++ b/targets/app/common/src/UI/Controls/UIControl_LeaderboardList.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_LeaderboardList : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp rename to targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp index 260f3025a..f559a63ae 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" #include @@ -6,9 +6,9 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "app/linux/Iggy/include/iggy.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h similarity index 67% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h rename to targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h index f500748f2..11243289a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftHorse.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl.h" class UIControl_MinecraftHorse : public UIControl { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp rename to targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp index 59be50f8d..457cf1b0b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -6,9 +6,9 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" +#include "app/linux/Iggy/include/iggy.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h similarity index 67% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h rename to targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h index 5bfb23ad4..a91952fba 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h +++ b/targets/app/common/src/UI/Controls/UIControl_MinecraftPlayer.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl.h" class UIControl_MinecraftPlayer : public UIControl { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp b/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp rename to targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp index bc2172e03..5dba457e7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerList.cpp @@ -1,10 +1,10 @@ #include "UIControl_PlayerList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h b/targets/app/common/src/UI/Controls/UIControl_PlayerList.h similarity index 75% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h rename to targets/app/common/src/UI/Controls/UIControl_PlayerList.h index 635cd9127..01703b33a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerList.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_PlayerList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_ButtonList.h" class UIControl_PlayerList : public UIControl_ButtonList { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp rename to targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index e9204c128..dcb4eaefa 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -7,10 +7,10 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_App.h" #include "gl3_loader.h" #include "java/Class.h" #include "minecraft/client/Lighting.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h rename to targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h index 478c24b07..46d3b88dc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h +++ b/targets/app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp b/targets/app/common/src/UI/Controls/UIControl_Progress.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp rename to targets/app/common/src/UI/Controls/UIControl_Progress.cpp index 6e7af2966..73c92cbdd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Progress.cpp @@ -1,10 +1,10 @@ #include "UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" UIControl_Progress::UIControl_Progress() { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h b/targets/app/common/src/UI/Controls/UIControl_Progress.h similarity index 66% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h rename to targets/app/common/src/UI/Controls/UIControl_Progress.h index 62c0c995e..4983c95f8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h +++ b/targets/app/common/src/UI/Controls/UIControl_Progress.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_Progress : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp b/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp rename to targets/app/common/src/UI/Controls/UIControl_SaveList.cpp index e61974bf7..d80e4b1d6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SaveList.cpp @@ -1,10 +1,10 @@ #include "UIControl_SaveList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h b/targets/app/common/src/UI/Controls/UIControl_SaveList.h similarity index 84% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h rename to targets/app/common/src/UI/Controls/UIControl_SaveList.h index a19e5822f..5aeed0b41 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h +++ b/targets/app/common/src/UI/Controls/UIControl_SaveList.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_SaveList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_ButtonList.h" class UIControl_SaveList : public UIControl_ButtonList { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp b/targets/app/common/src/UI/Controls/UIControl_Slider.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp rename to targets/app/common/src/UI/Controls/UIControl_Slider.cpp index 1acb18cb8..18d2c4af1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Slider.cpp @@ -1,12 +1,12 @@ #include "UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h b/targets/app/common/src/UI/Controls/UIControl_Slider.h similarity index 72% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h rename to targets/app/common/src/UI/Controls/UIControl_Slider.h index 84941bfd2..d0e4b762c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h +++ b/targets/app/common/src/UI/Controls/UIControl_Slider.h @@ -3,12 +3,12 @@ #include #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" class UIControl_Slider : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp b/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp rename to targets/app/common/src/UI/Controls/UIControl_SlotList.cpp index 960772d23..249521f00 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SlotList.cpp @@ -1,9 +1,9 @@ #include "UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; } diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h b/targets/app/common/src/UI/Controls/UIControl_SlotList.h similarity index 75% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h rename to targets/app/common/src/UI/Controls/UIControl_SlotList.h index 973a29938..312a6f426 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h +++ b/targets/app/common/src/UI/Controls/UIControl_SlotList.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_SlotList : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp rename to targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp index e06cf18bd..6878cbcd8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -1,10 +1,10 @@ #include "UIControl_SpaceIndicatorBar.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h similarity index 75% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h rename to targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h index 0a4876a22..97133aac6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/targets/app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -7,11 +7,11 @@ #include #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_SpaceIndicatorBar.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_SpaceIndicatorBar : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp b/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp rename to targets/app/common/src/UI/Controls/UIControl_TextInput.cpp index a8e8a481a..8ddab0111 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_TextInput.cpp @@ -1,10 +1,10 @@ #include "UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "console_helpers/StringHelpers.h" UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; } diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h b/targets/app/common/src/UI/Controls/UIControl_TextInput.h similarity index 63% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h rename to targets/app/common/src/UI/Controls/UIControl_TextInput.h index 23c0c73da..5aa54ba8a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h +++ b/targets/app/common/src/UI/Controls/UIControl_TextInput.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_TextInput : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp rename to targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp index 5b1334f2d..4dedcf21a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.cpp @@ -1,11 +1,11 @@ #include "UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "console_helpers/StringHelpers.h" UIControl_TexturePackList::UIControl_TexturePackList() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h similarity index 72% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h rename to targets/app/common/src/UI/Controls/UIControl_TexturePackList.h index c97336ab5..5aa3d1532 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h +++ b/targets/app/common/src/UI/Controls/UIControl_TexturePackList.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "UIControl_Base.h" class UIControl_TexturePackList : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp b/targets/app/common/src/UI/Controls/UIControl_Touch.cpp similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp rename to targets/app/common/src/UI/Controls/UIControl_Touch.cpp index 7fc002af3..4cf6e9dc4 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp +++ b/targets/app/common/src/UI/Controls/UIControl_Touch.cpp @@ -1,8 +1,8 @@ #include "UIControl_Touch.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/linux/Iggy/include/iggy.h" UIControl_Touch::UIControl_Touch() {} diff --git a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h b/targets/app/common/src/UI/Controls/UIControl_Touch.h similarity index 58% rename from targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h rename to targets/app/common/src/UI/Controls/UIControl_Touch.h index 6a3f8beee..808083618 100644 --- a/targets/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h +++ b/targets/app/common/src/UI/Controls/UIControl_Touch.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Touch.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIControl_Base.h" class UIControl_Touch : public UIControl_Base { diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 614fe497e..e4991e5f9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -1,21 +1,21 @@ -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" #include #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/compression.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/chunk/ChunkSource.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index 2dd95773a..bb6dbf83e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -2,14 +2,14 @@ #ifdef _DEBUG_MENUS_ENABLED #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp index 90a26896b..6dc729eae 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,11 +1,11 @@ #include "UIScene_DebugOptions.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_App.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h index c8017ed61..66bab0db1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index 3cfa322f8..ea369d873 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" #include @@ -7,17 +7,17 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/commands/common/EnchantItemCommand.h" #include "minecraft/commands/common/GiveItemCommand.h" #include "minecraft/commands/common/TimeCommand.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h similarity index 83% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h index 3be35b7a6..aaeea9ff8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -5,13 +5,13 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "java/Class.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp similarity index 88% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index a9421281e..e2f5492c3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" #include @@ -8,16 +8,16 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/world/phys/Vec3.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h similarity index 79% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h rename to targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h index 1582caab2..acebce1ec 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/targets/app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -2,14 +2,14 @@ #ifdef _DEBUG_MENUS_ENABLED #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index d8025cc0e..57f33b15e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -5,14 +5,14 @@ #include #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_structs.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" #include "minecraft/client/skins/TexturePackRepository.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index 76b7cf5f8..0c9a60927 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -3,13 +3,13 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index b20faf053..c93a40b7f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -10,22 +10,22 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" +#include "app/common/src/UI/UILayer.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/NetTypes.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index 61bbb384f..35e216162 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -6,18 +6,18 @@ #include "platform/sdl2/Storage.h" #include "IUIScene_StartGame.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class DLCPack; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 6317eddb5..8c7f7a192 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -2,13 +2,13 @@ #include "UIScene_DLCMainMenu.h" #include "4J.Common/4J_InputActions.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "strings.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h similarity index 79% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index d5e9baced..b5ae25c3d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -3,12 +3,12 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index c873b0b80..c2675727a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -6,13 +6,13 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_DLCList.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "strings.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h similarity index 79% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index 9e1f950b3..52b4c038b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -3,14 +3,14 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_DLCList.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index 8b6fe567a..f795cdae6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -7,14 +7,14 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h similarity index 77% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index fa00a45ab..0a631b5f0 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index 5bc9ba0a8..bc0d286cf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,10 +1,10 @@ #include "UIScene_Intro.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_UIController.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h similarity index 84% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index bb0093a11..8d065ddee 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 78fbcaaa9..5115b47e5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -7,18 +7,18 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/SessionInfo.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/SessionInfo.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/Difficulty.h" #include "minecraft/world/level/LevelSettings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h similarity index 88% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 9e2f6e3a2..68e12166c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -3,12 +3,12 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class FriendSessionInfo; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index fc36ac827..86c7f8274 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -8,17 +8,17 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index dbd83f257..4f27615e7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -2,17 +2,17 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 016ed8984..2cd90177a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -10,16 +10,16 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/Leaderboards/LeaderboardInterface.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index a6b04befd..8002f5eb2 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -5,14 +5,14 @@ #include "4J.Common/4J_Compat.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/Leaderboards/LeaderboardInterface.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_LeaderboardList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index d4195cf60..4ff4d5981 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -8,23 +8,23 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h" +#include "app/common/src/UI/UILayer.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/NetTypes.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" #include "minecraft/client/skins/DLCTexturePack.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index b04de9d6e..11c328757 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -5,17 +5,17 @@ #include "platform/sdl2/Storage.h" #include "IUIScene_StartGame.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/Controls/UIControl_TexturePackList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class DLCPack; class LevelGenerationOptions; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index fe47da632..6b472ba3b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -9,19 +9,19 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/SessionInfo.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/SessionInfo.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SaveList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/NetTypes.h" #include "java/File.h" #include "java/InputOutputStream/FileInputStream.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 7f340e89a..3a6e01168 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -6,13 +6,13 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SaveList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index 349256c00..b6695b4cf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -9,18 +9,18 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index e617206a0..f1ec86cf1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -6,12 +6,12 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" #include "java/Random.h" class Random; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp similarity index 89% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 0a905c6bb..95f6507bd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -4,14 +4,14 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Common/App_Defines.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h similarity index 78% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index ccb2739bc..778a81deb 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 46eb1d451..c9e82a935 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -5,13 +5,13 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Common/App_Defines.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h similarity index 77% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index 111879294..87f8c03f5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -2,12 +2,12 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index 9ce07ff5f..c49652bc6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -3,10 +3,10 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_Defines.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h rename to targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index 791bfd85e..c4f65b0b5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/targets/app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index 1176321a9..384eec959 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -6,14 +6,14 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/BuildVer/BuildVer.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index 243be55d2..125cc3caf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -2,14 +2,14 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp index 5c98ee2d2..b1ae270a6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -5,10 +5,10 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h index 995df1d73..d3a03a3cd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index 0351ce98c..7de55caf9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -3,11 +3,11 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index 95214bb2f..ebd22e0b5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 385c2acc5..77fd1fb7a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -7,11 +7,11 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h index dc33483bd..361d5ba94 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 2dee65957..bd18779c1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -4,11 +4,11 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 4909e3cfc..9be1c0190 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 8a6bd238f..319b3fe7e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,11 +1,11 @@ #include "UIScene_LanguageSelector.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index bb9efeed2..153fd1fd3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -2,15 +2,15 @@ #include -#include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/App_Defines.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_ButtonList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index eb8925397..85c2d391b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -2,10 +2,10 @@ #include "UIScene_ReinstallMenu.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index 0e7dadc8d..42beb08f9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 0c0df31ad..c4064f9a6 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -4,12 +4,12 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index c1c569db3..50392e508 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index 8b4a7ad26..0afff076e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -3,12 +3,12 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h similarity index 82% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index 27677b683..65f1ecc90 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index fabbfbb2c..c1e936f95 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -4,14 +4,14 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h similarity index 82% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index ec2e4110e..08a10f1cf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index c4f2de98c..331e0d5de 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -3,11 +3,11 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index 61e681fce..e3aed600f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -3,10 +3,10 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 0b95314b6..ae07422fb 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -6,16 +6,16 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/sounds/SoundTypes.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h similarity index 83% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index 109449aac..c01e79854 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 52d86bb20..bdca8770f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -5,13 +5,13 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index a7eb97477..95c12cb78 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Slider.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 4cca644e0..b6b932adf 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -8,18 +8,18 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Common/App_Defines.h" -#include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/Minecraft_Macros.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "SkinBox.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h rename to targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index c5cd3b2d2..a20063195 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/targets/app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -4,15 +4,15 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/include/SkinBox.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/include/SkinBox.h" #include "console_helpers/Definitions.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 0f0527fc6..bc4881a7c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -5,16 +5,16 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Cursor.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/util/HtmlString.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h similarity index 84% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index 6becd0c21..af61a17bc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -3,14 +3,14 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Cursor.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class AbstractContainerMenu; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 845b8bc58..22e637c17 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -9,14 +9,14 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h similarity index 78% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index 696144aad..b6055d98e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -3,16 +3,16 @@ #include #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/IUIScene_AnvilMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/inventory/MerchantMenu.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index 6e2fa42a0..a0427e3a7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -4,14 +4,14 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h similarity index 83% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index 633472e32..3fa56b6af 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -2,15 +2,15 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_BeaconMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BeaconEffectButton.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index 25c0aae0e..336de2ca5 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -3,15 +3,15 @@ #include #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/BrewingStandMenu.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h similarity index 78% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h index 4ff3b123a..7f25e6e58 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h @@ -3,14 +3,14 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/IUIScene_BrewingMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index d45b4ba6f..3723aeffd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -4,14 +4,14 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h similarity index 76% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h index dc1751548..945e4f542 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/IUIScene_ContainerMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index 6ca8b4391..55316a758 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -4,19 +4,19 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/XboxStubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index d3441d7ff..106bc7b32 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -2,14 +2,14 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 4a78fd510..3adfda8aa 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -4,14 +4,14 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/TrapMenu.h" #include "minecraft/world/level/tile/entity/DispenserTileEntity.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h similarity index 75% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h index 55afe18d8..035cbfe03 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/IUIScene_DispenserMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index f23974bbf..d7de9e58e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -6,16 +6,16 @@ #include #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" +#include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/EnchantmentMenu.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h similarity index 74% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index ae17acb11..6557fd50c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -2,16 +2,16 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_EnchantingMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_EnchantmentBook.h" +#include "app/common/src/UI/Controls/UIControl_EnchantmentButton.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index 48dc6abb6..1792129b3 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -4,13 +4,13 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/player/LocalPlayer.h" #include "minecraft/world/inventory/FireworksMenu.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h similarity index 76% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index 714a18587..ee47ad97f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -2,14 +2,14 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_FireworksMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 027800656..71472eeef 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -4,14 +4,14 @@ #include #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/inventory/FurnaceMenu.h" #include "minecraft/world/level/tile/entity/FurnaceTileEntity.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h similarity index 78% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h index e2363d86b..ea10109fc 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h @@ -3,14 +3,14 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/IUIScene_FurnaceMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp similarity index 91% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index 7b019b4bf..d42c81b74 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -4,14 +4,14 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Inventory.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h similarity index 75% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h index d4fe7f131..5d67ddc3a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/IUIScene_HopperMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 338e48490..679e8c8a9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -4,17 +4,17 @@ #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/animal/EntityHorse.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h similarity index 77% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index 77cf5c144..20f6a8ced 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -2,15 +2,15 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" class InventoryMenu; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 7e526002b..0b985210f 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -7,14 +7,14 @@ #include #include -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h similarity index 78% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index c50d575a8..d2b98ec6e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -2,14 +2,14 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_InventoryMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_MinecraftPlayer.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" #include "UIScene_AbstractContainerMenu.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 73cee54e0..77848b372 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -7,15 +7,15 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index 48f3139d0..b2bcc3564 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -2,14 +2,14 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_TradingMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class InventoryMenu; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 58d318b24..32b538ed1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -3,16 +3,16 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/player/LocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index bba54b8d7..e8c8eb74c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -3,14 +3,14 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/IUIScene_CraftingMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SlotList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class AbstractContainerMenu; class ItemInstance; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index cd18f01b7..3b1324a3a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -6,16 +6,16 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Storage.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/IUIScene_PauseMenu.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h similarity index 76% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index 7b6d0b299..9935cf3f1 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index c892e0ab9..2472f729e 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -9,11 +9,11 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h similarity index 81% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index e36a06cc9..939edc8c9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -3,10 +3,10 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 9c976fc8e..ef06d5753 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -4,15 +4,15 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 9679425ca..30613973b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 2c057ed91..e8b19da16 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -5,19 +5,19 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_PlayerList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h similarity index 82% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index 44c3a022f..719579929 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -5,13 +5,13 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_PlayerList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class INetworkPlayer; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index fe446005e..61d6aca9d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -4,17 +4,17 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h similarity index 86% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index c71478ff3..b51679d9b 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -4,14 +4,14 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_CheckBox.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class INetworkPlayer; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h index 022666257..b70fd17d9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_SaveList.h" +#include "app/common/src/UI/UIScene.h" class UIScene_InGameSaveManagementMenu : public UIScene { private: diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index dd7e7d416..edf0986d7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -7,18 +7,18 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/IUIScene_PauseMenu.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/client/skins/DLCTexturePack.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index 6cde37107..7b510ea0c 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -3,11 +3,11 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/IUIScene_PauseMenu.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index aaa702d60..f98889b04 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -3,14 +3,14 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index 1a5f9faa4..b3a4a6de8 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -3,12 +3,12 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class SignTileEntity; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp similarity index 94% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 199373c19..0f7245ed9 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -4,16 +4,16 @@ #include #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_PlayerList.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/ClientConnection.h" #include "minecraft/network/packet/GameCommandPacket.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h similarity index 78% rename from targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h rename to targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index a6e567baf..5d5353e4a 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/targets/app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -3,13 +3,13 @@ #include #include -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_PlayerList.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/include/NetTypes.h" class INetworkPlayer; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp rename to targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index 4cb9fb536..af310e054 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -3,16 +3,16 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" #include "minecraft/network/packet/DisconnectPacket.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.h similarity index 77% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h rename to targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.h index 287d24829..fc93b21dd 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h +++ b/targets/app/common/src/UI/Scenes/UIScene_ConnectingProgress.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp rename to targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index 9e273840d..83e4e0770 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -7,17 +7,17 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/C4JThread.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.h similarity index 79% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h rename to targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.h index 14b05d8c2..549329eda 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h +++ b/targets/app/common/src/UI/Scenes/UIScene_FullscreenProgress.h @@ -2,14 +2,14 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_Progress.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" class C4JThread; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp rename to targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp index 3fd01247e..aa5633e16 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.cpp @@ -1,14 +1,14 @@ #include "UIScene_Keyboard.h" #include "4J.Common/4J_InputActions.h" -#include "Common/App_Defines.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/StringHelpers.h" #include "strings.h" diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h similarity index 87% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h rename to targets/app/common/src/UI/Scenes/UIScene_Keyboard.h index 3da8be9df..66e5be7f7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h +++ b/targets/app/common/src/UI/Scenes/UIScene_Keyboard.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/Controls/UIControl_TextInput.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp similarity index 92% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp rename to targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp index 96bc20e4f..050b5e247 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.cpp @@ -4,13 +4,13 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "strings.h" UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h similarity index 83% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h rename to targets/app/common/src/UI/Scenes/UIScene_MessageBox.h index be01c337b..4f4c340b7 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h +++ b/targets/app/common/src/UI/Scenes/UIScene_MessageBox.h @@ -3,12 +3,12 @@ #include #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl_Button.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp similarity index 95% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp rename to targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index ae8554416..273387817 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -7,12 +7,12 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UILayer.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "strings.h" UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData, diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h similarity index 90% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h rename to targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h index ebfb43d78..e09f5a78d 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h +++ b/targets/app/common/src/UI/Scenes/UIScene_QuadrantSignin.h @@ -3,13 +3,13 @@ #include #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "app/common/src/UI/Controls/UIControl_Label.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/iggy.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp b/targets/app/common/src/UI/Scenes/UIScene_Timer.cpp similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp rename to targets/app/common/src/UI/Scenes/UIScene_Timer.cpp index df25a4b3c..66ade73ed 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp +++ b/targets/app/common/src/UI/Scenes/UIScene_Timer.cpp @@ -1,7 +1,7 @@ #include "UIScene_Timer.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h b/targets/app/common/src/UI/Scenes/UIScene_Timer.h similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h rename to targets/app/common/src/UI/Scenes/UIScene_Timer.h index d120649ab..788f64055 100644 --- a/targets/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h +++ b/targets/app/common/src/UI/Scenes/UIScene_Timer.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/UIScene.h" class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp b/targets/app/common/src/UI/UIBitmapFont.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp rename to targets/app/common/src/UI/UIBitmapFont.cpp index fdeee3fa0..1570e84cb 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp +++ b/targets/app/common/src/UI/UIBitmapFont.cpp @@ -1,8 +1,8 @@ #include "UIBitmapFont.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/include/BufferedImage.h" #include "UIFontData.h" ///////////////////////////// diff --git a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.h b/targets/app/common/src/UI/UIBitmapFont.h similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/UIBitmapFont.h rename to targets/app/common/src/UI/UIBitmapFont.h index f3ed573fe..c18d1bc5b 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIBitmapFont.h +++ b/targets/app/common/src/UI/UIBitmapFont.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" struct SFontData; class CFontData; diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.cpp b/targets/app/common/src/UI/UIController.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/UIController.cpp rename to targets/app/common/src/UI/UIController.cpp index c3f5e9f01..817005d3d 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIController.cpp +++ b/targets/app/common/src/UI/UIController.cpp @@ -12,27 +12,27 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h" -#include "Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h" -#include "Minecraft.Client/Common/src/UI/UIBitmapFont.h" -#include "Minecraft.Client/Common/src/UI/UIGroup.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Common/src/UI/UIString.h" -#include "Minecraft.Client/Common/src/UI/UITTFFont.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/common/App_enums.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Components/UIComponent_DebugUIConsole.h" +#include "app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "app/common/src/UI/Components/UIComponent_PressStartToPlay.h" +#include "app/common/src/UI/Components/UIComponent_Tooltips.h" +#include "app/common/src/UI/Components/UIComponent_TutorialPopup.h" +#include "app/common/src/UI/Components/UIScene_HUD.h" +#include "app/common/src/UI/UIBitmapFont.h" +#include "app/common/src/UI/UIGroup.h" +#include "app/common/src/UI/UIScene.h" +#include "app/common/src/UI/UIString.h" +#include "app/common/src/UI/UITTFFont.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/BufferedImage.h" #include "UIFontData.h" #include "XboxStubs.h" #include "console_helpers/C4JThread.h" @@ -57,7 +57,7 @@ class Tutorial; // #define ENABLE_IGGY_EXPLORER #if defined(ENABLE_IGGY_EXPLORER) -#include "Minecraft.Client/Windows64/Iggy/include/iggyexpruntime.h" +#include "app/windows/Iggy/include/iggyexpruntime.h" #endif // #define ENABLE_IGGY_PERFMON @@ -67,7 +67,7 @@ class Tutorial; #define PM_ORIGIN_Y 34 #if defined(__WINDOWS64) -#include "Minecraft.Client/Windows64/Iggy/include/iggyperfmon.h" +#include "app/windows/Iggy/include/iggyperfmon.h" #endif #endif @@ -348,17 +348,17 @@ UITTFFont* UIController::createFont(EFont fontLanguage) { case eFont_Japanese: return new UITTFFont( "Mojangles_TTF_jaJP", - "Minecraft.Client/Common/Media/font/JPN/DFGMaruGothic-Md.ttf", + "app/common/Media/font/JPN/DFGMaruGothic-Md.ttf", 0x2022); // JPN case eFont_TradChinese: return new UITTFFont( "Mojangles_TTF_cnTD", - "Minecraft.Client/Common/Media/font/CHT/DFHeiMedium-B5.ttf", + "app/common/Media/font/CHT/DFHeiMedium-B5.ttf", 0x2022); // CHT case eFont_Korean: return new UITTFFont( "Mojangles_TTF_koKR", - "Minecraft.Client/Common/Media/font/KOR/BOKMSD.ttf", + "app/common/Media/font/KOR/BOKMSD.ttf", 0x2022); // KOR // 4J-JEV, Cyrillic characters have been added to this font now, // (4/July/14) XC_LANGUAGE_RUSSIAN and XC_LANGUAGE_GREEK: diff --git a/targets/Minecraft.Client/Common/src/UI/UIController.h b/targets/app/common/src/UI/UIController.h similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/UIController.h rename to targets/app/common/src/UI/UIController.h index b47299c60..57cb8594e 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIController.h +++ b/targets/app/common/src/UI/UIController.h @@ -9,21 +9,21 @@ #include #ifdef __linux__ -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Stubs/d3d11_stubs.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Stubs/d3d11_stubs.h" #elif defined(_WINDOWS64) -#include "Minecraft.Client/Windows64/Iggy/include/iggy.h" +#include "app/windows/Iggy/include/iggy.h" #endif #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIController.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/IUIController.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/linux/Iggy/include/rrCore.h" #include "UIGroup.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIFontData.cpp b/targets/app/common/src/UI/UIFontData.cpp similarity index 99% rename from targets/Minecraft.Client/Common/src/UI/UIFontData.cpp rename to targets/app/common/src/UI/UIFontData.cpp index 6be8cab65..b72a6209c 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIFontData.cpp +++ b/targets/app/common/src/UI/UIFontData.cpp @@ -4,7 +4,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" ///////////////////////////////////////////////////// // --- -- --- THIS FILE IS IN UNICODE --- -- --- // diff --git a/targets/Minecraft.Client/Common/src/UI/UIFontData.h b/targets/app/common/src/UI/UIFontData.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/UIFontData.h rename to targets/app/common/src/UI/UIFontData.h diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp b/targets/app/common/src/UI/UIGroup.cpp similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/UIGroup.cpp rename to targets/app/common/src/UI/UIGroup.cpp index d579ec68c..f2bc43ab6 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIGroup.cpp +++ b/targets/app/common/src/UI/UIGroup.cpp @@ -2,13 +2,13 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/UILayer.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "minecraft/client/MemoryTracker.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIGroup.h b/targets/app/common/src/UI/UIGroup.h similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/UIGroup.h rename to targets/app/common/src/UI/UIGroup.h index bdf0c4d44..a71a4e1eb 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIGroup.h +++ b/targets/app/common/src/UI/UIGroup.h @@ -2,8 +2,8 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/linux/Iggy/include/rrCore.h" #include "UILayer.h" class UIComponent_Tooltips; diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp b/targets/app/common/src/UI/UILayer.cpp similarity index 80% rename from targets/Minecraft.Client/Common/src/UI/UILayer.cpp rename to targets/app/common/src/UI/UILayer.cpp index 1edab6312..2c2fd78ca 100644 --- a/targets/Minecraft.Client/Common/src/UI/UILayer.cpp +++ b/targets/app/common/src/UI/UILayer.cpp @@ -3,82 +3,82 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h" -#include "Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h" -#include "Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h" -#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h" -#include "Minecraft.Client/Common/src/UI/UIGroup.h" -#include "Minecraft.Client/Common/src/UI/UIScene.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/Components/UIComponent_Chat.h" +#include "app/common/src/UI/Components/UIComponent_DebugUIConsole.h" +#include "app/common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "app/common/src/UI/Components/UIComponent_Logo.h" +#include "app/common/src/UI/Components/UIComponent_MenuBackground.h" +#include "app/common/src/UI/Components/UIComponent_Panorama.h" +#include "app/common/src/UI/Components/UIComponent_PressStartToPlay.h" +#include "app/common/src/UI/Components/UIComponent_Tooltips.h" +#include "app/common/src/UI/Components/UIComponent_TutorialPopup.h" +#include "app/common/src/UI/Components/UIScene_HUD.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugOptions.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "app/common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" +#include "app/common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_Credits.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" +#include "app/common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" +#include "app/common/src/UI/Scenes/UIScene_ConnectingProgress.h" +#include "app/common/src/UI/Scenes/UIScene_FullscreenProgress.h" +#include "app/common/src/UI/Scenes/UIScene_Keyboard.h" +#include "app/common/src/UI/Scenes/UIScene_MessageBox.h" +#include "app/common/src/UI/Scenes/UIScene_QuadrantSignin.h" +#include "app/common/src/UI/Scenes/UIScene_Timer.h" +#include "app/common/src/UI/UIGroup.h" +#include "app/common/src/UI/UIScene.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" UILayer::UILayer(UIGroup* parent) { m_parentGroup = parent; diff --git a/targets/Minecraft.Client/Common/src/UI/UILayer.h b/targets/app/common/src/UI/UILayer.h similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/UILayer.h rename to targets/app/common/src/UI/UILayer.h index 21e41cbb1..651d360cb 100644 --- a/targets/Minecraft.Client/Common/src/UI/UILayer.h +++ b/targets/app/common/src/UI/UILayer.h @@ -7,8 +7,8 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/linux/Iggy/include/rrCore.h" // using namespace std; class UIScene; diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp b/targets/app/common/src/UI/UIScene.cpp similarity index 98% rename from targets/Minecraft.Client/Common/src/UI/UIScene.cpp rename to targets/app/common/src/UI/UIScene.cpp index 79fa52629..7263304f4 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIScene.cpp +++ b/targets/app/common/src/UI/UIScene.cpp @@ -7,18 +7,18 @@ #include "4J.Common/4J_Compat.h" #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/src/UI/UIController.h" -#include "Minecraft.Client/Common/src/UI/UIGroup.h" -#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/common/src/UI/UIController.h" +#include "app/common/src/UI/UIGroup.h" +#include "app/common/src/UI/UILayer.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" #include "java/System.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UIScene.h b/targets/app/common/src/UI/UIScene.h similarity index 96% rename from targets/Minecraft.Client/Common/src/UI/UIScene.h rename to targets/app/common/src/UI/UIScene.h index d19a776c1..629da33e8 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIScene.h +++ b/targets/app/common/src/UI/UIScene.h @@ -14,11 +14,11 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Controls/UIControl_Base.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class ItemRenderer; class UILayer; diff --git a/targets/Minecraft.Client/Common/src/UI/UIString.cpp b/targets/app/common/src/UI/UIString.cpp similarity index 97% rename from targets/Minecraft.Client/Common/src/UI/UIString.cpp rename to targets/app/common/src/UI/UIString.cpp index 5168ac18c..314512ee2 100644 --- a/targets/Minecraft.Client/Common/src/UI/UIString.cpp +++ b/targets/app/common/src/UI/UIString.cpp @@ -1,7 +1,7 @@ #include "UIString.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/linux/Linux_App.h" +#include "app/include/XboxStubs.h" #include "console_helpers/StringHelpers.h" bool UIString::setCurrentLanguage() { diff --git a/targets/Minecraft.Client/Common/src/UI/UIString.h b/targets/app/common/src/UI/UIString.h similarity index 100% rename from targets/Minecraft.Client/Common/src/UI/UIString.h rename to targets/app/common/src/UI/UIString.h diff --git a/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp b/targets/app/common/src/UI/UITTFFont.cpp similarity index 93% rename from targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp rename to targets/app/common/src/UI/UITTFFont.cpp index d7d67be4c..810377f71 100644 --- a/targets/Minecraft.Client/Common/src/UI/UITTFFont.cpp +++ b/targets/app/common/src/UI/UITTFFont.cpp @@ -4,9 +4,9 @@ #include -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/Minecraft.Client/Common/src/UI/UITTFFont.h b/targets/app/common/src/UI/UITTFFont.h similarity index 85% rename from targets/Minecraft.Client/Common/src/UI/UITTFFont.h rename to targets/app/common/src/UI/UITTFFont.h index 9fcf60531..736ed9ba6 100644 --- a/targets/Minecraft.Client/Common/src/UI/UITTFFont.h +++ b/targets/app/common/src/UI/UITTFFont.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/linux/Iggy/include/rrCore.h" class UITTFFont { private: diff --git a/targets/Minecraft.Client/include/BufferedImage.h b/targets/app/include/BufferedImage.h similarity index 100% rename from targets/Minecraft.Client/include/BufferedImage.h rename to targets/app/include/BufferedImage.h diff --git a/targets/Minecraft.Client/include/FrameProfiler.h b/targets/app/include/FrameProfiler.h similarity index 100% rename from targets/Minecraft.Client/include/FrameProfiler.h rename to targets/app/include/FrameProfiler.h diff --git a/targets/Minecraft.Client/include/MemTexture.h b/targets/app/include/MemTexture.h similarity index 100% rename from targets/Minecraft.Client/include/MemTexture.h rename to targets/app/include/MemTexture.h diff --git a/targets/Minecraft.Client/include/MemTextureProcessor.h b/targets/app/include/MemTextureProcessor.h similarity index 100% rename from targets/Minecraft.Client/include/MemTextureProcessor.h rename to targets/app/include/MemTextureProcessor.h diff --git a/targets/Minecraft.Client/include/MobSkinMemTextureProcessor.h b/targets/app/include/MobSkinMemTextureProcessor.h similarity index 86% rename from targets/Minecraft.Client/include/MobSkinMemTextureProcessor.h rename to targets/app/include/MobSkinMemTextureProcessor.h index c3a3734c6..f1e4879bf 100644 --- a/targets/Minecraft.Client/include/MobSkinMemTextureProcessor.h +++ b/targets/app/include/MobSkinMemTextureProcessor.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/include/MemTextureProcessor.h" +#include "app/include/MemTextureProcessor.h" class MobSkinMemTextureProcessor : public MemTextureProcessor { private: diff --git a/targets/Minecraft.Client/include/NetTypes.h b/targets/app/include/NetTypes.h similarity index 100% rename from targets/Minecraft.Client/include/NetTypes.h rename to targets/app/include/NetTypes.h diff --git a/targets/Minecraft.Client/include/SkinBox.h b/targets/app/include/SkinBox.h similarity index 100% rename from targets/Minecraft.Client/include/SkinBox.h rename to targets/app/include/SkinBox.h diff --git a/targets/Minecraft.Client/include/XboxStubs.h b/targets/app/include/XboxStubs.h similarity index 100% rename from targets/Minecraft.Client/include/XboxStubs.h rename to targets/app/include/XboxStubs.h diff --git a/targets/app/include/stdafx.h b/targets/app/include/stdafx.h new file mode 100644 index 000000000..a7192dee5 --- /dev/null +++ b/targets/app/include/stdafx.h @@ -0,0 +1,21 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#pragma once + +#ifdef _WINDOWS64 +#include "app/common/src/Audio/SoundEngine.h" +#include "app/windows/Iggy/gdraw/gdraw_d3d11.h" +#include "app/windows/Iggy/include/iggy.h" +#include "app/windows/Windows64_App.h" +#include "app/windows/Windows64_UIController.h" +#include "app/windows/XML/ATGXmlParser.h" +#else +#include "app/common/src/Audio/SoundEngine.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/LinuxStubs.h" +#endif diff --git a/targets/Minecraft.Client/include/stubs.h b/targets/app/include/stubs.h similarity index 100% rename from targets/Minecraft.Client/include/stubs.h rename to targets/app/include/stubs.h diff --git a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c b/targets/app/linux/Iggy/gdraw/gdraw.c similarity index 99% rename from targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c rename to targets/app/linux/Iggy/gdraw/gdraw.c index 2788af8f1..28e1cbeba 100644 --- a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.c +++ b/targets/app/linux/Iggy/gdraw/gdraw.c @@ -10,8 +10,7 @@ #include #include -#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/iggy.h" #include "SDL_video.h" #ifndef _ENABLEIGGY @@ -680,7 +679,7 @@ static void gdraw_FramebufferRenderbufferSafe(GLenum target, GLenum attachment, #define glFramebufferRenderbuffer_SAFE gdraw_FramebufferRenderbufferSafe #define glFramebufferRenderbuffer glFramebufferRenderbuffer_SAFE -#include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_gl_shared.inl" +#include "app/windows/Iggy/gdraw/gdraw_gl_shared.inl" #undef glVertexAttribPointer #define glVertexAttribPointer gdraw_real_vtxattrib diff --git a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h b/targets/app/linux/Iggy/gdraw/gdraw.h similarity index 92% rename from targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h rename to targets/app/linux/Iggy/gdraw/gdraw.h index 0ffc9b09c..e8ab9566d 100644 --- a/targets/Minecraft.Client/Linux/Iggy/gdraw/gdraw.h +++ b/targets/app/linux/Iggy/gdraw/gdraw.h @@ -1,9 +1,9 @@ #ifndef __LINUX_IGGY_GDRAW_H__ #define __LINUX_IGGY_GDRAW_H__ -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h" -#include "Minecraft.Client/Windows64/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/windows/Iggy/include/gdraw.h" +#include "app/windows/Iggy/include/iggy.h" #ifdef __cplusplus extern "C" { diff --git a/targets/Minecraft.Client/Linux/Iggy/include/gdraw.h b/targets/app/linux/Iggy/include/gdraw.h similarity index 100% rename from targets/Minecraft.Client/Linux/Iggy/include/gdraw.h rename to targets/app/linux/Iggy/include/gdraw.h diff --git a/targets/Minecraft.Client/Linux/Iggy/include/iggy.h b/targets/app/linux/Iggy/include/iggy.h similarity index 100% rename from targets/Minecraft.Client/Linux/Iggy/include/iggy.h rename to targets/app/linux/Iggy/include/iggy.h diff --git a/targets/Minecraft.Client/Linux/Iggy/include/rrCore.h b/targets/app/linux/Iggy/include/rrCore.h similarity index 100% rename from targets/Minecraft.Client/Linux/Iggy/include/rrCore.h rename to targets/app/linux/Iggy/include/rrCore.h diff --git a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp similarity index 74% rename from targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp rename to targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp index b85df2419..e05e76820 100644 --- a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.cpp @@ -1,6 +1,6 @@ #include "LinuxLeaderboardManager.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" LeaderboardManager* LeaderboardManager::m_instance = new LinuxLeaderboardManager(); // Singleton instance of the diff --git a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h similarity index 95% rename from targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h rename to targets/app/linux/Leaderboards/LinuxLeaderboardManager.h index 317b22586..f1c2bffac 100644 --- a/targets/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h +++ b/targets/app/linux/Leaderboards/LinuxLeaderboardManager.h @@ -1,7 +1,7 @@ #pragma once #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" class LinuxLeaderboardManager : public LeaderboardManager { public: diff --git a/targets/Minecraft.Client/Linux/LinuxGL.cpp b/targets/app/linux/LinuxGL.cpp similarity index 99% rename from targets/Minecraft.Client/Linux/LinuxGL.cpp rename to targets/app/linux/LinuxGL.cpp index 3bbf3b0c9..6c2a565f1 100644 --- a/targets/Minecraft.Client/Linux/LinuxGL.cpp +++ b/targets/app/linux/LinuxGL.cpp @@ -1,7 +1,7 @@ #ifdef __linux__ #include "platform/sdl2/Render.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "gl3_loader.h" #include "java/ByteBuffer.h" #include "java/FloatBuffer.h" diff --git a/targets/Minecraft.Client/Linux/LinuxGL.h b/targets/app/linux/LinuxGL.h similarity index 100% rename from targets/Minecraft.Client/Linux/LinuxGL.h rename to targets/app/linux/LinuxGL.h diff --git a/targets/Minecraft.Client/Linux/Linux_App.cpp b/targets/app/linux/Linux_App.cpp similarity index 95% rename from targets/Minecraft.Client/Linux/Linux_App.cpp rename to targets/app/linux/Linux_App.cpp index 37b457809..51abccd06 100644 --- a/targets/Minecraft.Client/Linux/Linux_App.cpp +++ b/targets/app/linux/Linux_App.cpp @@ -7,10 +7,10 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "Common/App_enums.h" -#include "Minecraft.Client/Common/Consoles_App.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "app/common/App_enums.h" +#include "app/common/Consoles_App.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" #include "console_helpers/C4JThread.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" diff --git a/targets/Minecraft.Client/Linux/Linux_App.h b/targets/app/linux/Linux_App.h similarity index 93% rename from targets/Minecraft.Client/Linux/Linux_App.h rename to targets/app/linux/Linux_App.h index b1f76ee8e..472b6af54 100644 --- a/targets/Minecraft.Client/Linux/Linux_App.h +++ b/targets/app/linux/Linux_App.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Consoles_App.h" +#include "app/common/App_enums.h" +#include "app/common/Consoles_App.h" class C4JStringTable; diff --git a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp b/targets/app/linux/Linux_Minecraft.cpp similarity index 99% rename from targets/Minecraft.Client/Linux/Linux_Minecraft.cpp rename to targets/app/linux/Linux_Minecraft.cpp index 4d68989ce..4171acb86 100644 --- a/targets/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/targets/app/linux/Linux_Minecraft.cpp @@ -46,7 +46,7 @@ static void sigsegv_handler(int sig) { #include "minecraft/stats/StatsCounter.h" #include "minecraft/world/level/Level.h" -// #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +// #include "app/common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "4J.Common/4J_Compat.h" @@ -55,11 +55,11 @@ static void sigsegv_handler(int sig) { #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_Defines.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "console_helpers/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" diff --git a/targets/Minecraft.Client/Linux/Linux_ShutdownManager.cpp b/targets/app/linux/Linux_ShutdownManager.cpp similarity index 92% rename from targets/Minecraft.Client/Linux/Linux_ShutdownManager.cpp rename to targets/app/linux/Linux_ShutdownManager.cpp index bf9893888..1ad6954ee 100644 --- a/targets/Minecraft.Client/Linux/Linux_ShutdownManager.cpp +++ b/targets/app/linux/Linux_ShutdownManager.cpp @@ -1,6 +1,6 @@ // Linux stub implementations for ShutdownManager // The PS3/PSVita versions have full implementations; on Linux these are no-ops. -#include "Minecraft.Client/Common/ShutdownManager.h" +#include "app/common/ShutdownManager.h" #include "console_helpers/C4JThread.h" void ShutdownManager::Initialise() {} diff --git a/targets/Minecraft.Client/Linux/Linux_UIController.cpp b/targets/app/linux/Linux_UIController.cpp similarity index 91% rename from targets/Minecraft.Client/Linux/Linux_UIController.cpp rename to targets/app/linux/Linux_UIController.cpp index c1303aced..593215171 100644 --- a/targets/Minecraft.Client/Linux/Linux_UIController.cpp +++ b/targets/app/linux/Linux_UIController.cpp @@ -3,12 +3,12 @@ // GDraw GL backend for Linux #include "platform/sdl2/Render.h" #include "Linux_UIController.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Linux/Iggy/gdraw/gdraw.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Windows64/Iggy/include/gdraw.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/linux/Iggy/gdraw/gdraw.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" +#include "app/linux/Linux_App.h" +#include "app/windows/Iggy/include/gdraw.h" ConsoleUIController ui; diff --git a/targets/Minecraft.Client/Linux/Linux_UIController.h b/targets/app/linux/Linux_UIController.h similarity index 79% rename from targets/Minecraft.Client/Linux/Linux_UIController.h rename to targets/app/linux/Linux_UIController.h index 6d36efe1f..38dcd6d12 100644 --- a/targets/Minecraft.Client/Linux/Linux_UIController.h +++ b/targets/app/linux/Linux_UIController.h @@ -1,9 +1,9 @@ #pragma once -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/UIController.h" -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Linux/Iggy/include/rrCore.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/UIController.h" +#include "app/linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/rrCore.h" class ConsoleUIController : public UIController { public: diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXCollision.h b/targets/app/linux/Stubs/DirectXMath/DirectXCollision.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXCollision.h rename to targets/app/linux/Stubs/DirectXMath/DirectXCollision.h diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXCollision.inl b/targets/app/linux/Stubs/DirectXMath/DirectXCollision.inl similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXCollision.inl rename to targets/app/linux/Stubs/DirectXMath/DirectXCollision.inl diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXColors.h b/targets/app/linux/Stubs/DirectXMath/DirectXColors.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXColors.h rename to targets/app/linux/Stubs/DirectXMath/DirectXColors.h diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h b/targets/app/linux/Stubs/DirectXMath/DirectXMath.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h rename to targets/app/linux/Stubs/DirectXMath/DirectXMath.h diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathConvert.inl b/targets/app/linux/Stubs/DirectXMath/DirectXMathConvert.inl similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathConvert.inl rename to targets/app/linux/Stubs/DirectXMath/DirectXMathConvert.inl diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathMatrix.inl b/targets/app/linux/Stubs/DirectXMath/DirectXMathMatrix.inl similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathMatrix.inl rename to targets/app/linux/Stubs/DirectXMath/DirectXMathMatrix.inl diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathMisc.inl b/targets/app/linux/Stubs/DirectXMath/DirectXMathMisc.inl similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathMisc.inl rename to targets/app/linux/Stubs/DirectXMath/DirectXMathMisc.inl diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathVector.inl b/targets/app/linux/Stubs/DirectXMath/DirectXMathVector.inl similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMathVector.inl rename to targets/app/linux/Stubs/DirectXMath/DirectXMathVector.inl diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXPackedVector.h b/targets/app/linux/Stubs/DirectXMath/DirectXPackedVector.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXPackedVector.h rename to targets/app/linux/Stubs/DirectXMath/DirectXPackedVector.h diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXPackedVector.inl b/targets/app/linux/Stubs/DirectXMath/DirectXPackedVector.inl similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/DirectXPackedVector.inl rename to targets/app/linux/Stubs/DirectXMath/DirectXPackedVector.inl diff --git a/targets/Minecraft.Client/Linux/Stubs/DirectXMath/sal.h b/targets/app/linux/Stubs/DirectXMath/sal.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/DirectXMath/sal.h rename to targets/app/linux/Stubs/DirectXMath/sal.h diff --git a/targets/Minecraft.Client/Linux/Stubs/LinuxStubs.h b/targets/app/linux/Stubs/LinuxStubs.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/LinuxStubs.h rename to targets/app/linux/Stubs/LinuxStubs.h diff --git a/targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h b/targets/app/linux/Stubs/d3d11_stubs.h similarity index 96% rename from targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h rename to targets/app/linux/Stubs/d3d11_stubs.h index 9496f7b9b..225255a4e 100644 --- a/targets/Minecraft.Client/Linux/Stubs/d3d11_stubs.h +++ b/targets/app/linux/Stubs/d3d11_stubs.h @@ -3,7 +3,7 @@ #pragma once -#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h" +#include "app/linux/Stubs/DirectXMath/DirectXMath.h" #include "winapi_stubs.h" using namespace DirectX; diff --git a/targets/Minecraft.Client/Linux/Stubs/iggy_stubs.h b/targets/app/linux/Stubs/iggy_stubs.h similarity index 99% rename from targets/Minecraft.Client/Linux/Stubs/iggy_stubs.h rename to targets/app/linux/Stubs/iggy_stubs.h index 52403a2d2..ef593a44e 100644 --- a/targets/Minecraft.Client/Linux/Stubs/iggy_stubs.h +++ b/targets/app/linux/Stubs/iggy_stubs.h @@ -3,7 +3,7 @@ #pragma once -#include "Minecraft.Client/Linux/Iggy/include/iggy.h" +#include "app/linux/Iggy/include/iggy.h" #define STUBBED \ { \ diff --git a/targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/targets/app/linux/Stubs/winapi_stubs.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/winapi_stubs.h rename to targets/app/linux/Stubs/winapi_stubs.h diff --git a/targets/Minecraft.Client/Linux/Stubs/xbox_stubs.h b/targets/app/linux/Stubs/xbox_stubs.h similarity index 100% rename from targets/Minecraft.Client/Linux/Stubs/xbox_stubs.h rename to targets/app/linux/Stubs/xbox_stubs.h diff --git a/targets/Minecraft.Client/Linux/linux_game_stubs.cpp b/targets/app/linux/linux_game_stubs.cpp similarity index 57% rename from targets/Minecraft.Client/Linux/linux_game_stubs.cpp rename to targets/app/linux/linux_game_stubs.cpp index 07c6e875f..d89528d77 100644 --- a/targets/Minecraft.Client/Linux/linux_game_stubs.cpp +++ b/targets/app/linux/linux_game_stubs.cpp @@ -1,7 +1,7 @@ #ifdef __linux__ -#include "Minecraft.Client/Common/Consoles_App.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/Consoles_App.h" +#include "app/include/stubs.h" void Display::update() {} diff --git a/targets/Minecraft.Client/meson.build b/targets/app/meson.build similarity index 74% rename from targets/Minecraft.Client/meson.build rename to targets/app/meson.build index 9410cba31..9721ff177 100644 --- a/targets/Minecraft.Client/meson.build +++ b/targets/app/meson.build @@ -1,10 +1,10 @@ exclude_sources = [ - ' ! -path "*/Common/*"', # added by platform_sources - ' ! -path "*/Linux/*"', # added by platform_sources - ' ! -path "*/Windows64/*"', # added by platform_sources + ' ! -path "*/common/*"', + ' ! -path "*/linux/*"', + ' ! -path "*/windows/*"', ] -# all sources except ./Platform/* +# all sources except common/, linux/, windows/ client_sources = run_command( 'sh', '-c', 'find "' @@ -14,27 +14,26 @@ client_sources = run_command( check: true, ).stdout().strip().split('\n') -# some platform-specific sources that are for some stupid reason in Common exclude_platform_common_sources = [ ' ! -name "UIScene_InGameSaveManagementMenu.cpp"', ] -# all sources in in ./Platform/Common +# all sources in common/ platform_sources = run_command( 'sh', '-c', 'find "' - + meson.current_source_dir() / 'Common' + + meson.current_source_dir() / 'common' + '" \\( -name "*.cpp" -o -name "*.c" \\)' + ' '.join(exclude_platform_common_sources), check: true, ).stdout().strip().split('\n') -# linux-specific files (everything in Platform/Linux) +# linux-specific files if host_machine.system() == 'linux' platform_sources += run_command( 'sh', '-c', 'find "' - + meson.current_source_dir() / 'Linux' + + meson.current_source_dir() / 'linux' + '" \\( -name "*.cpp" -o -name "*.c" \\) ', check: true, ).stdout().strip().split('\n') @@ -86,13 +85,10 @@ client = executable( install_dir: '', ) -# To support actually running the client from the build folder, we need to -# copy the generated assets from resources 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 + output: 'assets.stamp', command: [ python, meson.project_source_root() / 'scripts/copy_assets_to_client.py', diff --git a/targets/Minecraft.Client/src/BufferedImage.cpp b/targets/app/src/BufferedImage.cpp similarity index 96% rename from targets/Minecraft.Client/src/BufferedImage.cpp rename to targets/app/src/BufferedImage.cpp index c5da29cad..7a3ff7c9d 100644 --- a/targets/Minecraft.Client/src/BufferedImage.cpp +++ b/targets/app/src/BufferedImage.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/include/BufferedImage.h" #include @@ -8,11 +8,11 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PlatformTypes.h" #include "console_helpers/PathHelper.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/Minecraft.Client/src/Extrax64Stubs.cpp b/targets/app/src/Extrax64Stubs.cpp similarity index 97% rename from targets/Minecraft.Client/src/Extrax64Stubs.cpp rename to targets/app/src/Extrax64Stubs.cpp index 3501fb055..198aa13d1 100644 --- a/targets/Minecraft.Client/src/Extrax64Stubs.cpp +++ b/targets/app/src/Extrax64Stubs.cpp @@ -5,9 +5,9 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" +#include "app/include/XboxStubs.h" class INVITE_INFO; #if defined(_WINDOWS64) diff --git a/targets/Minecraft.Client/src/FrameProfiler.cpp b/targets/app/src/FrameProfiler.cpp similarity index 100% rename from targets/Minecraft.Client/src/FrameProfiler.cpp rename to targets/app/src/FrameProfiler.cpp diff --git a/targets/Minecraft.Client/src/stubs.cpp b/targets/app/src/stubs.cpp similarity index 93% rename from targets/Minecraft.Client/src/stubs.cpp rename to targets/app/src/stubs.cpp index a3489744a..114b56424 100644 --- a/targets/Minecraft.Client/src/stubs.cpp +++ b/targets/app/src/stubs.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #if defined(__linux__) void LinuxLogStubLightmapProbe() { diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d10_shaders.inl b/targets/app/windows/Iggy/gdraw/gdraw_d3d10_shaders.inl similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d10_shaders.inl rename to targets/app/windows/Iggy/gdraw/gdraw_d3d10_shaders.inl diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/targets/app/windows/Iggy/gdraw/gdraw_d3d11.cpp similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp rename to targets/app/windows/Iggy/gdraw/gdraw_d3d11.cpp diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h b/targets/app/windows/Iggy/gdraw/gdraw_d3d11.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h rename to targets/app/windows/Iggy/gdraw/gdraw_d3d11.h diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d1x_shared.inl b/targets/app/windows/Iggy/gdraw/gdraw_d3d1x_shared.inl similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d1x_shared.inl rename to targets/app/windows/Iggy/gdraw/gdraw_d3d1x_shared.inl diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_gl_shaders.inl b/targets/app/windows/Iggy/gdraw/gdraw_gl_shaders.inl similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_gl_shaders.inl rename to targets/app/windows/Iggy/gdraw/gdraw_gl_shaders.inl diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_gl_shared.inl b/targets/app/windows/Iggy/gdraw/gdraw_gl_shared.inl similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_gl_shared.inl rename to targets/app/windows/Iggy/gdraw/gdraw_gl_shared.inl diff --git a/targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl b/targets/app/windows/Iggy/gdraw/gdraw_shared.inl similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_shared.inl rename to targets/app/windows/Iggy/gdraw/gdraw_shared.inl diff --git a/targets/Minecraft.Client/Windows64/Iggy/include/gdraw.h b/targets/app/windows/Iggy/include/gdraw.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/include/gdraw.h rename to targets/app/windows/Iggy/include/gdraw.h diff --git a/targets/Minecraft.Client/Windows64/Iggy/include/iggy.h b/targets/app/windows/Iggy/include/iggy.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/include/iggy.h rename to targets/app/windows/Iggy/include/iggy.h diff --git a/targets/Minecraft.Client/Windows64/Iggy/include/iggyexpruntime.h b/targets/app/windows/Iggy/include/iggyexpruntime.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/include/iggyexpruntime.h rename to targets/app/windows/Iggy/include/iggyexpruntime.h diff --git a/targets/Minecraft.Client/Windows64/Iggy/include/iggyperfmon.h b/targets/app/windows/Iggy/include/iggyperfmon.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/include/iggyperfmon.h rename to targets/app/windows/Iggy/include/iggyperfmon.h diff --git a/targets/Minecraft.Client/Windows64/Iggy/include/rrCore.h b/targets/app/windows/Iggy/include/rrCore.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Iggy/include/rrCore.h rename to targets/app/windows/Iggy/include/rrCore.h diff --git a/targets/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp b/targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.cpp similarity index 100% rename from targets/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp rename to targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.cpp diff --git a/targets/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h b/targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.h similarity index 95% rename from targets/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h rename to targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.h index 2c7794075..7f4cdc1bb 100644 --- a/targets/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h +++ b/targets/app/windows/Source Files/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { public: diff --git a/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/targets/app/windows/Source Files/Windows64_Minecraft.cpp similarity index 99% rename from targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp rename to targets/app/windows/Source Files/Windows64_Minecraft.cpp index cdc2e221c..7ba9de0da 100644 --- a/targets/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/targets/app/windows/Source Files/Windows64_Minecraft.cpp @@ -5,7 +5,7 @@ #include -#include "Minecraft.Client/Common/src/Network/Socket.h" +#include "app/common/src/Network/Socket.h" #include "console_helpers/StringHelpers.h" #include "console_helpers/ThreadName.h" #include "minecraft/client/User.h" @@ -24,7 +24,7 @@ #include "minecraft/world/phys/AABB.h" #include "minecraft/world/phys/Vec3.h" // #include "Social/SocialManager.h" -// #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +// #include "app/common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "../Resource.h" diff --git a/targets/Minecraft.Client/Windows64/Windows64_App.cpp b/targets/app/windows/Windows64_App.cpp similarity index 98% rename from targets/Minecraft.Client/Windows64/Windows64_App.cpp rename to targets/app/windows/Windows64_App.cpp index 73f7c3c37..0617fd640 100644 --- a/targets/Minecraft.Client/Windows64/Windows64_App.cpp +++ b/targets/app/windows/Windows64_App.cpp @@ -1,7 +1,7 @@  #include "Windows64_App.h" -#include "Minecraft.Client/Common/Consoles_App.h" +#include "app/common/Consoles_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/User.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/Minecraft.Client/Windows64/Windows64_App.h b/targets/app/windows/Windows64_App.h similarity index 100% rename from targets/Minecraft.Client/Windows64/Windows64_App.h rename to targets/app/windows/Windows64_App.h diff --git a/targets/Minecraft.Client/Windows64/Windows64_UIController.cpp b/targets/app/windows/Windows64_UIController.cpp similarity index 100% rename from targets/Minecraft.Client/Windows64/Windows64_UIController.cpp rename to targets/app/windows/Windows64_UIController.cpp diff --git a/targets/Minecraft.Client/Windows64/Windows64_UIController.h b/targets/app/windows/Windows64_UIController.h similarity index 95% rename from targets/Minecraft.Client/Windows64/Windows64_UIController.h rename to targets/app/windows/Windows64_UIController.h index 633f815d5..4f0749f6a 100644 --- a/targets/Minecraft.Client/Windows64/Windows64_UIController.h +++ b/targets/app/windows/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/src/UI/UIController.h" +#include "app/common/src/UI/UIController.h" class ConsoleUIController : public UIController { private: diff --git a/targets/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp b/targets/app/windows/XML/ATGXmlParser.cpp similarity index 100% rename from targets/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp rename to targets/app/windows/XML/ATGXmlParser.cpp diff --git a/targets/Minecraft.Client/Windows64/XML/ATGXmlParser.h b/targets/app/windows/XML/ATGXmlParser.h similarity index 100% rename from targets/Minecraft.Client/Windows64/XML/ATGXmlParser.h rename to targets/app/windows/XML/ATGXmlParser.h diff --git a/targets/Minecraft.Client/Windows64/XML/xmlFilesCallback.h b/targets/app/windows/XML/xmlFilesCallback.h similarity index 100% rename from targets/Minecraft.Client/Windows64/XML/xmlFilesCallback.h rename to targets/app/windows/XML/xmlFilesCallback.h diff --git a/targets/console_helpers/src/C4JThread.cpp b/targets/console_helpers/src/C4JThread.cpp index 5a9e5977f..737957762 100644 --- a/targets/console_helpers/src/C4JThread.cpp +++ b/targets/console_helpers/src/C4JThread.cpp @@ -29,7 +29,7 @@ #include #endif -#include "Minecraft.Client/Common/ShutdownManager.h" +#include "app/common/ShutdownManager.h" #include "console_helpers/C4JThread.h" class Level; diff --git a/targets/console_helpers/src/compression.cpp b/targets/console_helpers/src/compression.cpp index beebc20f4..cf2a3f8ca 100644 --- a/targets/console_helpers/src/compression.cpp +++ b/targets/console_helpers/src/compression.cpp @@ -7,7 +7,7 @@ #include #include -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/include/XboxStubs.h" #include "minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h" #if defined(_WIN64) || defined(__linux__) // zconf.h defines "typedef unsigned char Byte" which conflicts with the diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp index a119a1dcb..ca9f7edb6 100644 --- a/targets/minecraft/client/Camera.cpp +++ b/targets/minecraft/client/Camera.cpp @@ -7,8 +7,8 @@ #include #include "MemoryTracker.h" -#include "Minecraft.Client/Linux/Stubs/DirectXMath/DirectXMath.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/linux/Stubs/DirectXMath/DirectXMath.h" +#include "app/include/stubs.h" #include "java/FloatBuffer.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/ClientConstants.cpp b/targets/minecraft/client/ClientConstants.cpp index c6adaab1c..e74b1fa38 100644 --- a/targets/minecraft/client/ClientConstants.cpp +++ b/targets/minecraft/client/ClientConstants.cpp @@ -1,6 +1,6 @@ #include "ClientConstants.h" -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" +#include "app/common/src/BuildVer/BuildVer.h" const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + diff --git a/targets/minecraft/client/Lighting.cpp b/targets/minecraft/client/Lighting.cpp index 0163e740b..77bfbddd6 100644 --- a/targets/minecraft/client/Lighting.cpp +++ b/targets/minecraft/client/Lighting.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "java/FloatBuffer.h" #include "minecraft/world/phys/Vec3.h" diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp index 1150ffb98..3eca2e7e8 100644 --- a/targets/minecraft/client/Minecraft.cpp +++ b/targets/minecraft/client/Minecraft.cpp @@ -14,18 +14,18 @@ #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/XboxStubs.h" #include "Options.h" #include "Pos.h" #include "ProgressRenderer.h" @@ -102,14 +102,14 @@ #include "minecraft/client/gui/inventory/CreativeInventoryScreen.h" #endif #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/ConsoleGameMode.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/src/UI/UIFontData.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/Minecraft_Macros.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/ConsoleGameMode.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/Tutorial/FullTutorialMode.h" +#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/src/UI/UIFontData.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "java/File.h" #include "java/System.h" diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp index 6cfb0bb3c..3e45c00d3 100644 --- a/targets/minecraft/client/Options.cpp +++ b/targets/minecraft/client/Options.cpp @@ -1,9 +1,9 @@ #include "Options.h" #include "KeyMapping.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/linux/Linux_App.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp index 7d8852b79..b7407713b 100644 --- a/targets/minecraft/client/gui/ChatScreen.cpp +++ b/targets/minecraft/client/gui/ChatScreen.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp index 8172ad06f..f0ccca193 100644 --- a/targets/minecraft/client/gui/CreateWorldScreen.cpp +++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp @@ -10,14 +10,14 @@ #include "Button.h" #include "EditBox.h" #include "MessageScreen.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/NetTypes.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/EditBox.cpp b/targets/minecraft/client/gui/EditBox.cpp index d5dca214b..29776b5c0 100644 --- a/targets/minecraft/client/gui/EditBox.cpp +++ b/targets/minecraft/client/gui/EditBox.cpp @@ -1,6 +1,6 @@ #include "EditBox.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp index cb7f8ac4d..5f3d74106 100644 --- a/targets/minecraft/client/gui/Font.cpp +++ b/targets/minecraft/client/gui/Font.cpp @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/include/BufferedImage.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp index e425f75a4..ca0ac4cb7 100644 --- a/targets/minecraft/client/gui/Gui.cpp +++ b/targets/minecraft/client/gui/Gui.cpp @@ -6,12 +6,12 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "Facing.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/include/XboxStubs.h" -#include "Minecraft.Client/include/stdafx.h" +#include "app/common/App_enums.h" +#include "app/common/App_structs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/include/XboxStubs.h" +#include "app/include/stdafx.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" #include "java/JavaMath.h" diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp index 0f76f2769..e6e40ac8c 100644 --- a/targets/minecraft/client/gui/GuiComponent.cpp +++ b/targets/minecraft/client/gui/GuiComponent.cpp @@ -4,7 +4,7 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" #include "minecraft/client/gui/Gui.h" diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp index 0c9b69bee..8cc7460cc 100644 --- a/targets/minecraft/client/gui/InBedChatScreen.cpp +++ b/targets/minecraft/client/gui/InBedChatScreen.cpp @@ -5,7 +5,7 @@ #include #include "Button.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/ChatScreen.h" diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp index abb5c3833..d6bc03671 100644 --- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -4,7 +4,7 @@ #include "Button.h" #include "EditBox.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp index 6eb450d0e..c59353751 100644 --- a/targets/minecraft/client/gui/Minimap.cpp +++ b/targets/minecraft/client/gui/Minimap.cpp @@ -9,9 +9,9 @@ #include "platform/sdl2/Render.h" #include "Font.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/include/BufferedImage.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp index 51dffc9bf..d846a3ea6 100644 --- a/targets/minecraft/client/gui/NameEntryScreen.cpp +++ b/targets/minecraft/client/gui/NameEntryScreen.cpp @@ -3,7 +3,7 @@ #include #include "Button.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/PauseScreen.cpp b/targets/minecraft/client/gui/PauseScreen.cpp index 986018106..f50f5fd7d 100644 --- a/targets/minecraft/client/gui/PauseScreen.cpp +++ b/targets/minecraft/client/gui/PauseScreen.cpp @@ -10,9 +10,9 @@ #include "platform/sdl2/Input.h" #include "Button.h" #include "MessageScreen.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Linux_App.h" #include "OptionsScreen.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp index a7de15bb0..e5d6602d2 100644 --- a/targets/minecraft/client/gui/RenameWorldScreen.cpp +++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp @@ -4,7 +4,7 @@ #include "Button.h" #include "EditBox.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp index 9e5f880b4..3c1a1e50d 100644 --- a/targets/minecraft/client/gui/Screen.cpp +++ b/targets/minecraft/client/gui/Screen.cpp @@ -4,11 +4,11 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "Button.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Linux_App.h" +#include "app/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/particle/GuiParticles.h" diff --git a/targets/minecraft/client/gui/SelectWorldScreen.cpp b/targets/minecraft/client/gui/SelectWorldScreen.cpp index 2b4ad0c12..ff19c75e6 100644 --- a/targets/minecraft/client/gui/SelectWorldScreen.cpp +++ b/targets/minecraft/client/gui/SelectWorldScreen.cpp @@ -8,8 +8,8 @@ #include "Button.h" #include "ConfirmScreen.h" #include "CreateWorldScreen.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "RenameWorldScreen.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp index 0b59ee2de..45e98cb32 100644 --- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -6,7 +6,7 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "minecraft/client/KeyMapping.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/Options.h" diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp index 70164cb01..19b264aff 100644 --- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp @@ -1,7 +1,7 @@ #include "StatsScreen.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/include/stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 198607127..697a82cb6 100644 --- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -4,8 +4,8 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/linux/Linux_App.h" +#include "app/include/stubs.h" #include "minecraft/client/KeyMapping.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp index 3c830755a..813f2e2fa 100644 --- a/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp +++ b/targets/minecraft/client/gui/inventory/BeaconPowerButton.cpp @@ -3,7 +3,7 @@ #include #include "BeaconScreen.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/gui/inventory/AbstractBeaconButton.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 55cac3459..978cf5495 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -9,9 +9,9 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Render.h" #include "AbstractContainerScreen.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/linux/Linux_App.h" +#include "app/include/stubs.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Screen.h" #include "minecraft/client/gui/inventory/AbstractContainerScreen.h" diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h index c13614f0e..b3ad21b39 100644 --- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -3,7 +3,7 @@ #include #include "AbstractContainerScreen.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "app/common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp index 934d244da..0e838cba6 100644 --- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -3,7 +3,7 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Button.h" diff --git a/targets/minecraft/client/gui/particle/GuiParticle.cpp b/targets/minecraft/client/gui/particle/GuiParticle.cpp index c65d5006a..83ea20131 100644 --- a/targets/minecraft/client/gui/particle/GuiParticle.cpp +++ b/targets/minecraft/client/gui/particle/GuiParticle.cpp @@ -1,6 +1,6 @@ #include "GuiParticle.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/stubs.h" #include "java/Random.h" Random* GuiParticle::random = new Random(); diff --git a/targets/minecraft/client/model/HumanoidModel.cpp b/targets/minecraft/client/model/HumanoidModel.cpp index 05fca28b9..cac1fb5e5 100644 --- a/targets/minecraft/client/model/HumanoidModel.cpp +++ b/targets/minecraft/client/model/HumanoidModel.cpp @@ -5,7 +5,7 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/client/model/geom/ModelPart.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/client/model/HumanoidModel.h b/targets/minecraft/client/model/HumanoidModel.h index 227506eca..0a7705102 100644 --- a/targets/minecraft/client/model/HumanoidModel.h +++ b/targets/minecraft/client/model/HumanoidModel.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/include/SkinBox.h" +#include "app/include/SkinBox.h" #include "minecraft/client/model/geom/Model.h" class ModelPart; diff --git a/targets/minecraft/client/model/geom/Model.h b/targets/minecraft/client/model/geom/Model.h index e8e61b5aa..8dec7bef1 100644 --- a/targets/minecraft/client/model/geom/Model.h +++ b/targets/minecraft/client/model/geom/Model.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/include/SkinBox.h" +#include "app/include/SkinBox.h" #include "java/Random.h" class Mob; diff --git a/targets/minecraft/client/model/geom/ModelPart.h b/targets/minecraft/client/model/geom/ModelPart.h index 02e39f7a5..818d1af5f 100644 --- a/targets/minecraft/client/model/geom/ModelPart.h +++ b/targets/minecraft/client/model/geom/ModelPart.h @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/include/SkinBox.h" +#include "app/include/SkinBox.h" #include "Model.h" #include "minecraft/client/model/Polygon.h" #include "minecraft/client/model/Vertex.h" diff --git a/targets/minecraft/client/multiplayer/ClientConnection.cpp b/targets/minecraft/client/multiplayer/ClientConnection.cpp index 1ce770659..4de4cc6fb 100644 --- a/targets/minecraft/client/multiplayer/ClientConnection.cpp +++ b/targets/minecraft/client/multiplayer/ClientConnection.cpp @@ -13,26 +13,26 @@ #include "4J.Common/4J_Compat.h" #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/src/ConsoleGameMode.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/App_structs.h" +#include "app/common/src/ConsoleGameMode.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/Socket.h" +#include "app/common/src/Tutorial/FullTutorialMode.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" +#include "app/common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "MultiPlayerLevel.h" #include "ReceivingLevelScreen.h" #include "console_helpers/PlatformTime.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 98678f61f..bc76257a0 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" #include "minecraft/server/MinecraftServer.h" #include "minecraft/server/level/ServerChunkCache.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index 2b33f812f..33fc83836 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -3,7 +3,7 @@ #include #include "ClientConnection.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" +#include "app/common/src/Audio/SoundEngine.h" #include "MultiPlayerLevel.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp index d8d011554..846e224cc 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -12,10 +12,10 @@ #include "4J.Common/4J_Compat.h" #include "platform/sdl2/Input.h" #include "ClientConnection.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Linux_App.h" #include "MultiPlayerChunkCache.h" #include "MultiPlayerLocalPlayer.h" #include "java/JavaMath.h" diff --git a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index 2376cefd8..cdbbfe5c8 100644 --- a/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/targets/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -5,10 +5,10 @@ #include #include "ClientConnection.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/client/player/Input.h" diff --git a/targets/minecraft/client/particle/DragonBreathParticle.cpp b/targets/minecraft/client/particle/DragonBreathParticle.cpp index 96196b748..acce371c6 100644 --- a/targets/minecraft/client/particle/DragonBreathParticle.cpp +++ b/targets/minecraft/client/particle/DragonBreathParticle.cpp @@ -1,7 +1,7 @@ #include "DragonBreathParticle.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/DripParticle.cpp b/targets/minecraft/client/particle/DripParticle.cpp index 74593834a..03ca1196d 100644 --- a/targets/minecraft/client/particle/DripParticle.cpp +++ b/targets/minecraft/client/particle/DripParticle.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp index ca6f203ae..ef886bb78 100644 --- a/targets/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/targets/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -1,7 +1,7 @@ #include "EnchantmentTableParticle.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/EnderParticle.cpp b/targets/minecraft/client/particle/EnderParticle.cpp index 0e7520e3d..5e4d40d12 100644 --- a/targets/minecraft/client/particle/EnderParticle.cpp +++ b/targets/minecraft/client/particle/EnderParticle.cpp @@ -1,7 +1,7 @@ #include "EnderParticle.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/ExplodeParticle.cpp b/targets/minecraft/client/particle/ExplodeParticle.cpp index d7e729b15..9a8cf6f55 100644 --- a/targets/minecraft/client/particle/ExplodeParticle.cpp +++ b/targets/minecraft/client/particle/ExplodeParticle.cpp @@ -1,7 +1,7 @@ #include "ExplodeParticle.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/HugeExplosionParticle.cpp b/targets/minecraft/client/particle/HugeExplosionParticle.cpp index f53b9c3f6..428de1d37 100644 --- a/targets/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/targets/minecraft/client/particle/HugeExplosionParticle.cpp @@ -3,8 +3,8 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Lighting.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/NetherPortalParticle.cpp b/targets/minecraft/client/particle/NetherPortalParticle.cpp index 85bf330ec..059ea537f 100644 --- a/targets/minecraft/client/particle/NetherPortalParticle.cpp +++ b/targets/minecraft/client/particle/NetherPortalParticle.cpp @@ -1,7 +1,7 @@ #include "NetherPortalParticle.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/particle/NoteParticle.cpp b/targets/minecraft/client/particle/NoteParticle.cpp index b5657d288..d047f1f4e 100644 --- a/targets/minecraft/client/particle/NoteParticle.cpp +++ b/targets/minecraft/client/particle/NoteParticle.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/Particle.cpp b/targets/minecraft/client/particle/Particle.cpp index afa344702..cddabd80e 100644 --- a/targets/minecraft/client/particle/Particle.cpp +++ b/targets/minecraft/client/particle/Particle.cpp @@ -4,7 +4,7 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/particle/SmokeParticle.cpp b/targets/minecraft/client/particle/SmokeParticle.cpp index 5239aaed0..185f94fb5 100644 --- a/targets/minecraft/client/particle/SmokeParticle.cpp +++ b/targets/minecraft/client/particle/SmokeParticle.cpp @@ -1,7 +1,7 @@ #include "SmokeParticle.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/particle/Particle.h" diff --git a/targets/minecraft/client/particle/SuspendedParticle.cpp b/targets/minecraft/client/particle/SuspendedParticle.cpp index 905bc20f0..9d284581b 100644 --- a/targets/minecraft/client/particle/SuspendedParticle.cpp +++ b/targets/minecraft/client/particle/SuspendedParticle.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/player/Input.cpp b/targets/minecraft/client/player/Input.cpp index a6227d773..fd005146e 100644 --- a/targets/minecraft/client/player/Input.cpp +++ b/targets/minecraft/client/player/Input.cpp @@ -5,8 +5,8 @@ #include "4J.Common/4J_InputActions.h" #include "platform/sdl2/Input.h" #include "LocalPlayer.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/client/player/LocalPlayer.cpp b/targets/minecraft/client/player/LocalPlayer.cpp index c005a6c1d..c6b57e059 100644 --- a/targets/minecraft/client/player/LocalPlayer.cpp +++ b/targets/minecraft/client/player/LocalPlayer.cpp @@ -29,15 +29,15 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Profile.h" #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_structs.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialMode.h" +#include "app/common/src/UI/All Platforms/UIEnums.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PlatformTypes.h" #include "Pos.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/player/RemotePlayer.cpp b/targets/minecraft/client/player/RemotePlayer.cpp index 7ec548912..844ec37cf 100644 --- a/targets/minecraft/client/player/RemotePlayer.cpp +++ b/targets/minecraft/client/player/RemotePlayer.cpp @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "Pos.h" #include "minecraft/world/entity/player/Inventory.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp index 5038762ac..d89a7385f 100644 --- a/targets/minecraft/client/renderer/Chunk.cpp +++ b/targets/minecraft/client/renderer/Chunk.cpp @@ -11,8 +11,8 @@ #include "platform/sdl2/Render.h" #include "LevelRenderer.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/FrameProfiler.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/FrameProfiler.h" #include "TileRenderer.h" #include "minecraft/client/renderer/Tesselator.h" #include "minecraft/client/renderer/culling/Culler.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp index a397726aa..ccfd4b040 100644 --- a/targets/minecraft/client/renderer/GameRenderer.cpp +++ b/targets/minecraft/client/renderer/GameRenderer.cpp @@ -13,14 +13,14 @@ #include "Chunk.h" #include "ItemInHandRenderer.h" #include "LevelRenderer.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/BufferedImage.h" -#include "Minecraft.Client/include/FrameProfiler.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/App_enums.h" +#include "app/common/ShutdownManager.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/BufferedImage.h" +#include "app/include/FrameProfiler.h" +#include "app/include/stubs.h" #include "Tesselator.h" #include "console_helpers/compression.h" #include "gl3_loader.h" diff --git a/targets/minecraft/client/renderer/GameRenderer.h b/targets/minecraft/client/renderer/GameRenderer.h index 4d73dd2ba..8f8fd368e 100644 --- a/targets/minecraft/client/renderer/GameRenderer.h +++ b/targets/minecraft/client/renderer/GameRenderer.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Common/App_Defines.h" +#include "app/common/App_Defines.h" #include "console_helpers/C4JThread.h" #include "minecraft/client/resources/ResourceLocation.h" #include "minecraft/util/SmoothFloat.h" diff --git a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp index 3d7a0feef..aff054c12 100644 --- a/targets/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/targets/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -7,9 +7,9 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/linux/Linux_App.h" #include "Tesselator.h" #include "Textures.h" #include "TileRenderer.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp index 55b693ee1..4283aa082 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.cpp +++ b/targets/minecraft/client/renderer/LevelRenderer.cpp @@ -18,14 +18,14 @@ #include "platform/sdl2/Render.h" #include "Chunk.h" #include "GameRenderer.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/FrameProfiler.h" -#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" +#include "app/include/FrameProfiler.h" +#include "app/include/MobSkinMemTextureProcessor.h" +#include "app/include/stubs.h" #include "Tesselator.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h index 9265bed75..c2cfdd9f6 100644 --- a/targets/minecraft/client/renderer/LevelRenderer.h +++ b/targets/minecraft/client/renderer/LevelRenderer.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" #include "OffsettedRenderList.h" #include "console_helpers/C4JThread.h" #include "console_helpers/Definitions.h" diff --git a/targets/minecraft/client/renderer/MemTexture.cpp b/targets/minecraft/client/renderer/MemTexture.cpp index a3ee6061e..25f70fdef 100644 --- a/targets/minecraft/client/renderer/MemTexture.cpp +++ b/targets/minecraft/client/renderer/MemTexture.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.Client/include/MemTexture.h" +#include "app/include/MemTexture.h" #include #include -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/include/BufferedImage.h" class MemTextureProcessor; diff --git a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp index 64a648043..866225074 100644 --- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp +++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" +#include "app/include/MobSkinMemTextureProcessor.h" -#include "Minecraft.Client/include/BufferedImage.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/BufferedImage.h" +#include "app/include/stubs.h" BufferedImage* MobSkinMemTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp index db2999f81..ddc4c28a1 100644 --- a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp +++ b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp @@ -1,7 +1,7 @@ #include "MobSkinTextureProcessor.h" -#include "Minecraft.Client/include/BufferedImage.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/include/BufferedImage.h" +#include "app/include/stubs.h" BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp index a594e3b9e..2a3215124 100644 --- a/targets/minecraft/client/renderer/Tesselator.cpp +++ b/targets/minecraft/client/renderer/Tesselator.cpp @@ -5,8 +5,8 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stubs.h" +#include "app/linux/Linux_App.h" +#include "app/include/stubs.h" #include "minecraft/client/MemoryTracker.h" bool Tesselator::TRIANGLE_MODE = false; diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp index ba23caddd..d8c631212 100644 --- a/targets/minecraft/client/renderer/Textures.cpp +++ b/targets/minecraft/client/renderer/Textures.cpp @@ -9,11 +9,11 @@ #include "platform/sdl2/Render.h" #include "HttpTexture.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/BufferedImage.h" -#include "Minecraft.Client/include/MemTexture.h" -#include "Minecraft.Client/include/MemTextureProcessor.h" -#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" +#include "app/linux/Linux_App.h" +#include "app/include/BufferedImage.h" +#include "app/include/MemTexture.h" +#include "app/include/MemTextureProcessor.h" +#include "app/include/MobSkinMemTextureProcessor.h" #include "console_helpers/StringHelpers.h" #include "gl3_loader.h" #include "java/Buffer.h" diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp index 9bba981be..cb4390a3a 100644 --- a/targets/minecraft/client/renderer/TileRenderer.cpp +++ b/targets/minecraft/client/renderer/TileRenderer.cpp @@ -12,9 +12,9 @@ #include "platform/sdl2/Render.h" #include "EntityTileRenderer.h" #include "GameRenderer.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/include/FrameProfiler.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/include/FrameProfiler.h" #include "Tesselator.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index d9894f373..0c160d166 100644 --- a/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/targets/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -34,7 +34,7 @@ #include "LightningBoltRenderer.h" #include "MinecartRenderer.h" #include "MinecartSpawnerRenderer.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "MobRenderer.h" #include "MushroomCowRenderer.h" #include "OcelotRenderer.h" diff --git a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp index c36a81d50..ec775817a 100644 --- a/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/LivingEntityRenderer.cpp @@ -6,8 +6,8 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "gl3_loader.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/client/renderer/entity/MobRenderer.cpp b/targets/minecraft/client/renderer/entity/MobRenderer.cpp index d2b19361c..e3426244b 100644 --- a/targets/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/MobRenderer.cpp @@ -7,8 +7,8 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "LivingEntityRenderer.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "gl3_loader.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp index 1d4918514..259ff330e 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.cpp @@ -7,8 +7,8 @@ #include "platform/sdl2/Render.h" #include "EntityRenderDispatcher.h" #include "HumanoidMobRenderer.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "minecraft/Facing.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h index 2b645fc7e..86ba38bb5 100644 --- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.Client/include/NetTypes.h" -#include "Minecraft.Client/include/SkinBox.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/include/NetTypes.h" +#include "app/include/SkinBox.h" +#include "app/include/XboxStubs.h" #include "MobRenderer.h" #include "minecraft/client/renderer/entity/LivingEntityRenderer.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index bec8e844f..2ef2590c3 100644 --- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/BufferedImage.h" #include "SimpleIcon.h" #include "StitchedTexture.h" #include "Texture.h" diff --git a/targets/minecraft/client/renderer/texture/Stitcher.cpp b/targets/minecraft/client/renderer/texture/Stitcher.cpp index dc05f80aa..0adc97fa3 100644 --- a/targets/minecraft/client/renderer/texture/Stitcher.cpp +++ b/targets/minecraft/client/renderer/texture/Stitcher.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "StitchSlot.h" #include "Texture.h" #include "TextureHolder.h" diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp index 1b433ebd9..b30ae0fb5 100644 --- a/targets/minecraft/client/renderer/texture/Texture.cpp +++ b/targets/minecraft/client/renderer/texture/Texture.cpp @@ -6,8 +6,8 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/linux/Linux_App.h" +#include "app/include/BufferedImage.h" #include "TextureManager.h" #include "java/Buffer.h" #include "java/ByteBuffer.h" diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp index 15908a548..c63da3099 100644 --- a/targets/minecraft/client/renderer/texture/TextureManager.cpp +++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/linux/Linux_App.h" +#include "app/include/BufferedImage.h" #include "Stitcher.h" #include "Texture.h" #include "java/File.h" diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp index a08c6d8c0..2c31c026e 100644 --- a/targets/minecraft/client/renderer/texture/TextureMap.cpp +++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/BufferedImage.h" #include "StitchSlot.h" #include "StitchedTexture.h" #include "Stitcher.h" diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp index 0713bf3e3..ace5ff64b 100644 --- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -5,10 +5,10 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/XboxStubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/linux/Linux_App.h" +#include "app/include/XboxStubs.h" #include "gl3_loader.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Font.h" diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp index 80dcbb733..592feba0f 100644 --- a/targets/minecraft/client/skins/AbstractTexturePack.cpp +++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp @@ -5,11 +5,11 @@ #include -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/BufferedImage.h" #include "console_helpers/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/BufferedReader.h" diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp index d9c75d73c..76e9e7f43 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.cpp +++ b/targets/minecraft/client/skins/DLCTexturePack.cpp @@ -7,26 +7,26 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/DLC/DLCAudioFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCColourTableFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/DLC/DLCTextureFile.h" -#include "Minecraft.Client/Common/src/DLC/DLCUIDataFile.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/common/App_enums.h" +#include "app/common/src/Audio/SoundEngine.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/DLC/DLCAudioFile.h" +#include "app/common/src/DLC/DLCColourTableFile.h" +#include "app/common/src/DLC/DLCFile.h" +#include "app/common/src/DLC/DLCGameRulesHeader.h" +#include "app/common/src/DLC/DLCLocalisationFile.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/DLC/DLCTextureFile.h" +#include "app/common/src/DLC/DLCUIDataFile.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/Localisation/StringTable.h" +#include "app/common/src/UI/All Platforms/ArchiveFile.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/BufferedImage.h" #include "console_helpers/PortableFileIO.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" @@ -34,8 +34,8 @@ #include "minecraft/client/skins/TexturePack.h" #if defined(_WINDOWS64) -#include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" -#include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" +#include "app/windows/XML/ATGXmlParser.h" +#include "app/windows/XML/xmlFilesCallback.h" #endif namespace { diff --git a/targets/minecraft/client/skins/DLCTexturePack.h b/targets/minecraft/client/skins/DLCTexturePack.h index d0c4963ec..4fb0791ca 100644 --- a/targets/minecraft/client/skins/DLCTexturePack.h +++ b/targets/minecraft/client/skins/DLCTexturePack.h @@ -5,7 +5,7 @@ #include "4J.Common/4J_Compat.h" #include "AbstractTexturePack.h" -#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "app/common/src/Localisation/StringTable.h" class DLCPack; class StringTable; diff --git a/targets/minecraft/client/skins/DefaultTexturePack.h b/targets/minecraft/client/skins/DefaultTexturePack.h index a8d2d9d0f..13c778388 100644 --- a/targets/minecraft/client/skins/DefaultTexturePack.h +++ b/targets/minecraft/client/skins/DefaultTexturePack.h @@ -2,8 +2,8 @@ #include #include "AbstractTexturePack.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/stdafx.h" +#include "app/linux/Linux_App.h" +#include "app/include/stdafx.h" #include "java/InputOutputStream/InputStream.h" #include "strings.h" diff --git a/targets/minecraft/client/skins/TexturePack.cpp b/targets/minecraft/client/skins/TexturePack.cpp index ea85e368b..550ab35a3 100644 --- a/targets/minecraft/client/skins/TexturePack.cpp +++ b/targets/minecraft/client/skins/TexturePack.cpp @@ -9,7 +9,7 @@ std::wstring TexturePack::getPath( // Make the content package point to to the UPDATE: drive is needed wDrive = L"Common\\res\\TitleUpdate\\"; } else { - wDrive = L"Minecraft.Client/Common/"; + wDrive = L"app/common/"; } return wDrive; diff --git a/targets/minecraft/client/skins/TexturePack.h b/targets/minecraft/client/skins/TexturePack.h index 3d1122952..f3d36d36e 100644 --- a/targets/minecraft/client/skins/TexturePack.h +++ b/targets/minecraft/client/skins/TexturePack.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" class InputStream; class Minecraft; diff --git a/targets/minecraft/client/skins/TexturePackRepository.cpp b/targets/minecraft/client/skins/TexturePackRepository.cpp index 5e2268310..12c889cb2 100644 --- a/targets/minecraft/client/skins/TexturePackRepository.cpp +++ b/targets/minecraft/client/skins/TexturePackRepository.cpp @@ -8,11 +8,11 @@ #include "platform/sdl2/Input.h" #include "DLCTexturePack.h" #include "DefaultTexturePack.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Linux_UIController.h" +#include "app/common/App_enums.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Linux_UIController.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/gui/Minimap.h" diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp index fd133530e..d69d8174d 100644 --- a/targets/minecraft/client/title/TitleScreen.cpp +++ b/targets/minecraft/client/title/TitleScreen.cpp @@ -6,9 +6,9 @@ #include #include "platform/sdl2/Render.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/BufferedImage.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/BufferedImage.h" #include "console_helpers/StringHelpers.h" #include "java/InputOutputStream/BufferedReader.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/commands/CommandDispatcher.cpp b/targets/minecraft/commands/CommandDispatcher.cpp index 128274383..50044df3a 100644 --- a/targets/minecraft/commands/CommandDispatcher.cpp +++ b/targets/minecraft/commands/CommandDispatcher.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/commands/Command.h" #include "minecraft/commands/CommandSender.h" #include "minecraft/commands/CommandsEnum.h" diff --git a/targets/minecraft/core/ItemDispenseBehaviors.cpp b/targets/minecraft/core/ItemDispenseBehaviors.cpp index 437026ec9..cbffc1ba6 100644 --- a/targets/minecraft/core/ItemDispenseBehaviors.cpp +++ b/targets/minecraft/core/ItemDispenseBehaviors.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/AbstractProjectileDispenseBehavior.h" diff --git a/targets/minecraft/network/Connection.cpp b/targets/minecraft/network/Connection.cpp index 9d29d1a4b..9368c8747 100644 --- a/targets/minecraft/network/Connection.cpp +++ b/targets/minecraft/network/Connection.cpp @@ -6,10 +6,10 @@ #include #include -#include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Network/Socket.h" +#include "app/common/ShutdownManager.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/Socket.h" #include "console_helpers/StringHelpers.h" #include "console_helpers/compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" diff --git a/targets/minecraft/network/Connection.h b/targets/minecraft/network/Connection.h index 0acf36a24..f974a9935 100644 --- a/targets/minecraft/network/Connection.h +++ b/targets/minecraft/network/Connection.h @@ -7,8 +7,8 @@ #include #include -#include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Network/Socket.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/C4JThread.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp index 34bf012a6..d312ad74c 100644 --- a/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp +++ b/targets/minecraft/network/packet/BlockRegionUpdatePacket.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "PacketListener.h" #include "console_helpers/compression.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/network/packet/CustomPayloadPacket.cpp b/targets/minecraft/network/packet/CustomPayloadPacket.cpp index f6a033e83..73adfd6a5 100644 --- a/targets/minecraft/network/packet/CustomPayloadPacket.cpp +++ b/targets/minecraft/network/packet/CustomPayloadPacket.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/GameCommandPacket.cpp b/targets/minecraft/network/packet/GameCommandPacket.cpp index 38d39759c..a6a2452c8 100644 --- a/targets/minecraft/network/packet/GameCommandPacket.cpp +++ b/targets/minecraft/network/packet/GameCommandPacket.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/LoginPacket.cpp b/targets/minecraft/network/packet/LoginPacket.cpp index d2c7db2cb..a634e37e7 100644 --- a/targets/minecraft/network/packet/LoginPacket.cpp +++ b/targets/minecraft/network/packet/LoginPacket.cpp @@ -1,6 +1,6 @@ #include "LoginPacket.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/MoveEntityPacket.cpp b/targets/minecraft/network/packet/MoveEntityPacket.cpp index b227cab6b..ee5d26cf1 100644 --- a/targets/minecraft/network/packet/MoveEntityPacket.cpp +++ b/targets/minecraft/network/packet/MoveEntityPacket.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp index 731da2d84..50a109954 100644 --- a/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp +++ b/targets/minecraft/network/packet/MoveEntityPacketSmall.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/Packet.cpp b/targets/minecraft/network/packet/Packet.cpp index 26b583c59..43e7c310c 100644 --- a/targets/minecraft/network/packet/Packet.cpp +++ b/targets/minecraft/network/packet/Packet.cpp @@ -12,8 +12,8 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/Exceptions.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/PlayerInfoPacket.cpp b/targets/minecraft/network/packet/PlayerInfoPacket.cpp index 0a8668d4c..a85ee6d89 100644 --- a/targets/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/targets/minecraft/network/packet/PlayerInfoPacket.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/PacketListener.h" diff --git a/targets/minecraft/network/packet/PreLoginPacket.cpp b/targets/minecraft/network/packet/PreLoginPacket.cpp index 3fbfdad21..7e7fa48dd 100644 --- a/targets/minecraft/network/packet/PreLoginPacket.cpp +++ b/targets/minecraft/network/packet/PreLoginPacket.cpp @@ -3,10 +3,10 @@ #include #include -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" +#include "app/common/src/BuildVer/BuildVer.h" #include "platform/IPlatformNetwork.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/RespawnPacket.cpp b/targets/minecraft/network/packet/RespawnPacket.cpp index e1444d0c0..73744eaad 100644 --- a/targets/minecraft/network/packet/RespawnPacket.cpp +++ b/targets/minecraft/network/packet/RespawnPacket.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp index 6b4cb629e..f4e5f9443 100644 --- a/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp +++ b/targets/minecraft/network/packet/SetPlayerTeamPacket.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp index 7be917212..c0535eaaa 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryChangePacket.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/Minecraft_Macros.h" +#include "app/common/Minecraft_Macros.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp index 5a7412a92..13b72c513 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" +#include "app/common/Minecraft_Macros.h" +#include "app/common/src/DLC/DLCSkinFile.h" #include "PacketListener.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.h b/targets/minecraft/network/packet/TextureAndGeometryPacket.h index a79b00742..0a4c0908a 100644 --- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/include/SkinBox.h" +#include "app/include/SkinBox.h" #include "Packet.h" #include "minecraft/client/model/geom/Model.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h index 844e81b67..aee4f5b6d 100644 --- a/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/targets/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "app/common/src/GameRules/ConsoleGameRulesConstants.h" #include "Packet.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/server/MinecraftServer.cpp b/targets/minecraft/server/MinecraftServer.cpp index 526a437f4..6b0cd0415 100644 --- a/targets/minecraft/server/MinecraftServer.cpp +++ b/targets/minecraft/server/MinecraftServer.cpp @@ -15,12 +15,12 @@ #include "platform/sdl2/Storage.h" #include "ConsoleInput.h" #include "DispenserBootstrap.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Linux_App.h" #include "PlayerList.h" #include "Settings.h" #include "console_helpers/PlatformTime.h" @@ -65,11 +65,11 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif #include "platform/sdl2/Input.h" -#include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" +#include "app/common/ShutdownManager.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "app/common/src/Network/Socket.h" +#include "app/common/src/UI/All Platforms/UIStructs.h" #include "console_helpers/compression.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/ProgressRenderer.h" diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp index 5e461e2a0..f87077392 100644 --- a/targets/minecraft/server/PlayerList.cpp +++ b/targets/minecraft/server/PlayerList.cpp @@ -9,18 +9,18 @@ #include #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/common/App_enums.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "app/common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/Socket.h" +#include "app/common/src/Tutorial/Tutorial.h" +#include "app/common/src/Tutorial/TutorialEnum.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "MinecraftServer.h" #include "Settings.h" #include "console_helpers/Definitions.h" diff --git a/targets/minecraft/server/level/EntityTracker.cpp b/targets/minecraft/server/level/EntityTracker.cpp index 661cf2fa7..af5d0da43 100644 --- a/targets/minecraft/server/level/EntityTracker.cpp +++ b/targets/minecraft/server/level/EntityTracker.cpp @@ -7,8 +7,8 @@ #include #include -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "ServerLevel.h" #include "ServerPlayer.h" #include "TrackedEntity.h" diff --git a/targets/minecraft/server/level/PlayerChunkMap.cpp b/targets/minecraft/server/level/PlayerChunkMap.cpp index e146d8347..30adce0d8 100644 --- a/targets/minecraft/server/level/PlayerChunkMap.cpp +++ b/targets/minecraft/server/level/PlayerChunkMap.cpp @@ -9,9 +9,9 @@ #include #include -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Linux_App.h" #include "ServerChunkCache.h" #include "ServerLevel.h" #include "ServerPlayer.h" diff --git a/targets/minecraft/server/level/ServerChunkCache.cpp b/targets/minecraft/server/level/ServerChunkCache.cpp index 343bf05c2..de94a0514 100644 --- a/targets/minecraft/server/level/ServerChunkCache.cpp +++ b/targets/minecraft/server/level/ServerChunkCache.cpp @@ -6,8 +6,8 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "ServerLevel.h" #include "console_helpers/compression.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/minecraft/server/level/ServerLevel.cpp b/targets/minecraft/server/level/ServerLevel.cpp index 1413f836d..87e7fd1b4 100644 --- a/targets/minecraft/server/level/ServerLevel.cpp +++ b/targets/minecraft/server/level/ServerLevel.cpp @@ -8,12 +8,12 @@ #include "platform/sdl2/Input.h" #include "platform/sdl2/Storage.h" #include "EntityTracker.h" -#include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCPack.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/ShutdownManager.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCPack.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Linux_App.h" #include "PlayerChunkMap.h" #include "Pos.h" #include "ServerChunkCache.h" diff --git a/targets/minecraft/server/level/ServerLevelListener.cpp b/targets/minecraft/server/level/ServerLevelListener.cpp index 817dbe0e4..3dbad36d5 100644 --- a/targets/minecraft/server/level/ServerLevelListener.cpp +++ b/targets/minecraft/server/level/ServerLevelListener.cpp @@ -4,7 +4,7 @@ #include #include "EntityTracker.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "PlayerChunkMap.h" #include "ServerLevel.h" #include "ServerPlayer.h" diff --git a/targets/minecraft/server/level/ServerPlayer.cpp b/targets/minecraft/server/level/ServerPlayer.cpp index 1dc497f45..dab00cfc8 100644 --- a/targets/minecraft/server/level/ServerPlayer.cpp +++ b/targets/minecraft/server/level/ServerPlayer.cpp @@ -10,11 +10,11 @@ #include "platform/sdl2/Input.h" #include "EntityTracker.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Linux_App.h" #include "ServerLevel.h" #include "ServerPlayerGameMode.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/server/level/ServerPlayerGameMode.cpp b/targets/minecraft/server/level/ServerPlayerGameMode.cpp index e0d19a6c6..1b72ca5a8 100644 --- a/targets/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/targets/minecraft/server/level/ServerPlayerGameMode.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "app/common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "ServerLevel.h" #include "ServerPlayer.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/server/level/TrackedEntity.cpp b/targets/minecraft/server/level/TrackedEntity.cpp index 14a5bc755..7e4800ff5 100644 --- a/targets/minecraft/server/level/TrackedEntity.cpp +++ b/targets/minecraft/server/level/TrackedEntity.cpp @@ -10,8 +10,8 @@ #include "4J.Common/4J_Compat.h" #include "EntityTracker.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/linux/Linux_App.h" #include "ServerPlayer.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp index 5c7d55ee7..43651766f 100644 --- a/targets/minecraft/server/network/PendingConnection.cpp +++ b/targets/minecraft/server/network/PendingConnection.cpp @@ -7,13 +7,13 @@ #include "4J.Common/4J_Compat.h" #include "platform/sdl2/Storage.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "app/common/App_enums.h" +#include "app/common/src/BuildVer/BuildVer.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" #include "platform/IPlatformNetwork.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "PlayerConnection.h" #include "ServerConnection.h" #include "java/Random.h" diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp index 3685d9884..ce7be0c53 100644 --- a/targets/minecraft/server/network/PlayerConnection.cpp +++ b/targets/minecraft/server/network/PlayerConnection.cpp @@ -8,15 +8,15 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/src/Network/Socket.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/include/SkinBox.h" +#include "app/common/App_enums.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/common/src/Network/NetworkPlayerInterface.h" +#include "app/common/src/Network/Socket.h" +#include "app/linux/Linux_App.h" +#include "app/include/SkinBox.h" #include "ServerConnection.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/server/network/ServerConnection.cpp b/targets/minecraft/server/network/ServerConnection.cpp index 1acd8de8b..982ef3080 100644 --- a/targets/minecraft/server/network/ServerConnection.cpp +++ b/targets/minecraft/server/network/ServerConnection.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "PendingConnection.h" #include "PlayerConnection.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/minecraft/stats/Achievements.cpp b/targets/minecraft/stats/Achievements.cpp index 073b9e2e6..345839fef 100644 --- a/targets/minecraft/stats/Achievements.cpp +++ b/targets/minecraft/stats/Achievements.cpp @@ -5,7 +5,7 @@ #include #include "Achievement.h" -#include "Minecraft.Client/Common/src/Console_Awards_enum.h" +#include "app/common/src/Console_Awards_enum.h" #include "minecraft/world/item/BowItem.h" #include "minecraft/world/item/Item.h" #include "minecraft/world/item/PotionItem.h" diff --git a/targets/minecraft/stats/CommonStats.h b/targets/minecraft/stats/CommonStats.h index 8bb2d0e88..1bf022de3 100644 --- a/targets/minecraft/stats/CommonStats.h +++ b/targets/minecraft/stats/CommonStats.h @@ -6,7 +6,7 @@ #include #include "GenericStats.h" -#include "Minecraft.Client/Common/src/Console_Awards_enum.h" +#include "app/common/src/Console_Awards_enum.h" #include "java/Class.h" class CommonStats : public GenericStats { diff --git a/targets/minecraft/stats/GenericStats.h b/targets/minecraft/stats/GenericStats.h index 19041b3d6..b899c167d 100644 --- a/targets/minecraft/stats/GenericStats.h +++ b/targets/minecraft/stats/GenericStats.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Common/src/Console_Awards_enum.h" +#include "app/common/src/Console_Awards_enum.h" #include "Stat.h" #include "Stats.h" #include "java/Class.h" @@ -19,7 +19,7 @@ class Stat; // #include "minecraft/world/damageSource/DamageSource.h" -// #include "Minecraft.Client/Common/src/Console_Awards_enum.h" +// #include "app/common/src/Console_Awards_enum.h" /** 4J-JEV: diff --git a/targets/minecraft/stats/Stat.h b/targets/minecraft/stats/Stat.h index 4643496ec..992486b52 100644 --- a/targets/minecraft/stats/Stat.h +++ b/targets/minecraft/stats/Stat.h @@ -8,7 +8,7 @@ #include #include "GenericStats.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "StatFormatter.h" class DecimalFormat; diff --git a/targets/minecraft/stats/StatsCounter.cpp b/targets/minecraft/stats/StatsCounter.cpp index 0350927c0..f6d8c497d 100644 --- a/targets/minecraft/stats/StatsCounter.cpp +++ b/targets/minecraft/stats/StatsCounter.cpp @@ -10,9 +10,9 @@ #include #include "platform/sdl2/Profile.h" -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_structs.h" +#include "app/common/src/Leaderboards/LeaderboardManager.h" +#include "app/linux/Linux_App.h" #include "minecraft/stats/Achievement.h" #include "minecraft/stats/Achievements.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/stdafx.h b/targets/minecraft/stdafx.h index 8f5499d51..82666dfe2 100644 --- a/targets/minecraft/stdafx.h +++ b/targets/minecraft/stdafx.h @@ -5,7 +5,7 @@ #pragma once #ifdef _WINDOWS64 -#include "Minecraft.Client/Windows64/Windows64_App.h" +#include "app/windows/Windows64_App.h" #else -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #endif diff --git a/targets/minecraft/util/HtmlString.cpp b/targets/minecraft/util/HtmlString.cpp index 89070b845..72b348edc 100644 --- a/targets/minecraft/util/HtmlString.cpp +++ b/targets/minecraft/util/HtmlString.cpp @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor, diff --git a/targets/minecraft/util/HtmlString.h b/targets/minecraft/util/HtmlString.h index 14e27131f..e560bc269 100644 --- a/targets/minecraft/util/HtmlString.h +++ b/targets/minecraft/util/HtmlString.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" // 4J: Simple std::string wrapper that includes basic formatting information class HtmlString { diff --git a/targets/minecraft/util/WeighedRandom.cpp b/targets/minecraft/util/WeighedRandom.cpp index 4ee88da58..1a07dd078 100644 --- a/targets/minecraft/util/WeighedRandom.cpp +++ b/targets/minecraft/util/WeighedRandom.cpp @@ -3,7 +3,7 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/Random.h" int WeighedRandom::getTotalWeight(std::vector* items) { diff --git a/targets/minecraft/world/CompoundContainer.cpp b/targets/minecraft/world/CompoundContainer.cpp index a88877a11..a40f90133 100644 --- a/targets/minecraft/world/CompoundContainer.cpp +++ b/targets/minecraft/world/CompoundContainer.cpp @@ -1,6 +1,6 @@ #include "CompoundContainer.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/network/packet/ContainerOpenPacket.h" #include "minecraft/world/Container.h" diff --git a/targets/minecraft/world/SimpleContainer.cpp b/targets/minecraft/world/SimpleContainer.cpp index c6097afb5..d5d6746f1 100644 --- a/targets/minecraft/world/SimpleContainer.cpp +++ b/targets/minecraft/world/SimpleContainer.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/Container.h" #include "minecraft/world/item/ItemInstance.h" #include "net.minecraft.world.ContainerListener.h" diff --git a/targets/minecraft/world/effect/AbsoptionMobEffect.h b/targets/minecraft/world/effect/AbsoptionMobEffect.h index 7f9bde7b7..354d11477 100644 --- a/targets/minecraft/world/effect/AbsoptionMobEffect.h +++ b/targets/minecraft/world/effect/AbsoptionMobEffect.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "MobEffect.h" class LivingEntity; diff --git a/targets/minecraft/world/effect/AttackDamageMobEffect.h b/targets/minecraft/world/effect/AttackDamageMobEffect.h index bcfd7a130..c0e4073f5 100644 --- a/targets/minecraft/world/effect/AttackDamageMobEffect.h +++ b/targets/minecraft/world/effect/AttackDamageMobEffect.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "MobEffect.h" class AttributeModifier; diff --git a/targets/minecraft/world/effect/HealthBoostMobEffect.h b/targets/minecraft/world/effect/HealthBoostMobEffect.h index b59b0cc11..309d629b6 100644 --- a/targets/minecraft/world/effect/HealthBoostMobEffect.h +++ b/targets/minecraft/world/effect/HealthBoostMobEffect.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "MobEffect.h" class LivingEntity; diff --git a/targets/minecraft/world/effect/InstantaneousMobEffect.cpp b/targets/minecraft/world/effect/InstantaneousMobEffect.cpp index 6dd1b292e..6f785fa1c 100644 --- a/targets/minecraft/world/effect/InstantaneousMobEffect.cpp +++ b/targets/minecraft/world/effect/InstantaneousMobEffect.cpp @@ -1,7 +1,7 @@ #include "minecraft/world/effect/InstantaneousMobEffect.h" -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "minecraft/world/effect/MobEffect.h" InstantenousMobEffect::InstantenousMobEffect(int id, bool isHarmful, diff --git a/targets/minecraft/world/effect/InstantaneousMobEffect.h b/targets/minecraft/world/effect/InstantaneousMobEffect.h index a4b716b88..a7bedb191 100644 --- a/targets/minecraft/world/effect/InstantaneousMobEffect.h +++ b/targets/minecraft/world/effect/InstantaneousMobEffect.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "MobEffect.h" class InstantenousMobEffect : public MobEffect { diff --git a/targets/minecraft/world/effect/MobEffect.cpp b/targets/minecraft/world/effect/MobEffect.cpp index e01d5ca9e..16a7a6873 100644 --- a/targets/minecraft/world/effect/MobEffect.cpp +++ b/targets/minecraft/world/effect/MobEffect.cpp @@ -9,7 +9,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "java/Class.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/damageSource/DamageSource.h" diff --git a/targets/minecraft/world/effect/MobEffect.h b/targets/minecraft/world/effect/MobEffect.h index 9fbee2164..a25d16fde 100644 --- a/targets/minecraft/world/effect/MobEffect.h +++ b/targets/minecraft/world/effect/MobEffect.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" class Mob; diff --git a/targets/minecraft/world/effect/MobEffectInstance.cpp b/targets/minecraft/world/effect/MobEffectInstance.cpp index 4d5fb97a1..ab6b28e83 100644 --- a/targets/minecraft/world/effect/MobEffectInstance.cpp +++ b/targets/minecraft/world/effect/MobEffectInstance.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/effect/MobEffect.h" #include "nbt/CompoundTag.h" diff --git a/targets/minecraft/world/entity/Entity.cpp b/targets/minecraft/world/entity/Entity.cpp index 1d7e82679..3260b5400 100644 --- a/targets/minecraft/world/entity/Entity.cpp +++ b/targets/minecraft/world/entity/Entity.cpp @@ -14,9 +14,9 @@ #include "EntityIO.h" #include "EntityPos.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "SyncedEntityData.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" diff --git a/targets/minecraft/world/entity/EntityIO.cpp b/targets/minecraft/world/entity/EntityIO.cpp index d5e8c7bfd..538910761 100644 --- a/targets/minecraft/world/entity/EntityIO.cpp +++ b/targets/minecraft/world/entity/EntityIO.cpp @@ -3,7 +3,7 @@ #include #include "Entity.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "Painting.h" #include "java/Class.h" #include "java/JavaIntHash.h" diff --git a/targets/minecraft/world/entity/EntityIO.h b/targets/minecraft/world/entity/EntityIO.h index 983fee3da..19c4cdaef 100644 --- a/targets/minecraft/world/entity/EntityIO.h +++ b/targets/minecraft/world/entity/EntityIO.h @@ -5,8 +5,8 @@ #include #include "Entity.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Class.h" #include "java/JavaIntHash.h" diff --git a/targets/minecraft/world/entity/LivingEntity.cpp b/targets/minecraft/world/entity/LivingEntity.cpp index 31ad577e8..36f14a5c7 100644 --- a/targets/minecraft/world/entity/LivingEntity.cpp +++ b/targets/minecraft/world/entity/LivingEntity.cpp @@ -13,7 +13,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/entity/Painting.cpp b/targets/minecraft/world/entity/Painting.cpp index fdf21cf77..e3964b6bf 100644 --- a/targets/minecraft/world/entity/Painting.cpp +++ b/targets/minecraft/world/entity/Painting.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/HangingEntity.h" diff --git a/targets/minecraft/world/entity/SyncedEntityData.cpp b/targets/minecraft/world/entity/SyncedEntityData.cpp index cca799246..dc9ab6a9d 100644 --- a/targets/minecraft/world/entity/SyncedEntityData.cpp +++ b/targets/minecraft/world/entity/SyncedEntityData.cpp @@ -4,7 +4,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/network/packet/Packet.h" diff --git a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp index 105ef0f3b..daf55d610 100644 --- a/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp +++ b/targets/minecraft/world/entity/ai/attributes/AttributeModifier.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" diff --git a/targets/minecraft/world/entity/animal/EntityHorse.cpp b/targets/minecraft/world/entity/animal/EntityHorse.cpp index 132cbd479..86d41c2cc 100644 --- a/targets/minecraft/world/entity/animal/EntityHorse.cpp +++ b/targets/minecraft/world/entity/animal/EntityHorse.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/client/renderer/Textures.h" diff --git a/targets/minecraft/world/entity/animal/Ocelot.cpp b/targets/minecraft/world/entity/animal/Ocelot.cpp index b4ef7159d..a97ab9657 100644 --- a/targets/minecraft/world/entity/animal/Ocelot.cpp +++ b/targets/minecraft/world/entity/animal/Ocelot.cpp @@ -6,7 +6,7 @@ #include #include "IPlatformInput.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h index 23f37a5e5..4ce216f65 100644 --- a/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/targets/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "minecraft/stdafx.h" #include "minecraft/world/entity/LivingEntity.h" diff --git a/targets/minecraft/world/entity/boss/wither/WitherBoss.h b/targets/minecraft/world/entity/boss/wither/WitherBoss.h index c74245b20..69b1876be 100644 --- a/targets/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/targets/minecraft/world/entity/boss/wither/WitherBoss.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "minecraft/stdafx.h" #include "minecraft/world/entity/EntitySelector.h" diff --git a/targets/minecraft/world/entity/item/ItemEntity.cpp b/targets/minecraft/world/entity/item/ItemEntity.cpp index 0f58840dc..6bc7cbef1 100644 --- a/targets/minecraft/world/entity/item/ItemEntity.cpp +++ b/targets/minecraft/world/entity/item/ItemEntity.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "SharedConstants.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/entity/item/MinecartContainer.cpp b/targets/minecraft/world/entity/item/MinecartContainer.cpp index dfed95bba..fb91846b6 100644 --- a/targets/minecraft/world/entity/item/MinecartContainer.cpp +++ b/targets/minecraft/world/entity/item/MinecartContainer.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/item/ItemEntity.h" diff --git a/targets/minecraft/world/entity/monster/EnderMan.cpp b/targets/minecraft/world/entity/monster/EnderMan.cpp index 30bc76b3c..b719d8bc0 100644 --- a/targets/minecraft/world/entity/monster/EnderMan.cpp +++ b/targets/minecraft/world/entity/monster/EnderMan.cpp @@ -7,7 +7,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/entity/monster/Monster.cpp b/targets/minecraft/world/entity/monster/Monster.cpp index 9b824540c..98d763d4b 100644 --- a/targets/minecraft/world/entity/monster/Monster.cpp +++ b/targets/minecraft/world/entity/monster/Monster.cpp @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/entity/monster/PigZombie.cpp b/targets/minecraft/world/entity/monster/PigZombie.cpp index a4eecf257..a78e27143 100644 --- a/targets/minecraft/world/entity/monster/PigZombie.cpp +++ b/targets/minecraft/world/entity/monster/PigZombie.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/Difficulty.h" diff --git a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp index 0176714a4..8f4d8f9da 100644 --- a/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp +++ b/targets/minecraft/world/entity/monster/SharedMonsterAttributes.cpp @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" #include "minecraft/world/entity/ai/attributes/AttributeInstance.h" #include "minecraft/world/entity/ai/attributes/AttributeModifier.h" diff --git a/targets/minecraft/world/entity/monster/Silverfish.cpp b/targets/minecraft/world/entity/monster/Silverfish.cpp index 7177e132d..20042c5b7 100644 --- a/targets/minecraft/world/entity/monster/Silverfish.cpp +++ b/targets/minecraft/world/entity/monster/Silverfish.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/entity/monster/Spider.cpp b/targets/minecraft/world/entity/monster/Spider.cpp index c8b24a8e7..3f8141359 100644 --- a/targets/minecraft/world/entity/monster/Spider.cpp +++ b/targets/minecraft/world/entity/monster/Spider.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/Difficulty.h" diff --git a/targets/minecraft/world/entity/npc/Villager.cpp b/targets/minecraft/world/entity/npc/Villager.cpp index 1192ea746..128554781 100644 --- a/targets/minecraft/world/entity/npc/Villager.cpp +++ b/targets/minecraft/world/entity/npc/Villager.cpp @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "Pos.h" #include "SharedConstants.h" #include "java/Random.h" diff --git a/targets/minecraft/world/entity/player/Inventory.cpp b/targets/minecraft/world/entity/player/Inventory.cpp index 6b0c7624c..6bd3d243b 100644 --- a/targets/minecraft/world/entity/player/Inventory.cpp +++ b/targets/minecraft/world/entity/player/Inventory.cpp @@ -4,7 +4,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/world/entity/player/Player.cpp b/targets/minecraft/world/entity/player/Player.cpp index 3447a27ea..543e47229 100644 --- a/targets/minecraft/world/entity/player/Player.cpp +++ b/targets/minecraft/world/entity/player/Player.cpp @@ -20,12 +20,12 @@ #include #include "Inventory.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/src/DLC/DLCManager.h" -#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/App_structs.h" +#include "app/common/Minecraft_Macros.h" +#include "app/common/src/DLC/DLCManager.h" +#include "app/common/src/DLC/DLCSkinFile.h" +#include "app/linux/Linux_App.h" #include "java/JavaMath.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/entity/projectile/Arrow.cpp b/targets/minecraft/world/entity/projectile/Arrow.cpp index 5202aac85..0230157a1 100644 --- a/targets/minecraft/world/entity/projectile/Arrow.cpp +++ b/targets/minecraft/world/entity/projectile/Arrow.cpp @@ -8,7 +8,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/network/packet/GameEventPacket.h" diff --git a/targets/minecraft/world/entity/projectile/Fireball.cpp b/targets/minecraft/world/entity/projectile/Fireball.cpp index e6937d415..1cbdafa24 100644 --- a/targets/minecraft/world/entity/projectile/Fireball.cpp +++ b/targets/minecraft/world/entity/projectile/Fireball.cpp @@ -9,7 +9,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/inventory/AnvilMenu.cpp b/targets/minecraft/world/inventory/AnvilMenu.cpp index e4ac92681..ad0148b71 100644 --- a/targets/minecraft/world/inventory/AnvilMenu.cpp +++ b/targets/minecraft/world/inventory/AnvilMenu.cpp @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/world/item/ArmorItem.cpp b/targets/minecraft/world/item/ArmorItem.cpp index 2c834369a..c329e0ba3 100644 --- a/targets/minecraft/world/item/ArmorItem.cpp +++ b/targets/minecraft/world/item/ArmorItem.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/core/BehaviorRegistry.h" diff --git a/targets/minecraft/world/item/ArmorItem.h b/targets/minecraft/world/item/ArmorItem.h index e97bce353..3f8283fef 100644 --- a/targets/minecraft/world/item/ArmorItem.h +++ b/targets/minecraft/world/item/ArmorItem.h @@ -4,7 +4,7 @@ #include #include "Item.h" -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "minecraft/core/DefaultDispenseItemBehavior.h" class Icon; diff --git a/targets/minecraft/world/item/BucketItem.cpp b/targets/minecraft/world/item/BucketItem.cpp index 9bee7d363..1379c9ea3 100644 --- a/targets/minecraft/world/item/BucketItem.cpp +++ b/targets/minecraft/world/item/BucketItem.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/item/EnderEyeItem.cpp b/targets/minecraft/world/item/EnderEyeItem.cpp index ab8f37204..2b37c27fe 100644 --- a/targets/minecraft/world/item/EnderEyeItem.cpp +++ b/targets/minecraft/world/item/EnderEyeItem.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/item/FireworksChargeItem.cpp b/targets/minecraft/world/item/FireworksChargeItem.cpp index 8d8e20f32..0a8008bf1 100644 --- a/targets/minecraft/world/item/FireworksChargeItem.cpp +++ b/targets/minecraft/world/item/FireworksChargeItem.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/IconRegister.h" #include "minecraft/world/item/DyePowderItem.h" diff --git a/targets/minecraft/world/item/FireworksItem.cpp b/targets/minecraft/world/item/FireworksItem.cpp index 1703eee65..2b1ccef99 100644 --- a/targets/minecraft/world/item/FireworksItem.cpp +++ b/targets/minecraft/world/item/FireworksItem.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/player/Abilities.h" diff --git a/targets/minecraft/world/item/HangingEntityItem.cpp b/targets/minecraft/world/item/HangingEntityItem.cpp index ed74dd366..447f095e3 100644 --- a/targets/minecraft/world/item/HangingEntityItem.cpp +++ b/targets/minecraft/world/item/HangingEntityItem.cpp @@ -8,8 +8,8 @@ #include "Direction.h" #include "Facing.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/entity/HangingEntity.h" diff --git a/targets/minecraft/world/item/Item.cpp b/targets/minecraft/world/item/Item.cpp index 40c1d9144..f6461fd99 100644 --- a/targets/minecraft/world/item/Item.cpp +++ b/targets/minecraft/world/item/Item.cpp @@ -7,7 +7,7 @@ #include "HangingEntityItem.h" #include "MapItem.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/stats/Stats.h" diff --git a/targets/minecraft/world/item/PlanterTileItem.cpp b/targets/minecraft/world/item/PlanterTileItem.cpp index 3e1f4771b..2f4125f4d 100644 --- a/targets/minecraft/world/item/PlanterTileItem.cpp +++ b/targets/minecraft/world/item/PlanterTileItem.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/item/PotionItem.cpp b/targets/minecraft/world/item/PotionItem.cpp index 32c100d8f..b20be0317 100644 --- a/targets/minecraft/world/item/PotionItem.cpp +++ b/targets/minecraft/world/item/PotionItem.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/SharedConstants.h" diff --git a/targets/minecraft/world/item/Rarity.h b/targets/minecraft/world/item/Rarity.h index bf1cf24ab..d3981739d 100644 --- a/targets/minecraft/world/item/Rarity.h +++ b/targets/minecraft/world/item/Rarity.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" class Rarity { public: diff --git a/targets/minecraft/world/item/RecordingItem.cpp b/targets/minecraft/world/item/RecordingItem.cpp index ee6ecd9e9..eb8f3b684 100644 --- a/targets/minecraft/world/item/RecordingItem.cpp +++ b/targets/minecraft/world/item/RecordingItem.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "minecraft/stats/GenericStats.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/IconRegister.h" diff --git a/targets/minecraft/world/item/SpawnEggItem.cpp b/targets/minecraft/world/item/SpawnEggItem.cpp index d111e5f5e..286913955 100644 --- a/targets/minecraft/world/item/SpawnEggItem.cpp +++ b/targets/minecraft/world/item/SpawnEggItem.cpp @@ -4,8 +4,8 @@ #include #include "Facing.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/item/TileItem.cpp b/targets/minecraft/world/item/TileItem.cpp index 8bd70f847..283a729ad 100644 --- a/targets/minecraft/world/item/TileItem.cpp +++ b/targets/minecraft/world/item/TileItem.cpp @@ -4,8 +4,8 @@ #include -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "minecraft/Facing.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp index 2d64fa924..d38a597d2 100644 --- a/targets/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/targets/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/JavaMath.h" #include "minecraft/SharedConstants.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/item/crafting/Recipes.cpp b/targets/minecraft/world/item/crafting/Recipes.cpp index c731da61a..bb79885a1 100644 --- a/targets/minecraft/world/item/crafting/Recipes.cpp +++ b/targets/minecraft/world/item/crafting/Recipes.cpp @@ -8,7 +8,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/CoalItem.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp index 2cf1273bc..50ed38bcc 100644 --- a/targets/minecraft/world/item/crafting/ShapedRecipy.cpp +++ b/targets/minecraft/world/item/crafting/ShapedRecipy.cpp @@ -8,7 +8,7 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "Recipes.h" #include "minecraft/world/inventory/CraftingContainer.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/item/enchantment/Enchantment.cpp b/targets/minecraft/world/item/enchantment/Enchantment.cpp index 899eb4990..fa9eb5a9a 100644 --- a/targets/minecraft/world/item/enchantment/Enchantment.cpp +++ b/targets/minecraft/world/item/enchantment/Enchantment.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "minecraft/util/HtmlString.h" #include "minecraft/world/item/ItemInstance.h" #include "minecraft/world/item/enchantment/ArrowDamageEnchantment.h" diff --git a/targets/minecraft/world/level/Explosion.cpp b/targets/minecraft/world/level/Explosion.cpp index ae72188e2..eb6d58a87 100644 --- a/targets/minecraft/world/level/Explosion.cpp +++ b/targets/minecraft/world/level/Explosion.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/level/FoliageColor.cpp b/targets/minecraft/world/level/FoliageColor.cpp index 8a51ec121..e0ee7c2a8 100644 --- a/targets/minecraft/world/level/FoliageColor.cpp +++ b/targets/minecraft/world/level/FoliageColor.cpp @@ -1,7 +1,7 @@ #include "FoliageColor.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "minecraft/client/Minecraft.h" // 4J Stu - Don't use this any more diff --git a/targets/minecraft/world/level/GameRules.cpp b/targets/minecraft/world/level/GameRules.cpp index 88f3df225..9788c7141 100644 --- a/targets/minecraft/world/level/GameRules.cpp +++ b/targets/minecraft/world/level/GameRules.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" // 4J: GameRules isn't in use anymore, just routes any requests to app game host // options, kept things commented out for context diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp index ea3e07ab6..2da3fdb9d 100644 --- a/targets/minecraft/world/level/Level.cpp +++ b/targets/minecraft/world/level/Level.cpp @@ -15,13 +15,13 @@ #include "Explosion.h" #include "IPlatformInput.h" #include "LevelListener.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/FrameProfiler.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/FrameProfiler.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/PortalForcer.cpp b/targets/minecraft/world/level/PortalForcer.cpp index 658ed9e3c..c344413eb 100644 --- a/targets/minecraft/world/level/PortalForcer.cpp +++ b/targets/minecraft/world/level/PortalForcer.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "Pos.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/level/biome/Biome.cpp b/targets/minecraft/world/level/biome/Biome.cpp index 6e873a69e..f181729fc 100644 --- a/targets/minecraft/world/level/biome/Biome.cpp +++ b/targets/minecraft/world/level/biome/Biome.cpp @@ -6,8 +6,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/biome/Biome.h b/targets/minecraft/world/level/biome/Biome.h index f592721e5..d4c8fef4e 100644 --- a/targets/minecraft/world/level/biome/Biome.h +++ b/targets/minecraft/world/level/biome/Biome.h @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" #include "java/Class.h" #include "minecraft/util/WeighedRandom.h" #include "minecraft/world/entity/Mob.h" diff --git a/targets/minecraft/world/level/biome/BiomeCache.cpp b/targets/minecraft/world/level/biome/BiomeCache.cpp index e65ba4dfe..b448b2b29 100644 --- a/targets/minecraft/world/level/biome/BiomeCache.cpp +++ b/targets/minecraft/world/level/biome/BiomeCache.cpp @@ -3,7 +3,7 @@ #include #include "BiomeSource.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/biome/Biome.h" BiomeCache::Block::Block(int x, int z, BiomeCache* parent) { diff --git a/targets/minecraft/world/level/biome/BiomeDecorator.cpp b/targets/minecraft/world/level/biome/BiomeDecorator.cpp index 4cc0fee56..3b779a76b 100644 --- a/targets/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/targets/minecraft/world/level/biome/BiomeDecorator.cpp @@ -1,8 +1,8 @@ #include "minecraft/world/level/biome/BiomeDecorator.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/biome/BiomeSource.cpp b/targets/minecraft/world/level/biome/BiomeSource.cpp index 3f3af7cf5..b29076e04 100644 --- a/targets/minecraft/world/level/biome/BiomeSource.cpp +++ b/targets/minecraft/world/level/biome/BiomeSource.cpp @@ -5,8 +5,8 @@ #include #include "IPlatformInput.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "java/System.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp index 4a7d8ba48..fb2d2967e 100644 --- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -7,8 +7,8 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "console_helpers/Definitions.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/LevelChunk.cpp b/targets/minecraft/world/level/chunk/LevelChunk.cpp index faa9f4578..052c2d310 100644 --- a/targets/minecraft/world/level/chunk/LevelChunk.cpp +++ b/targets/minecraft/world/level/chunk/LevelChunk.cpp @@ -8,8 +8,8 @@ #include #include -#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Network/GameNetworkManager.h" +#include "app/linux/Linux_App.h" #include "SparseLightStorage.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp index 8269728d7..f713b11e6 100644 --- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp @@ -6,8 +6,8 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp index 9a5ba294b..98def52b1 100644 --- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp +++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp @@ -6,8 +6,8 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/linux/Stubs/winapi_stubs.h" +#include "app/include/NetTypes.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp index 75fe3e8e4..c75b840d4 100644 --- a/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp +++ b/targets/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/System.h" #include "minecraft/world/level/chunk/storage/ChunkStorage.h" diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 832692ceb..031934d66 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -9,8 +9,8 @@ #include #include "IPlatformInput.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "console_helpers/C4JThread.h" #include "console_helpers/ThreadName.h" #include "console_helpers/compression.h" diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index a5e60a91b..c446124f2 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -11,8 +11,8 @@ #include #include "IPlatformInput.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "console_helpers/Definitions.h" #include "java/File.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp index 4ac2fc1b4..d5c8c1277 100644 --- a/targets/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/targets/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/compression.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/world/level/dimension/Dimension.cpp b/targets/minecraft/world/level/dimension/Dimension.cpp index 932a4e125..15f2dfee2 100644 --- a/targets/minecraft/world/level/dimension/Dimension.cpp +++ b/targets/minecraft/world/level/dimension/Dimension.cpp @@ -6,10 +6,10 @@ #include "HellDimension.h" #include "IPlatformInput.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "NormalDimension.h" #include "TheEndDimension.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/dimension/HellDimension.cpp b/targets/minecraft/world/level/dimension/HellDimension.cpp index 0a18ecf0b..d92653608 100644 --- a/targets/minecraft/world/level/dimension/HellDimension.cpp +++ b/targets/minecraft/world/level/dimension/HellDimension.cpp @@ -3,10 +3,10 @@ #include #include "IPlatformInput.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LevelType.h" diff --git a/targets/minecraft/world/level/dimension/TheEndDimension.cpp b/targets/minecraft/world/level/dimension/TheEndDimension.cpp index 9570ee930..75c4dd45e 100644 --- a/targets/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/targets/minecraft/world/level/dimension/TheEndDimension.cpp @@ -4,8 +4,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "minecraft/Pos.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp index 1c6407db4..654b55be3 100644 --- a/targets/minecraft/world/level/levelgen/CanyonFeature.cpp +++ b/targets/minecraft/world/level/levelgen/CanyonFeature.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp index 167c8cbaf..531fa319f 100644 --- a/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -7,12 +7,12 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/biome/Biome.h" #include "minecraft/world/level/chunk/ChunkSource.h" #if defined(__linux__) -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #endif #include "java/Random.h" #include "minecraft/world/entity/MobCategory.h" diff --git a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp index 513a2af80..ffd596279 100644 --- a/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -5,7 +5,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 8cdbb5a2c..8a1cfeb4c 100644 --- a/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -6,7 +6,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index 188646587..156ba8b43 100644 --- a/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -7,7 +7,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/entity/MobCategory.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp index a96199aec..db69d0e96 100644 --- a/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -5,8 +5,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "console_helpers/PlatformTime.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index b25df3468..87e20452b 100644 --- a/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/targets/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -5,7 +5,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index 4def7bf36..e310ecdbc 100644 --- a/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp index eb092b3d4..2ca7a5645 100644 --- a/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/feature/Feature.h" diff --git a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp index 17baa23b7..ba7d39d36 100644 --- a/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index 2159ba560..c439e0bb9 100644 --- a/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -1,7 +1,7 @@ #include "FlowerFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/dimension/Dimension.h" diff --git a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp index 4bebfd027..3a6cbddb4 100644 --- a/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -1,7 +1,7 @@ #include "LakeFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/LightLayer.h" diff --git a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index df0848ccb..cab4358a6 100644 --- a/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp index e66392b90..4da0dfcf3 100644 --- a/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp index 2410e5e18..cff549e34 100644 --- a/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/LeafTile.h" diff --git a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index 15fd09842..f991e7f3c 100644 --- a/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -1,7 +1,7 @@ #include "ReedsFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp index 03dacd96f..27281ae3e 100644 --- a/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -1,7 +1,7 @@ #include "SandFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp index b895f664d..4bd3a5f14 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpikeFeature.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/entity/boss/enderdragon/EnderCrystal.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp index a39340d96..63bbe9dd5 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -1,7 +1,7 @@ #include "SpringFeature.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/Tile.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 060182393..2bac8139c 100644 --- a/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/levelgen/feature/Feature.h" diff --git a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index ceaee11ff..0af083772 100644 --- a/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/material/Material.h" diff --git a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp index 900a81941..a0477a07d 100644 --- a/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index f704b230a..6a10adb33 100644 --- a/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -8,9 +8,9 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/level/levelgen/structure/MineShaftStart.h" diff --git a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index fecdb0f0f..8af680c40 100644 --- a/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "NetherBridgePieces.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 4c0666db9..7c97fc4ec 100644 --- a/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "ScatteredFeaturePieces.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index b252b3d08..b2211fd09 100644 --- a/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index 187a505a4..b21fd0828 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -8,10 +8,10 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "StrongholdPieces.h" #include "java/JavaMath.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp index 9c69dac21..42f87dc7c 100644 --- a/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp @@ -6,8 +6,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/Random.h" #include "minecraft/Direction.h" diff --git a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp index 7fe487571..4f01fec98 100644 --- a/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp +++ b/targets/minecraft/world/level/levelgen/structure/StructureFeatureIO.cpp @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/levelgen/structure/MineShaftPieces.h" #include "minecraft/world/level/levelgen/structure/MineShaftStart.h" #include "minecraft/world/level/levelgen/structure/NetherBridgeFeature.h" diff --git a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 05a34a095..98ae241cf 100644 --- a/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/targets/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -4,9 +4,9 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" #include "VillagePieces.h" #include "java/Random.h" #include "minecraft/util/Mth.h" diff --git a/targets/minecraft/world/level/material/MaterialColor.h b/targets/minecraft/world/level/material/MaterialColor.h index 79bb7a18d..4e40de3eb 100644 --- a/targets/minecraft/world/level/material/MaterialColor.h +++ b/targets/minecraft/world/level/material/MaterialColor.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/App_enums.h" +#include "app/common/App_enums.h" class MaterialColor { public: diff --git a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp index 33cc1f998..e5e1cf371 100644 --- a/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/BiomeOverrideLayer.cpp @@ -5,10 +5,10 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/newbiome/layer/Layer.h" #if defined(__linux__) -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #endif #include "minecraft/world/level/biome/Biome.h" diff --git a/targets/minecraft/world/level/newbiome/layer/Layer.cpp b/targets/minecraft/world/level/newbiome/layer/Layer.cpp index 1cd870d37..dcfc389c6 100644 --- a/targets/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/targets/minecraft/world/level/newbiome/layer/Layer.cpp @@ -7,8 +7,8 @@ #include "BiomeOverrideLayer.h" #include "IPlatformInput.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/LevelType.h" #include "minecraft/world/level/newbiome/layer/AddIslandLayer.h" #include "minecraft/world/level/newbiome/layer/AddMushroomIslandLayer.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 820f3e703..6b67ddfce 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -8,7 +8,7 @@ #include #include -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" +#include "app/common/src/GameRules/GameRuleManager.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 66ff9925a..9a25586f0 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -13,11 +13,11 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/BuildVer/BuildVer.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/compression.h" #include "java/File.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index 0fb8b7e84..156387b8c 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -14,11 +14,11 @@ #include #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" -#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/App_enums.h" +#include "app/common/src/BuildVer/BuildVer.h" +#include "app/common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/PlatformTime.h" #include "console_helpers/PortableFileIO.h" #include "console_helpers/StringHelpers.h" diff --git a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp index 1adebebe1..46fa45702 100644 --- a/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp +++ b/targets/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp @@ -11,8 +11,8 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/Definitions.h" #include "java/System.h" diff --git a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp index c8ab6aaa6..7d4347c43 100644 --- a/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -12,10 +12,10 @@ #include "IPlatformInput.h" #include "LevelData.h" -#include "Minecraft.Client/Common/src/Console_Debug_enum.h" -#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/common/src/Console_Debug_enum.h" +#include "app/common/src/GameRules/GameRuleManager.h" +#include "app/linux/Linux_App.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "console_helpers/StringHelpers.h" #include "java/File.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/targets/minecraft/world/level/storage/LevelData.cpp b/targets/minecraft/world/level/storage/LevelData.cpp index 2859056e1..b8a4bd904 100644 --- a/targets/minecraft/world/level/storage/LevelData.cpp +++ b/targets/minecraft/world/level/storage/LevelData.cpp @@ -5,9 +5,9 @@ #include #include -#include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_Defines.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "java/System.h" #include "minecraft/world/level/GameRules.h" #include "minecraft/world/level/LevelSettings.h" diff --git a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp index c6aaa7234..aba388d38 100644 --- a/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/McRegionLevelStorage.cpp @@ -6,7 +6,7 @@ #include #include "LevelData.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/File.h" #include "minecraft/world/level/chunk/storage/McRegionChunkStorage.h" #include "minecraft/world/level/chunk/storage/RegionFileCache.h" diff --git a/targets/minecraft/world/level/storage/SavedDataStorage.cpp b/targets/minecraft/world/level/storage/SavedDataStorage.cpp index 348afa2d1..71635ed81 100644 --- a/targets/minecraft/world/level/storage/SavedDataStorage.cpp +++ b/targets/minecraft/world/level/storage/SavedDataStorage.cpp @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "minecraft/world/entity/ai/village/Villages.h" diff --git a/targets/minecraft/world/level/tile/FireTile.cpp b/targets/minecraft/world/level/tile/FireTile.cpp index ef7458db6..8d6e55ee8 100644 --- a/targets/minecraft/world/level/tile/FireTile.cpp +++ b/targets/minecraft/world/level/tile/FireTile.cpp @@ -4,8 +4,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/server/MinecraftServer.h" diff --git a/targets/minecraft/world/level/tile/GrassTile.cpp b/targets/minecraft/world/level/tile/GrassTile.cpp index 7875d0f60..8e90949ce 100644 --- a/targets/minecraft/world/level/tile/GrassTile.cpp +++ b/targets/minecraft/world/level/tile/GrassTile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/Facing.h" #include "minecraft/client/Minecraft.h" diff --git a/targets/minecraft/world/level/tile/LeafTile.cpp b/targets/minecraft/world/level/tile/LeafTile.cpp index bfdd35664..b7fc672cd 100644 --- a/targets/minecraft/world/level/tile/LeafTile.cpp +++ b/targets/minecraft/world/level/tile/LeafTile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/core/particles/ParticleTypes.h" diff --git a/targets/minecraft/world/level/tile/NotGateTile.cpp b/targets/minecraft/world/level/tile/NotGateTile.cpp index 5e57d939a..2d4a50cbb 100644 --- a/targets/minecraft/world/level/tile/NotGateTile.cpp +++ b/targets/minecraft/world/level/tile/NotGateTile.cpp @@ -1,6 +1,6 @@ #include "NotGateTile.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" diff --git a/targets/minecraft/world/level/tile/NoteBlockTile.cpp b/targets/minecraft/world/level/tile/NoteBlockTile.cpp index 28080a059..1dfded851 100644 --- a/targets/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/targets/minecraft/world/level/tile/NoteBlockTile.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/core/particles/ParticleTypes.h" #include "minecraft/sounds/SoundTypes.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/PressurePlateTile.cpp b/targets/minecraft/world/level/tile/PressurePlateTile.cpp index aed019d14..8d18d8117 100644 --- a/targets/minecraft/world/level/tile/PressurePlateTile.cpp +++ b/targets/minecraft/world/level/tile/PressurePlateTile.cpp @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "minecraft/world/entity/Entity.h" #include "minecraft/world/entity/LivingEntity.h" #include "minecraft/world/entity/player/Player.h" diff --git a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp index 2afe67f79..fe188b611 100644 --- a/targets/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/targets/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -6,8 +6,8 @@ #include #include "DiodeTile.h" -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/Direction.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/tile/StemTile.cpp b/targets/minecraft/world/level/tile/StemTile.cpp index 13dc89ce4..7b50a4f1c 100644 --- a/targets/minecraft/world/level/tile/StemTile.cpp +++ b/targets/minecraft/world/level/tile/StemTile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/IconRegister.h" diff --git a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp index 5a54a25d7..2de77e1de 100644 --- a/targets/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/targets/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "minecraft/world/entity/monster/Silverfish.h" #include "minecraft/world/item/ItemInstance.h" diff --git a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp index c6e715f83..4e65b1ae8 100644 --- a/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/targets/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Random.h" #include "minecraft/client/Minecraft.h" #include "minecraft/stats/GenericStats.h" diff --git a/targets/minecraft/world/level/tile/Tile.cpp b/targets/minecraft/world/level/tile/Tile.cpp index fab24a19c..c965ae31e 100644 --- a/targets/minecraft/world/level/tile/Tile.cpp +++ b/targets/minecraft/world/level/tile/Tile.cpp @@ -5,7 +5,7 @@ #include #include "Facing.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "console_helpers/StringHelpers.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/tile/TntTile.cpp b/targets/minecraft/world/level/tile/TntTile.cpp index e542b2ff0..6addb4261 100644 --- a/targets/minecraft/world/level/tile/TntTile.cpp +++ b/targets/minecraft/world/level/tile/TntTile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" #include "minecraft/Facing.h" diff --git a/targets/minecraft/world/level/tile/WaterLilyTile.cpp b/targets/minecraft/world/level/tile/WaterLilyTile.cpp index c39d8a64a..896b82c5c 100644 --- a/targets/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/targets/minecraft/world/level/tile/WaterLilyTile.cpp @@ -3,8 +3,8 @@ #include #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "app/common/App_enums.h" +#include "app/common/src/Colours/ColourTable.h" #include "java/Class.h" #include "minecraft/client/Minecraft.h" #include "minecraft/world/entity/Entity.h" diff --git a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index 7c3d82f0f..4019c21a9 100644 --- a/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "SharedConstants.h" #include "minecraft/network/packet/TileEntityDataPacket.h" #include "minecraft/world/effect/MobEffect.h" diff --git a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index c294fea14..ff11f89a0 100644 --- a/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -6,7 +6,7 @@ #include #include "Facing.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/SharedConstants.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/Item.h" diff --git a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp index 868a61601..bd111694d 100644 --- a/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -5,7 +5,7 @@ #include #include "Direction.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "SharedConstants.h" #include "TileEntity.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index 17361cfd1..e726d55ff 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "TileEntity.h" #include "java/Random.h" #include "minecraft/world/Container.h" diff --git a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp index 952f3c7d0..2f985ced4 100644 --- a/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/level/tile/entity/TileEntity.h" #include "strings.h" diff --git a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index 0cdedeea9..e11c08b34 100644 --- a/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/level/Level.h" diff --git a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 4fe7ec081..832a37c37 100644 --- a/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -3,7 +3,7 @@ #include #include "Facing.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "minecraft/world/Container.h" #include "minecraft/world/entity/player/Player.h" #include "minecraft/world/item/CoalItem.h" diff --git a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp index 441051d13..3db9d6617 100644 --- a/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -6,7 +6,7 @@ #include #include "Facing.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "java/Random.h" #include "minecraft/util/Mth.h" #include "minecraft/world/WorldlyContainer.h" diff --git a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp index 40e064a47..51a2ed6f6 100644 --- a/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/SignTileEntity.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" +#include "app/linux/Stubs/winapi_stubs.h" #include "PlatformTypes.h" #include "minecraft/client/Minecraft.h" #include "minecraft/network/packet/SignUpdatePacket.h" diff --git a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index c23b00da8..000536bca 100644 --- a/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/targets/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/common/App_enums.h" +#include "app/linux/Linux_App.h" #include "TheEndPortalTileEntity.h" #include "java/Class.h" #include "java/Random.h" diff --git a/targets/minecraft/world/level/tile/entity/TileEntity.cpp b/targets/minecraft/world/level/tile/entity/TileEntity.cpp index cd765ad73..ab7d5a16d 100644 --- a/targets/minecraft/world/level/tile/entity/TileEntity.cpp +++ b/targets/minecraft/world/level/tile/entity/TileEntity.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Linux/Linux_App.h" +#include "app/linux/Linux_App.h" #include "PistonPieceTileEntity.h" #include "minecraft/world/level/Level.h" #include "minecraft/world/level/tile/JukeboxTile.h" diff --git a/targets/platform/IPlatformNetwork.h b/targets/platform/IPlatformNetwork.h index 3cf1babaf..5cfeb2f0b 100644 --- a/targets/platform/IPlatformNetwork.h +++ b/targets/platform/IPlatformNetwork.h @@ -5,7 +5,7 @@ #include #include "../4J.Common/4J_Compat.h" -#include "Minecraft.Client/include/NetTypes.h" +#include "app/include/NetTypes.h" #ifndef VER_NETWORK #define VER_NETWORK 560