From 31a17ff8dfc9870a2538bf71d6dc7807d3c5a045 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Wed, 1 Apr 2026 09:36:14 -0500 Subject: [PATCH] replace D3DXVECTOR3 with Vec3, rename Source Files and Header Files to src/include --- .../Minecraft.Client/Common/App_structs.h | 10 +- .../Minecraft.Client/Common/Consoles_App.cpp | 26 +-- .../Minecraft.Client/Common/Consoles_App.h | 24 +-- .../Source Files/GameRules/ConsoleGameRules.h | 32 ---- .../Common/Source Files/UI/UI.h | 119 -------------- .../Audio/Consoles_SoundEngine.cpp | 2 +- .../Audio/Consoles_SoundEngine.h | 2 +- .../Audio/SoundEngine.cpp | 2 +- .../{Source Files => src}/Audio/SoundEngine.h | 4 +- .../Audio/SoundNames.cpp | 2 +- .../{Source Files => src}/BuildVer/BuildVer.h | 0 .../Colours/ColourTable.cpp | 8 +- .../Colours/ColourTable.h | 0 .../{Source Files => src}/ConsoleGameMode.cpp | 6 +- .../{Source Files => src}/ConsoleGameMode.h | 2 +- .../Console_Awards_enum.h | 0 .../Console_Debug_enum.h | 0 .../DLC/DLCAudioFile.cpp | 8 +- .../{Source Files => src}/DLC/DLCAudioFile.h | 0 .../{Source Files => src}/DLC/DLCCapeFile.cpp | 2 +- .../{Source Files => src}/DLC/DLCCapeFile.h | 0 .../DLC/DLCColourTableFile.cpp | 4 +- .../DLC/DLCColourTableFile.h | 0 .../{Source Files => src}/DLC/DLCFile.cpp | 2 +- .../{Source Files => src}/DLC/DLCFile.h | 0 .../{Source Files => src}/DLC/DLCGameRules.h | 2 +- .../DLC/DLCGameRulesFile.cpp | 2 +- .../DLC/DLCGameRulesFile.h | 0 .../DLC/DLCGameRulesHeader.cpp | 6 +- .../DLC/DLCGameRulesHeader.h | 2 +- .../DLC/DLCLocalisationFile.cpp | 4 +- .../DLC/DLCLocalisationFile.h | 0 .../{Source Files => src}/DLC/DLCManager.cpp | 6 +- .../{Source Files => src}/DLC/DLCManager.h | 0 .../{Source Files => src}/DLC/DLCPack.cpp | 10 +- .../{Source Files => src}/DLC/DLCPack.h | 2 +- .../{Source Files => src}/DLC/DLCSkinFile.cpp | 10 +- .../{Source Files => src}/DLC/DLCSkinFile.h | 4 +- .../DLC/DLCTextureFile.cpp | 2 +- .../DLC/DLCTextureFile.h | 2 +- .../DLC/DLCUIDataFile.cpp | 2 +- .../{Source Files => src}/DLC/DLCUIDataFile.h | 0 .../Common/src/GameRules/ConsoleGameRules.h | 32 ++++ .../GameRules/ConsoleGameRulesConstants.h | 0 .../GameRules/GameRuleManager.cpp | 18 +-- .../GameRules/GameRuleManager.h | 6 +- .../ApplySchematicRuleDefinition.cpp | 10 +- .../ApplySchematicRuleDefinition.h | 4 +- .../LevelGeneration/BiomeOverride.cpp | 4 +- .../GameRules/LevelGeneration/BiomeOverride.h | 4 +- .../ConsoleGenerateStructure.cpp | 14 +- .../ConsoleGenerateStructure.h | 4 +- .../ConsoleGenerateStructureAction.h | 2 +- .../LevelGeneration/ConsoleSchematicFile.cpp | 8 +- .../LevelGeneration/ConsoleSchematicFile.h | 2 +- .../LevelGenerationOptions.cpp | 14 +- .../LevelGeneration/LevelGenerationOptions.h | 6 +- .../LevelGeneration/LevelGenerators.cpp | 2 +- .../LevelGeneration/LevelGenerators.h | 0 .../LevelGeneration/StartFeature.cpp | 4 +- .../GameRules/LevelGeneration/StartFeature.h | 4 +- .../XboxStructureActionGenerateBox.cpp | 6 +- .../XboxStructureActionGenerateBox.h | 4 +- .../XboxStructureActionPlaceBlock.cpp | 6 +- .../XboxStructureActionPlaceBlock.h | 4 +- .../XboxStructureActionPlaceContainer.cpp | 6 +- .../XboxStructureActionPlaceContainer.h | 2 +- .../XboxStructureActionPlaceSpawner.cpp | 4 +- .../XboxStructureActionPlaceSpawner.h | 2 +- .../GameRules/LevelRules/LevelRules.cpp | 2 +- .../GameRules/LevelRules/LevelRules.h | 0 .../AddEnchantmentRuleDefinition.cpp | 4 +- .../AddEnchantmentRuleDefinition.h | 2 +- .../RuleDefinitions/AddItemRuleDefinition.cpp | 4 +- .../RuleDefinitions/AddItemRuleDefinition.h | 2 +- .../CollectItemRuleDefinition.cpp | 6 +- .../CollectItemRuleDefinition.h | 4 +- .../CompleteAllRuleDefinition.cpp | 8 +- .../CompleteAllRuleDefinition.h | 2 +- .../CompoundGameRuleDefinition.cpp | 12 +- .../CompoundGameRuleDefinition.h | 4 +- .../RuleDefinitions/GameRuleDefinition.cpp | 12 +- .../RuleDefinitions/GameRuleDefinition.h | 4 +- .../RuleDefinitions/LevelRuleset.cpp | 8 +- .../LevelRules/RuleDefinitions/LevelRuleset.h | 2 +- .../NamedAreaRuleDefinition.cpp | 4 +- .../RuleDefinitions/NamedAreaRuleDefinition.h | 2 +- .../UpdatePlayerRuleDefinition.cpp | 6 +- .../UpdatePlayerRuleDefinition.h | 2 +- .../RuleDefinitions/UseTileRuleDefinition.cpp | 4 +- .../RuleDefinitions/UseTileRuleDefinition.h | 2 +- .../GameRules/LevelRules/Rules/GameRule.cpp | 4 +- .../GameRules/LevelRules/Rules/GameRule.h | 0 .../LevelRules/Rules/GameRulesInstance.h | 0 .../GameRules/WstringLookup.cpp | 0 .../GameRules/WstringLookup.h | 0 .../Leaderboards/LeaderboardInterface.cpp | 2 +- .../Leaderboards/LeaderboardInterface.h | 0 .../Leaderboards/LeaderboardManager.cpp | 6 +- .../Leaderboards/LeaderboardManager.h | 0 .../Leaderboards/base64.cpp | 0 .../Leaderboards/base64.h | 0 .../Localisation/StringTable.cpp | 2 +- .../Localisation/StringTable.h | 0 .../Network/GameNetworkManager.cpp | 10 +- .../Network/GameNetworkManager.h | 0 .../Network/NetworkPlayerInterface.h | 0 .../Network/NetworkPlayerQNet.cpp | 6 +- .../Network/NetworkPlayerQNet.h | 0 .../Network/PlatformNetworkManagerInterface.h | 6 +- .../Network/PlatformNetworkManagerStub.cpp | 4 +- .../Network/PlatformNetworkManagerStub.h | 6 +- .../Network/SessionInfo.h | 0 .../{Source Files => src}/Network/Socket.cpp | 10 +- .../{Source Files => src}/Network/Socket.h | 4 +- .../{Source Files => src}/Trial/TrialMode.cpp | 6 +- .../{Source Files => src}/Trial/TrialMode.h | 2 +- .../Tutorial/Constraints/AreaConstraint.cpp | 2 +- .../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 .../Tutorial/FullTutorial.cpp | 12 +- .../Tutorial/FullTutorial.h | 0 .../Tutorial/FullTutorialMode.cpp | 6 +- .../Tutorial/FullTutorialMode.h | 0 .../Tutorial/Hints/AreaHint.cpp | 4 +- .../Tutorial/Hints/AreaHint.h | 2 +- .../Tutorial/Hints/DiggerItemHint.cpp | 2 +- .../Tutorial/Hints/DiggerItemHint.h | 0 .../Tutorial/Hints/LookAtEntityHint.cpp | 4 +- .../Tutorial/Hints/LookAtEntityHint.h | 2 +- .../Tutorial/Hints/LookAtTileHint.cpp | 4 +- .../Tutorial/Hints/LookAtTileHint.h | 2 +- .../Tutorial/Hints/TakeItemHint.cpp | 4 +- .../Tutorial/Hints/TakeItemHint.h | 2 +- .../Tutorial/Hints/TutorialHint.cpp | 6 +- .../Tutorial/Hints/TutorialHint.h | 2 +- .../Tutorial/Hints/TutorialHints.h | 0 .../Tutorial/Tasks/AreaTask.cpp | 6 +- .../Tutorial/Tasks/AreaTask.h | 2 +- .../Tutorial/Tasks/ChoiceTask.cpp | 6 +- .../Tutorial/Tasks/ChoiceTask.h | 2 +- .../Tutorial/Tasks/CompleteUsingItemTask.cpp | 2 +- .../Tutorial/Tasks/CompleteUsingItemTask.h | 0 .../Tutorial/Tasks/ControllerTask.cpp | 4 +- .../Tutorial/Tasks/ControllerTask.h | 0 .../Tutorial/Tasks/CraftTask.cpp | 2 +- .../Tutorial/Tasks/CraftTask.h | 0 .../Tutorial/Tasks/EffectChangedTask.cpp | 2 +- .../Tutorial/Tasks/EffectChangedTask.h | 0 .../Tutorial/Tasks/FullTutorialActiveTask.cpp | 4 +- .../Tutorial/Tasks/FullTutorialActiveTask.h | 2 +- .../Tutorial/Tasks/HorseChoiceTask.cpp | 2 +- .../Tutorial/Tasks/HorseChoiceTask.h | 2 +- .../Tutorial/Tasks/InfoTask.cpp | 6 +- .../Tutorial/Tasks/InfoTask.h | 0 .../Tutorial/Tasks/PickupTask.cpp | 0 .../Tutorial/Tasks/PickupTask.h | 0 .../Tutorial/Tasks/ProcedureCompoundTask.cpp | 2 +- .../Tutorial/Tasks/ProcedureCompoundTask.h | 2 +- .../Tutorial/Tasks/ProgressFlagTask.cpp | 0 .../Tutorial/Tasks/ProgressFlagTask.h | 2 +- .../Tutorial/Tasks/RideEntityTask.cpp | 2 +- .../Tutorial/Tasks/RideEntityTask.h | 0 .../Tutorial/Tasks/StatTask.cpp | 2 +- .../Tutorial/Tasks/StatTask.h | 0 .../Tutorial/Tasks/StateChangeTask.h | 2 +- .../Tutorial/Tasks/TutorialTask.cpp | 6 +- .../Tutorial/Tasks/TutorialTask.h | 2 +- .../Tutorial/Tasks/TutorialTasks.h | 0 .../Tutorial/Tasks/UseItemTask.cpp | 2 +- .../Tutorial/Tasks/UseItemTask.h | 0 .../Tutorial/Tasks/UseTileTask.cpp | 2 +- .../Tutorial/Tasks/UseTileTask.h | 0 .../Tutorial/Tasks/XuiCraftingTask.cpp | 4 +- .../Tutorial/Tasks/XuiCraftingTask.h | 0 .../Tutorial/Tutorial.cpp | 8 +- .../{Source Files => src}/Tutorial/Tutorial.h | 6 +- .../Tutorial/TutorialEnum.h | 0 .../Tutorial/TutorialMessage.cpp | 0 .../Tutorial/TutorialMessage.h | 0 .../Tutorial/TutorialMode.cpp | 6 +- .../Tutorial/TutorialMode.h | 0 .../UI/All Platforms/ArchiveFile.cpp | 6 +- .../UI/All Platforms/ArchiveFile.h | 0 .../UI/All Platforms/IUIController.h | 2 +- .../IUIScene_AbstractContainerMenu.cpp | 9 +- .../IUIScene_AbstractContainerMenu.h | 2 +- .../UI/All Platforms/IUIScene_AnvilMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_AnvilMenu.h | 0 .../UI/All Platforms/IUIScene_BeaconMenu.cpp | 2 +- .../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 | 4 +- .../UI/All Platforms/IUIScene_CraftingMenu.h | 2 +- .../All Platforms/IUIScene_CreativeMenu.cpp | 2 +- .../UI/All Platforms/IUIScene_CreativeMenu.h | 0 .../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 .../UI/All Platforms/IUIScene_HUD.cpp | 0 .../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 | 8 +- .../UI/All Platforms/IUIScene_PauseMenu.h | 4 +- .../UI/All Platforms/IUIScene_TradingMenu.cpp | 4 +- .../UI/All Platforms/IUIScene_TradingMenu.h | 2 +- .../UI/All Platforms/UIEnums.h | 0 .../UI/All Platforms/UIStructs.h | 0 .../UI/Components/UIComponent_Chat.cpp | 6 +- .../UI/Components/UIComponent_Chat.h | 8 +- .../Components/UIComponent_DebugUIConsole.cpp | 6 +- .../Components/UIComponent_DebugUIConsole.h | 6 +- .../UIComponent_DebugUIMarketingGuide.cpp | 4 +- .../UIComponent_DebugUIMarketingGuide.h | 6 +- .../UI/Components/UIComponent_Logo.cpp | 6 +- .../UI/Components/UIComponent_Logo.h | 4 +- .../Components/UIComponent_MenuBackground.cpp | 6 +- .../Components/UIComponent_MenuBackground.h | 4 +- .../UI/Components/UIComponent_Panorama.cpp | 6 +- .../UI/Components/UIComponent_Panorama.h | 4 +- .../UIComponent_PressStartToPlay.cpp | 4 +- .../Components/UIComponent_PressStartToPlay.h | 2 +- .../UI/Components/UIComponent_Tooltips.cpp | 6 +- .../UI/Components/UIComponent_Tooltips.h | 6 +- .../Components/UIComponent_TutorialPopup.cpp | 6 +- .../UI/Components/UIComponent_TutorialPopup.h | 2 +- .../UI/Components/UIScene_HUD.cpp | 2 +- .../UI/Components/UIScene_HUD.h | 4 +- .../UI/Controls/UIControl.cpp | 2 +- .../UI/Controls/UIControl.h | 2 +- .../UI/Controls/UIControl_Base.cpp | 6 +- .../UI/Controls/UIControl_Base.h | 4 +- .../Controls/UIControl_BeaconEffectButton.cpp | 6 +- .../Controls/UIControl_BeaconEffectButton.h | 2 +- .../UI/Controls/UIControl_BitmapIcon.cpp | 6 +- .../UI/Controls/UIControl_BitmapIcon.h | 2 +- .../UI/Controls/UIControl_Button.cpp | 8 +- .../UI/Controls/UIControl_Button.h | 4 +- .../UI/Controls/UIControl_ButtonList.cpp | 8 +- .../UI/Controls/UIControl_ButtonList.h | 4 +- .../UI/Controls/UIControl_CheckBox.cpp | 8 +- .../UI/Controls/UIControl_CheckBox.h | 4 +- .../UI/Controls/UIControl_Cursor.cpp | 6 +- .../UI/Controls/UIControl_Cursor.h | 2 +- .../UI/Controls/UIControl_DLCList.cpp | 8 +- .../UI/Controls/UIControl_DLCList.h | 2 +- .../UI/Controls/UIControl_DynamicLabel.cpp | 8 +- .../UI/Controls/UIControl_DynamicLabel.h | 4 +- .../UI/Controls/UIControl_EnchantmentBook.cpp | 6 +- .../UI/Controls/UIControl_EnchantmentBook.h | 2 +- .../Controls/UIControl_EnchantmentButton.cpp | 10 +- .../UI/Controls/UIControl_EnchantmentButton.h | 2 +- .../UI/Controls/UIControl_HTMLLabel.cpp | 8 +- .../UI/Controls/UIControl_HTMLLabel.h | 4 +- .../UI/Controls/UIControl_Label.cpp | 8 +- .../UI/Controls/UIControl_Label.h | 4 +- .../UI/Controls/UIControl_LeaderboardList.cpp | 8 +- .../UI/Controls/UIControl_LeaderboardList.h | 2 +- .../UI/Controls/UIControl_MinecraftHorse.cpp | 6 +- .../UI/Controls/UIControl_MinecraftHorse.h | 0 .../UI/Controls/UIControl_MinecraftPlayer.cpp | 6 +- .../UI/Controls/UIControl_MinecraftPlayer.h | 0 .../UI/Controls/UIControl_PlayerList.cpp | 8 +- .../UI/Controls/UIControl_PlayerList.h | 2 +- .../Controls/UIControl_PlayerSkinPreview.cpp | 2 +- .../UI/Controls/UIControl_PlayerSkinPreview.h | 0 .../UI/Controls/UIControl_Progress.cpp | 8 +- .../UI/Controls/UIControl_Progress.h | 4 +- .../UI/Controls/UIControl_SaveList.cpp | 8 +- .../UI/Controls/UIControl_SaveList.h | 2 +- .../UI/Controls/UIControl_Slider.cpp | 10 +- .../UI/Controls/UIControl_Slider.h | 4 +- .../UI/Controls/UIControl_SlotList.cpp | 8 +- .../UI/Controls/UIControl_SlotList.h | 2 +- .../Controls/UIControl_SpaceIndicatorBar.cpp | 8 +- .../UI/Controls/UIControl_SpaceIndicatorBar.h | 4 +- .../UI/Controls/UIControl_TextInput.cpp | 8 +- .../UI/Controls/UIControl_TextInput.h | 4 +- .../UI/Controls/UIControl_TexturePackList.cpp | 10 +- .../UI/Controls/UIControl_TexturePackList.h | 2 +- .../UI/Controls/UIControl_Touch.cpp | 4 +- .../UI/Controls/UIControl_Touch.h | 2 +- .../Debug/UIScene_DebugCreateSchematic.cpp | 8 +- .../Debug/UIScene_DebugCreateSchematic.h | 14 +- .../UI/Scenes/Debug/UIScene_DebugOptions.cpp | 6 +- .../UI/Scenes/Debug/UIScene_DebugOptions.h | 8 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.cpp | 8 +- .../UI/Scenes/Debug/UIScene_DebugOverlay.h | 10 +- .../Scenes/Debug/UIScene_DebugSetCamera.cpp | 4 +- .../UI/Scenes/Debug/UIScene_DebugSetCamera.h | 14 +- .../IUIScene_StartGame.cpp | 4 +- .../IUIScene_StartGame.h | 12 +- .../UIScene_CreateWorldMenu.cpp | 4 +- .../UIScene_CreateWorldMenu.h | 2 +- .../UIScene_DLCMainMenu.cpp | 2 +- .../UIScene_DLCMainMenu.h | 2 +- .../UIScene_DLCOffersMenu.cpp | 2 +- .../UIScene_DLCOffersMenu.h | 6 +- .../Frontend Menu screens/UIScene_EULA.cpp | 2 +- .../Frontend Menu screens/UIScene_EULA.h | 6 +- .../Frontend Menu screens/UIScene_Intro.cpp | 4 +- .../Frontend Menu screens/UIScene_Intro.h | 4 +- .../UIScene_JoinMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_JoinMenu.h | 2 +- .../UIScene_LaunchMoreOptionsMenu.cpp | 4 +- .../UIScene_LaunchMoreOptionsMenu.h | 2 +- .../UIScene_LeaderboardsMenu.cpp | 4 +- .../UIScene_LeaderboardsMenu.h | 6 +- .../UIScene_LoadMenu.cpp | 4 +- .../Frontend Menu screens/UIScene_LoadMenu.h | 2 +- .../UIScene_LoadOrJoinMenu.cpp | 6 +- .../UIScene_LoadOrJoinMenu.h | 4 +- .../UIScene_MainMenu.cpp | 2 +- .../Frontend Menu screens/UIScene_MainMenu.h | 2 +- .../UIScene_NewUpdateMessage.cpp | 2 +- .../UIScene_NewUpdateMessage.h | 6 +- .../UIScene_SaveMessage.cpp | 2 +- .../UIScene_SaveMessage.h | 2 +- .../UIScene_TrialExitUpsell.cpp | 2 +- .../UIScene_TrialExitUpsell.h | 2 +- .../Help & Options/UIScene_ControlsMenu.cpp | 6 +- .../Help & Options/UIScene_ControlsMenu.h | 2 +- .../Scenes/Help & Options/UIScene_Credits.cpp | 2 +- .../Scenes/Help & Options/UIScene_Credits.h | 2 +- .../UIScene_HelpAndOptionsMenu.cpp | 2 +- .../UIScene_HelpAndOptionsMenu.h | 2 +- .../Help & Options/UIScene_HowToPlay.cpp | 2 +- .../Scenes/Help & Options/UIScene_HowToPlay.h | 4 +- .../Help & Options/UIScene_HowToPlayMenu.cpp | 2 +- .../Help & Options/UIScene_HowToPlayMenu.h | 2 +- .../UIScene_LanguageSelector.cpp | 8 +- .../Help & Options/UIScene_LanguageSelector.h | 8 +- .../Help & Options/UIScene_ReinstallMenu.cpp | 2 +- .../Help & Options/UIScene_ReinstallMenu.h | 2 +- .../UIScene_SettingsAudioMenu.cpp | 2 +- .../UIScene_SettingsAudioMenu.h | 2 +- .../UIScene_SettingsControlMenu.cpp | 4 +- .../UIScene_SettingsControlMenu.h | 2 +- .../UIScene_SettingsGraphicsMenu.cpp | 4 +- .../UIScene_SettingsGraphicsMenu.h | 2 +- .../Help & Options/UIScene_SettingsMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsMenu.h | 2 +- .../UIScene_SettingsOptionsMenu.cpp | 2 +- .../UIScene_SettingsOptionsMenu.h | 2 +- .../Help & Options/UIScene_SettingsUIMenu.cpp | 2 +- .../Help & Options/UIScene_SettingsUIMenu.h | 2 +- .../Help & Options/UIScene_SkinSelectMenu.cpp | 6 +- .../Help & Options/UIScene_SkinSelectMenu.h | 4 +- .../UIScene_AbstractContainerMenu.cpp | 4 +- .../UIScene_AbstractContainerMenu.h | 10 +- .../Containers/UIScene_AnvilMenu.cpp | 2 +- .../Containers/UIScene_AnvilMenu.h | 4 +- .../Containers/UIScene_BeaconMenu.cpp | 6 +- .../Containers/UIScene_BeaconMenu.h | 6 +- .../Containers/UIScene_BrewingStandMenu.cpp | 10 +- .../Containers/UIScene_BrewingStandMenu.h | 16 +- .../Containers/UIScene_ContainerMenu.cpp | 10 +- .../Containers/UIScene_ContainerMenu.h | 14 +- .../Containers/UIScene_CreativeMenu.cpp | 20 +-- .../Containers/UIScene_CreativeMenu.h | 14 +- .../Containers/UIScene_DispenserMenu.cpp | 10 +- .../Containers/UIScene_DispenserMenu.h | 14 +- .../Containers/UIScene_EnchantingMenu.cpp | 2 +- .../Containers/UIScene_EnchantingMenu.h | 6 +- .../Containers/UIScene_FireworksMenu.cpp | 4 +- .../Containers/UIScene_FireworksMenu.h | 2 +- .../Containers/UIScene_FurnaceMenu.cpp | 2 +- .../Containers/UIScene_FurnaceMenu.h | 2 +- .../Containers/UIScene_HopperMenu.cpp | 10 +- .../Containers/UIScene_HopperMenu.h | 14 +- .../Containers/UIScene_HorseInventoryMenu.cpp | 10 +- .../Containers/UIScene_HorseInventoryMenu.h | 16 +- .../Containers/UIScene_InventoryMenu.cpp | 8 +- .../Containers/UIScene_InventoryMenu.h | 4 +- .../Containers/UIScene_TradingMenu.cpp | 2 +- .../Containers/UIScene_TradingMenu.h | 6 +- .../UIScene_CraftingMenu.cpp | 2 +- .../UIScene_CraftingMenu.h | 10 +- .../UIScene_DeathMenu.cpp | 4 +- .../In-Game Menu Screens/UIScene_DeathMenu.h | 2 +- .../In-Game Menu Screens/UIScene_EndPoem.cpp | 4 +- .../In-Game Menu Screens/UIScene_EndPoem.h | 2 +- .../UIScene_InGameHostOptionsMenu.cpp | 2 +- .../UIScene_InGameHostOptionsMenu.h | 2 +- .../UIScene_InGameInfoMenu.cpp | 4 +- .../UIScene_InGameInfoMenu.h | 6 +- .../UIScene_InGamePlayerOptionsMenu.cpp | 2 +- .../UIScene_InGamePlayerOptionsMenu.h | 4 +- .../UIScene_InGameSaveManagementMenu.cpp | 2 +- .../UIScene_InGameSaveManagementMenu.h | 2 +- .../UIScene_PauseMenu.cpp | 6 +- .../In-Game Menu Screens/UIScene_PauseMenu.h | 4 +- .../UIScene_SignEntryMenu.cpp | 2 +- .../UIScene_SignEntryMenu.h | 2 +- .../UIScene_TeleportMenu.cpp | 2 +- .../UIScene_TeleportMenu.h | 6 +- .../UI/Scenes/UIScene_ConnectingProgress.cpp | 2 +- .../UI/Scenes/UIScene_ConnectingProgress.h | 2 +- .../UI/Scenes/UIScene_FullscreenProgress.cpp | 2 +- .../UI/Scenes/UIScene_FullscreenProgress.h | 2 +- .../UI/Scenes/UIScene_Keyboard.cpp | 4 +- .../UI/Scenes/UIScene_Keyboard.h | 2 +- .../UI/Scenes/UIScene_MessageBox.cpp | 4 +- .../UI/Scenes/UIScene_MessageBox.h | 2 +- .../UI/Scenes/UIScene_QuadrantSignin.cpp | 2 +- .../UI/Scenes/UIScene_QuadrantSignin.h | 2 +- .../UI/Scenes/UIScene_Timer.cpp | 4 +- .../UI/Scenes/UIScene_Timer.h | 6 +- minecraft/Minecraft.Client/Common/src/UI/UI.h | 119 ++++++++++++++ .../{Source Files => src}/UI/UIBitmapFont.cpp | 2 +- .../{Source Files => src}/UI/UIBitmapFont.h | 0 .../{Source Files => src}/UI/UIController.cpp | 4 +- .../{Source Files => src}/UI/UIController.h | 6 +- .../{Source Files => src}/UI/UIFontData.cpp | 0 .../{Source Files => src}/UI/UIFontData.h | 0 .../{Source Files => src}/UI/UIGroup.cpp | 8 +- .../Common/{Source Files => src}/UI/UIGroup.h | 2 +- .../{Source Files => src}/UI/UILayer.cpp | 150 +++++++++--------- .../Common/{Source Files => src}/UI/UILayer.h | 2 +- .../{Source Files => src}/UI/UIScene.cpp | 20 +-- .../Common/{Source Files => src}/UI/UIScene.h | 4 +- .../{Source Files => src}/UI/UIString.cpp | 6 +- .../{Source Files => src}/UI/UIString.h | 0 .../{Source Files => src}/UI/UITTFFont.cpp | 2 +- .../{Source Files => src}/UI/UITTFFont.h | 0 .../Leaderboards/LinuxLeaderboardManager.cpp | 2 +- .../Leaderboards/LinuxLeaderboardManager.h | 2 +- minecraft/Minecraft.Client/Linux/LinuxGL.cpp | 2 +- .../Minecraft.Client/Linux/Linux_App.cpp | 4 +- .../Linux/Linux_Minecraft.cpp | 8 +- .../Linux/Linux_UIController.h | 4 +- .../Linux/linux_game_stubs.cpp | 8 +- .../Windows64/Iggy/gdraw/gdraw_d3d11.cpp | 2 +- .../Leaderboards/WindowsLeaderboardManager.h | 2 +- .../Source Files/Windows64_Minecraft.cpp | 6 +- .../Windows64/Windows64_UIController.h | 2 +- .../{Header Files => include}/BufferedImage.h | 0 .../{Header Files => include}/FrameProfiler.h | 0 .../{Header Files => include}/MemTexture.h | 0 .../MemTextureProcessor.h | 0 .../MobSkinMemTextureProcessor.h | 2 +- .../{Header Files => include}/NetTypes.h | 0 .../{Header Files => include}/SkinBox.h | 0 .../{Header Files => include}/XboxStubs.h | 8 - .../{Header Files => include}/stdafx.h | 4 +- .../{Header Files => include}/stubs.h | 0 minecraft/Minecraft.Client/meson.build | 3 +- .../net/minecraft/client/Camera.cpp | 2 +- .../net/minecraft/client/ClientConstants.cpp | 2 +- .../net/minecraft/client/Lighting.cpp | 2 +- .../net/minecraft/client/Minecraft.cpp | 20 +-- .../net/minecraft/client/Options.cpp | 4 +- .../net/minecraft/client/gui/ChatScreen.cpp | 2 +- .../client/gui/CreateWorldScreen.cpp | 14 +- .../net/minecraft/client/gui/EditBox.cpp | 2 +- .../net/minecraft/client/gui/Font.cpp | 2 +- .../net/minecraft/client/gui/Gui.cpp | 2 +- .../net/minecraft/client/gui/GuiComponent.cpp | 2 +- .../minecraft/client/gui/InBedChatScreen.cpp | 2 +- .../client/gui/JoinMultiplayerScreen.cpp | 2 +- .../net/minecraft/client/gui/Minimap.cpp | 4 +- .../minecraft/client/gui/NameEntryScreen.cpp | 2 +- .../net/minecraft/client/gui/PauseScreen.cpp | 2 +- .../client/gui/RenameWorldScreen.cpp | 2 +- .../net/minecraft/client/gui/Screen.cpp | 8 +- .../gui/achievement/AchievementScreen.cpp | 2 +- .../client/gui/achievement/StatsScreen.cpp | 6 +- .../gui/inventory/AbstractContainerScreen.cpp | 2 +- .../gui/inventory/CreativeInventoryScreen.cpp | 4 +- .../gui/inventory/CreativeInventoryScreen.h | 2 +- .../client/gui/inventory/TextEditScreen.cpp | 2 +- .../client/gui/particle/GuiParticle.cpp | 2 +- .../minecraft/client/model/HumanoidModel.h | 2 +- .../client/model/dragon/DragonModel.cpp | 2 +- .../net/minecraft/client/model/geom/Model.h | 4 +- .../minecraft/client/model/geom/ModelPart.h | 4 +- .../client/multiplayer/ClientConnection.cpp | 16 +- .../multiplayer/MultiPlayerChunkCache.cpp | 2 +- .../multiplayer/MultiPlayerGameMode.cpp | 2 +- .../client/multiplayer/MultiPlayerLevel.cpp | 14 +- .../multiplayer/MultiPlayerLocalPlayer.cpp | 6 +- .../minecraft/client/particle/CritParticle.h | 2 +- .../client/particle/DragonBreathParticle.cpp | 2 +- .../client/particle/DripParticle.cpp | 4 +- .../particle/EnchantmentTableParticle.cpp | 2 +- .../client/particle/EnderParticle.cpp | 2 +- .../client/particle/ExplodeParticle.cpp | 2 +- .../client/particle/FireworksParticles.cpp | 2 +- .../client/particle/HugeExplosionParticle.cpp | 2 +- .../particle/HugeExplosionSeedParticle.cpp | 2 +- .../client/particle/LavaParticle.cpp | 2 +- .../client/particle/NetherPortalParticle.cpp | 2 +- .../client/particle/NoteParticle.cpp | 2 +- .../net/minecraft/client/particle/Particle.h | 2 +- .../client/particle/SmokeParticle.cpp | 2 +- .../client/particle/SuspendedParticle.cpp | 2 +- .../minecraft/client/player/LocalPlayer.cpp | 14 +- .../net/minecraft/client/renderer/Chunk.cpp | 8 +- .../client/renderer/GameRenderer.cpp | 18 +-- .../client/renderer/ItemInHandRenderer.cpp | 8 +- .../client/renderer/LevelRenderer.cpp | 16 +- .../minecraft/client/renderer/LevelRenderer.h | 8 +- .../minecraft/client/renderer/MemTexture.cpp | 4 +- .../renderer/MobSkinMemTextureProcessor.cpp | 6 +- .../renderer/MobSkinTextureProcessor.cpp | 4 +- .../minecraft/client/renderer/Tesselator.cpp | 2 +- .../minecraft/client/renderer/Textures.cpp | 8 +- .../client/renderer/TileRenderer.cpp | 10 +- .../client/renderer/entity/ItemRenderer.cpp | 6 +- .../client/renderer/entity/MobRenderer.cpp | 2 +- .../client/renderer/entity/PlayerRenderer.h | 6 +- .../texture/PreStitchedTextureMap.cpp | 2 +- .../client/renderer/texture/Texture.cpp | 2 +- .../renderer/texture/TextureManager.cpp | 2 +- .../client/renderer/texture/TextureMap.cpp | 2 +- .../renderer/tileentity/SignRenderer.cpp | 4 +- .../client/skins/AbstractTexturePack.cpp | 4 +- .../minecraft/client/skins/DLCTexturePack.cpp | 34 ++-- .../minecraft/client/skins/DLCTexturePack.h | 2 +- .../client/skins/DefaultTexturePack.h | 2 +- .../client/skins/TexturePackRepository.cpp | 6 +- .../minecraft/client/title/TitleScreen.cpp | 2 +- .../net/minecraft/server/MinecraftServer.cpp | 12 +- .../net/minecraft/server/PlayerList.cpp | 6 +- .../minecraft/server/level/PlayerChunkMap.cpp | 4 +- .../server/level/ServerChunkCache.cpp | 8 +- .../minecraft/server/level/ServerLevel.cpp | 14 +- .../server/level/ServerLevelListener.h | 2 +- .../minecraft/server/level/ServerPlayer.cpp | 4 +- .../server/level/ServerPlayerGameMode.cpp | 2 +- .../minecraft/server/level/TrackedEntity.cpp | 8 +- .../server/network/PendingConnection.cpp | 12 +- .../server/network/PlayerConnection.cpp | 20 +-- .../net/minecraft/stats/StatsCounter.cpp | 2 +- .../{Source Files => src}/BufferedImage.cpp | 8 +- .../{Source Files => src}/Extrax64Stubs.cpp | 13 +- .../{Source Files => src}/FrameProfiler.cpp | 0 .../{Source Files => src}/stubs.cpp | 2 +- .../ConsoleSaveFileConverter.cpp | 2 +- .../ConsoleSaveFileOriginal.cpp | 12 +- .../ConsoleSaveFileSplit.cpp | 12 +- .../LevelObjectInputStream.h | 0 .../Minecraft.World.h | 0 .../{Header Files => include}/ParticleTypes.h | 0 .../PortableFileIO.h | 0 .../{Header Files => include}/SoundTypes.h | 0 .../{Header Files => include}/compression.h | 0 .../{Header Files => include}/libdivide.h | 0 .../{Header Files => include}/stdafx.h | 0 minecraft/Minecraft.World/meson.build | 2 +- .../net/minecraft/network/Connection.cpp | 12 +- .../net/minecraft/network/Connection.h | 2 +- .../minecraft/network/packet/AddMobPacket.cpp | 2 +- .../network/packet/AddPlayerPacket.cpp | 6 +- .../minecraft/network/packet/LoginPacket.cpp | 6 +- .../network/packet/PlayerInfoPacket.cpp | 2 +- .../network/packet/PreLoginPacket.cpp | 4 +- .../packet/TextureAndGeometryPacket.cpp | 2 +- .../network/packet/TextureAndGeometryPacket.h | 2 +- .../packet/UpdateGameRuleProgressPacket.h | 2 +- .../net/minecraft/stats/Achievements.cpp | 2 +- .../net/minecraft/stats/CommonStats.h | 2 +- .../net/minecraft/stats/GenericStats.h | 4 +- .../net/minecraft/world/entity/Entity.cpp | 8 +- .../net/minecraft/world/entity/EntityIO.h | 2 +- .../minecraft/world/entity/LivingEntity.cpp | 2 +- .../net/minecraft/world/entity/Mob.cpp | 8 +- .../minecraft/world/entity/TamableAnimal.cpp | 2 +- .../world/entity/ai/goal/BreedGoal.cpp | 2 +- .../world/entity/animal/EntityHorse.cpp | 2 +- .../world/entity/animal/MushroomCow.cpp | 2 +- .../world/entity/animal/VillagerGolem.cpp | 2 +- .../minecraft/world/entity/animal/Wolf.cpp | 2 +- .../entity/boss/enderdragon/EnderDragon.cpp | 2 +- .../entity/boss/enderdragon/EnderDragon.h | 2 +- .../world/entity/boss/wither/WitherBoss.cpp | 2 +- .../world/entity/boss/wither/WitherBoss.h | 2 +- .../net/minecraft/world/entity/item/Boat.cpp | 2 +- .../world/entity/item/MinecartContainer.cpp | 2 +- .../world/entity/item/MinecartFurnace.cpp | 2 +- .../world/entity/item/MinecartTNT.cpp | 2 +- .../minecraft/world/entity/item/PrimedTnt.cpp | 2 +- .../minecraft/world/entity/monster/Blaze.cpp | 2 +- .../world/entity/monster/EnderMan.cpp | 2 +- .../world/entity/monster/LavaSlime.h | 2 +- .../minecraft/world/entity/monster/Slime.cpp | 2 +- .../minecraft/world/entity/monster/Slime.h | 2 +- .../minecraft/world/entity/monster/Witch.cpp | 2 +- .../minecraft/world/entity/npc/Villager.cpp | 2 +- .../net/minecraft/world/entity/npc/Villager.h | 2 +- .../minecraft/world/entity/player/Player.cpp | 12 +- .../world/entity/projectile/Arrow.cpp | 2 +- .../world/entity/projectile/DragonFireball.h | 2 +- .../entity/projectile/EyeOfEnderSignal.cpp | 2 +- .../world/entity/projectile/Fireball.cpp | 2 +- .../world/entity/projectile/Fireball.h | 2 +- .../projectile/FireworksRocketEntity.cpp | 2 +- .../world/entity/projectile/FishingHook.cpp | 2 +- .../world/entity/projectile/Snowball.cpp | 2 +- .../world/entity/projectile/Throwable.cpp | 2 +- .../world/entity/projectile/ThrownEgg.cpp | 2 +- .../entity/projectile/ThrownEnderpearl.cpp | 2 +- .../minecraft/world/inventory/AnvilMenu.cpp | 2 +- .../net/minecraft/world/item/ArmorItem.cpp | 2 +- .../net/minecraft/world/item/BucketItem.cpp | 2 +- .../net/minecraft/world/item/EnderEyeItem.cpp | 2 +- .../world/item/FireworksChargeItem.cpp | 2 +- .../minecraft/world/item/FireworksItem.cpp | 2 +- .../minecraft/world/item/PlanterTileItem.cpp | 2 +- .../net/minecraft/world/item/PotionItem.cpp | 4 +- .../net/minecraft/world/item/SpawnEggItem.cpp | 4 +- .../net/minecraft/world/item/TileItem.cpp | 2 +- .../world/item/alchemy/PotionBrewing.cpp | 2 +- .../world/item/enchantment/Enchantment.cpp | 2 +- .../minecraft/world/level/BaseMobSpawner.cpp | 2 +- .../net/minecraft/world/level/Explosion.cpp | 8 +- .../minecraft/world/level/FoliageColor.cpp | 2 +- .../net/minecraft/world/level/Level.cpp | 14 +- .../net/minecraft/world/level/Level.h | 2 +- .../net/minecraft/world/level/LevelListener.h | 2 +- .../net/minecraft/world/level/biome/Biome.cpp | 2 +- .../world/level/biome/BiomeDecorator.cpp | 6 +- .../world/level/biome/BiomeSource.cpp | 4 +- .../world/level/biome/JungleBiome.cpp | 6 +- .../level/chunk/CompressedTileStorage.cpp | 6 +- .../world/level/chunk/LevelChunk.cpp | 8 +- .../world/level/chunk/SparseDataStorage.cpp | 6 +- .../world/level/chunk/SparseLightStorage.cpp | 6 +- .../chunk/storage/McRegionChunkStorage.cpp | 8 +- .../level/chunk/storage/OldChunkStorage.cpp | 8 +- .../world/level/chunk/storage/RegionFile.cpp | 6 +- .../world/level/chunk/storage/RegionFile.h | 2 +- .../world/level/dimension/Dimension.cpp | 4 +- .../world/level/dimension/HellDimension.cpp | 4 +- .../world/level/dimension/TheEndDimension.cpp | 2 +- .../level/levelgen/CustomLevelSource.cpp | 8 +- .../world/level/levelgen/FlatLevelSource.cpp | 6 +- .../level/levelgen/HellFlatLevelSource.cpp | 6 +- .../level/levelgen/HellRandomLevelSource.cpp | 6 +- .../level/levelgen/RandomLevelSource.cpp | 8 +- .../levelgen/TheEndLevelRandomLevelSource.cpp | 6 +- .../levelgen/feature/BasicTreeFeature.cpp | 8 +- .../level/levelgen/feature/BirchFeature.cpp | 2 +- .../level/levelgen/feature/CaveFeature.cpp | 2 +- .../level/levelgen/feature/FlowerFeature.cpp | 2 +- .../levelgen/feature/GroundBushFeature.cpp | 6 +- .../level/levelgen/feature/LakeFeature.cpp | 2 +- .../levelgen/feature/MegaTreeFeature.cpp | 8 +- .../level/levelgen/feature/OreFeature.cpp | 8 +- .../level/levelgen/feature/PineFeature.cpp | 2 +- .../level/levelgen/feature/ReedsFeature.cpp | 2 +- .../level/levelgen/feature/SandFeature.cpp | 2 +- .../level/levelgen/feature/SpringFeature.cpp | 2 +- .../level/levelgen/feature/SpruceFeature.cpp | 2 +- .../levelgen/feature/SwampTreeFeature.cpp | 2 +- .../level/levelgen/feature/TreeFeature.cpp | 8 +- .../levelgen/structure/MineShaftFeature.cpp | 2 +- .../structure/NetherBridgeFeature.cpp | 2 +- .../structure/RandomScatteredLargeFeature.cpp | 2 +- .../structure/ScatteredFeaturePieces.cpp | 2 +- .../levelgen/structure/StrongholdFeature.cpp | 2 +- .../levelgen/structure/VillageFeature.cpp | 2 +- .../world/level/newbiome/layer/Layer.cpp | 2 +- .../level/storage/DirectoryLevelStorage.cpp | 10 +- .../world/level/tile/BrewingStandTile.cpp | 2 +- .../minecraft/world/level/tile/EggTile.cpp | 2 +- .../world/level/tile/EnchantmentTableTile.cpp | 2 +- .../world/level/tile/EnderChestTile.cpp | 2 +- .../minecraft/world/level/tile/FireTile.cpp | 2 +- .../world/level/tile/FurnaceTile.cpp | 2 +- .../minecraft/world/level/tile/GrassTile.cpp | 2 +- .../minecraft/world/level/tile/LeafTile.cpp | 2 +- .../minecraft/world/level/tile/LiquidTile.cpp | 2 +- .../minecraft/world/level/tile/MycelTile.cpp | 2 +- .../world/level/tile/NotGateTile.cpp | 2 +- .../world/level/tile/NoteBlockTile.cpp | 2 +- .../minecraft/world/level/tile/PortalTile.cpp | 2 +- .../world/level/tile/PumpkinTile.cpp | 2 +- .../world/level/tile/RedStoneDustTile.cpp | 4 +- .../world/level/tile/RedStoneOreTile.cpp | 2 +- .../world/level/tile/RepeaterTile.cpp | 2 +- .../minecraft/world/level/tile/StemTile.cpp | 2 +- .../world/level/tile/StoneMonsterTile.cpp | 2 +- .../world/level/tile/TallGrassPlantTile.cpp | 2 +- .../net/minecraft/world/level/tile/Tile.h | 2 +- .../minecraft/world/level/tile/TorchTile.cpp | 2 +- .../world/level/tile/WaterLilyTile.cpp | 2 +- .../level/tile/entity/BeaconTileEntity.cpp | 2 +- .../tile/entity/BrewingStandTileEntity.cpp | 2 +- .../level/tile/entity/ChestTileEntity.cpp | 4 +- .../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/TheEndPortalTile.cpp | 2 +- .../level/tile/piston/PistonBaseTile.cpp | 6 +- .../{Source Files => src}/Minecraft.World.cpp | 2 +- .../{Source Files => src}/compression.cpp | 6 +- 719 files changed, 1591 insertions(+), 1608 deletions(-) delete mode 100644 minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h delete mode 100644 minecraft/Minecraft.Client/Common/Source Files/UI/UI.h rename minecraft/Minecraft.Client/Common/{Source Files => src}/Audio/Consoles_SoundEngine.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Audio/Consoles_SoundEngine.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Audio/SoundEngine.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Audio/SoundEngine.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Audio/SoundNames.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/BuildVer/BuildVer.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Colours/ColourTable.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Colours/ColourTable.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/ConsoleGameMode.cpp (58%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/ConsoleGameMode.h (78%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Console_Awards_enum.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Console_Debug_enum.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCAudioFile.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCAudioFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCCapeFile.cpp (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCCapeFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCColourTableFile.cpp (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCColourTableFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCFile.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCGameRules.h (65%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCGameRulesFile.cpp (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCGameRulesFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCGameRulesHeader.cpp (83%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCGameRulesHeader.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCLocalisationFile.cpp (73%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCLocalisationFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCManager.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCManager.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCPack.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCPack.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCSkinFile.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCSkinFile.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCTextureFile.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCTextureFile.h (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCUIDataFile.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/DLC/DLCUIDataFile.h (100%) create mode 100644 minecraft/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/ConsoleGameRulesConstants.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/GameRuleManager.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/GameRuleManager.h (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/BiomeOverride.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/BiomeOverride.h (77%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ConsoleGenerateStructure.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h (63%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ConsoleSchematicFile.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/ConsoleSchematicFile.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/LevelGenerationOptions.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/LevelGenerationOptions.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/LevelGenerators.cpp (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/LevelGenerators.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StartFeature.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StartFeature.h (81%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h (81%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/LevelRules.cpp (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/LevelRules.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp (86%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp (85%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp (78%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/Rules/GameRule.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/Rules/GameRule.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/LevelRules/Rules/GameRulesInstance.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/WstringLookup.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/GameRules/WstringLookup.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Leaderboards/LeaderboardInterface.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Leaderboards/LeaderboardInterface.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Leaderboards/LeaderboardManager.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Leaderboards/LeaderboardManager.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Leaderboards/base64.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Leaderboards/base64.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Localisation/StringTable.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Localisation/StringTable.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/GameNetworkManager.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/GameNetworkManager.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/NetworkPlayerInterface.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/NetworkPlayerQNet.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/NetworkPlayerQNet.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/PlatformNetworkManagerInterface.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/PlatformNetworkManagerStub.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/PlatformNetworkManagerStub.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/SessionInfo.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/Socket.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Network/Socket.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Trial/TrialMode.cpp (55%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Trial/TrialMode.h (75%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/AreaConstraint.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/AreaConstraint.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/ChangeStateConstraint.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/ChangeStateConstraint.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/InputConstraint.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/InputConstraint.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/TutorialConstraint.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Constraints/TutorialConstraints.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/FullTutorial.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/FullTutorial.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/FullTutorialMode.cpp (69%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/FullTutorialMode.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/AreaHint.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/AreaHint.h (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/DiggerItemHint.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/DiggerItemHint.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/LookAtEntityHint.cpp (83%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/LookAtEntityHint.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/LookAtTileHint.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/LookAtTileHint.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/TakeItemHint.cpp (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/TakeItemHint.h (86%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/TutorialHint.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/TutorialHint.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Hints/TutorialHints.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/AreaTask.cpp (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/AreaTask.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ChoiceTask.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ChoiceTask.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/CompleteUsingItemTask.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/CompleteUsingItemTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ControllerTask.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ControllerTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/CraftTask.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/CraftTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/EffectChangedTask.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/EffectChangedTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/FullTutorialActiveTask.cpp (80%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/FullTutorialActiveTask.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/HorseChoiceTask.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/HorseChoiceTask.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/InfoTask.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/InfoTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/PickupTask.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/PickupTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ProcedureCompoundTask.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ProcedureCompoundTask.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ProgressFlagTask.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/ProgressFlagTask.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/RideEntityTask.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/RideEntityTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/StatTask.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/StatTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/StateChangeTask.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/TutorialTask.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/TutorialTask.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/TutorialTasks.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/UseItemTask.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/UseItemTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/UseTileTask.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/UseTileTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/XuiCraftingTask.cpp (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tasks/XuiCraftingTask.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tutorial.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/Tutorial.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/TutorialEnum.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/TutorialMessage.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/TutorialMessage.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/TutorialMode.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/Tutorial/TutorialMode.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/ArchiveFile.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/ArchiveFile.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIController.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_AbstractContainerMenu.h (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_AnvilMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_AnvilMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_BeaconMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_BeaconMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_BrewingMenu.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_BrewingMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_CommandBlockMenu.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_CommandBlockMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_ContainerMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_ContainerMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_CraftingMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_CraftingMenu.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_CreativeMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_CreativeMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_DispenserMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_DispenserMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_EnchantingMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_EnchantingMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_FireworksMenu.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_FireworksMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_FurnaceMenu.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_FurnaceMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_HUD.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_HUD.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_HopperMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_HopperMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_HorseInventoryMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_InventoryMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_InventoryMenu.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_PauseMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_PauseMenu.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_TradingMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/IUIScene_TradingMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/UIEnums.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/All Platforms/UIStructs.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Chat.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Chat.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_DebugUIConsole.cpp (81%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_DebugUIConsole.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_DebugUIMarketingGuide.cpp (85%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_DebugUIMarketingGuide.h (83%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Logo.cpp (83%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Logo.h (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_MenuBackground.cpp (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_MenuBackground.h (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Panorama.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Panorama.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_PressStartToPlay.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_PressStartToPlay.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Tooltips.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_Tooltips.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_TutorialPopup.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIComponent_TutorialPopup.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIScene_HUD.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Components/UIScene_HUD.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Base.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Base.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_BeaconEffectButton.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_BeaconEffectButton.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_BitmapIcon.cpp (83%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_BitmapIcon.h (86%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Button.cpp (85%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Button.h (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_ButtonList.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_ButtonList.h (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_CheckBox.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_CheckBox.h (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Cursor.cpp (63%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Cursor.h (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_DLCList.cpp (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_DLCList.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_DynamicLabel.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_DynamicLabel.h (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_EnchantmentBook.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_EnchantmentBook.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_EnchantmentButton.cpp (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_EnchantmentButton.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_HTMLLabel.cpp (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_HTMLLabel.h (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Label.cpp (80%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Label.h (79%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_LeaderboardList.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_LeaderboardList.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_MinecraftHorse.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_MinecraftHorse.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_MinecraftPlayer.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_MinecraftPlayer.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_PlayerList.cpp (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_PlayerList.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_PlayerSkinPreview.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_PlayerSkinPreview.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Progress.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Progress.h (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_SaveList.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_SaveList.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Slider.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Slider.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_SlotList.cpp (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_SlotList.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_SpaceIndicatorBar.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_SpaceIndicatorBar.h (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_TextInput.cpp (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_TextInput.h (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_TexturePackList.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_TexturePackList.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Touch.cpp (84%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Controls/UIControl_Touch.h (86%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h (81%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugOptions.cpp (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugOptions.h (86%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugOverlay.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugOverlay.h (86%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Debug/UIScene_DebugSetCamera.h (80%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h (80%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h (89%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_EULA.h (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_Intro.h (88%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h (83%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_ControlsMenu.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_Credits.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_Credits.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_HowToPlay.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_LanguageSelector.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h (76%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h (73%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h (85%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h (73%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp (92%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h (73%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h (77%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h (91%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h (94%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h (90%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h (95%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h (93%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h (87%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_ConnectingProgress.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_ConnectingProgress.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_FullscreenProgress.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_FullscreenProgress.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_Keyboard.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_Keyboard.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_MessageBox.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_MessageBox.h (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_QuadrantSignin.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_QuadrantSignin.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_Timer.cpp (82%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/Scenes/UIScene_Timer.h (78%) create mode 100644 minecraft/Minecraft.Client/Common/src/UI/UI.h rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIBitmapFont.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIBitmapFont.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIController.cpp (99%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIController.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIFontData.cpp (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIFontData.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIGroup.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIGroup.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UILayer.cpp (79%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UILayer.h (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIScene.cpp (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIScene.h (98%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIString.cpp (96%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UIString.h (100%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UITTFFont.cpp (97%) rename minecraft/Minecraft.Client/Common/{Source Files => src}/UI/UITTFFont.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/BufferedImage.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/FrameProfiler.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/MemTexture.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/MemTextureProcessor.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/MobSkinMemTextureProcessor.h (85%) rename minecraft/Minecraft.Client/{Header Files => include}/NetTypes.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/SkinBox.h (100%) rename minecraft/Minecraft.Client/{Header Files => include}/XboxStubs.h (97%) rename minecraft/Minecraft.Client/{Header Files => include}/stdafx.h (83%) rename minecraft/Minecraft.Client/{Header Files => include}/stubs.h (100%) rename minecraft/Minecraft.Client/{Source Files => src}/BufferedImage.cpp (97%) rename minecraft/Minecraft.Client/{Source Files => src}/Extrax64Stubs.cpp (95%) rename minecraft/Minecraft.Client/{Source Files => src}/FrameProfiler.cpp (100%) rename minecraft/Minecraft.Client/{Source Files => src}/stubs.cpp (96%) rename minecraft/Minecraft.World/{Header Files => include}/LevelObjectInputStream.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/Minecraft.World.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/ParticleTypes.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/PortableFileIO.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/SoundTypes.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/compression.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/libdivide.h (100%) rename minecraft/Minecraft.World/{Header Files => include}/stdafx.h (100%) rename minecraft/Minecraft.World/{Source Files => src}/Minecraft.World.cpp (98%) rename minecraft/Minecraft.World/{Source Files => src}/compression.cpp (99%) diff --git a/minecraft/Minecraft.Client/Common/App_structs.h b/minecraft/Minecraft.Client/Common/App_structs.h index 66d4b2067..074c72339 100644 --- a/minecraft/Minecraft.Client/Common/App_structs.h +++ b/minecraft/Minecraft.Client/Common/App_structs.h @@ -3,12 +3,12 @@ #include #include "4J.Storage/4J_Storage.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" typedef struct { wchar_t* wchFilename; diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp index d02ca3088..d0463e6e8 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp +++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp @@ -7,7 +7,7 @@ #include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" @@ -23,7 +23,7 @@ #include "Minecraft.World/ConsoleHelpers/PathHelper.h" #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "Minecraft.Client/net/minecraft/server/level/GameMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" @@ -32,8 +32,8 @@ #include "Minecraft_Macros.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "java/InputOutputStream/InputOutputStream.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" #include "Minecraft.Client/net/minecraft/client/User.h" @@ -41,27 +41,27 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.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/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "4J_Input.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #if defined(__linux__) #include #include #endif -#include "Minecraft.Client/Common/Source Files/UI/UI.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "Minecraft.Client/Common/src/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include #include diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.h b/minecraft/Minecraft.Client/Common/Consoles_App.h index ba80d27da..67af236e6 100644 --- a/minecraft/Minecraft.Client/Common/Consoles_App.h +++ b/minecraft/Minecraft.Client/Common/Consoles_App.h @@ -8,24 +8,24 @@ // using namespace std; -#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.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/include/SkinBox.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" #include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h" #include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" typedef struct _JoinFromInviteData { std::uint32_t dwUserIndex; // dwUserIndex diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h deleted file mode 100644 index e7ab3565b..000000000 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "ConsoleGameRulesConstants.h" - -#include "GameRuleManager.h" - -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" - -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" - -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" - -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" - -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h" - -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h deleted file mode 100644 index 451abfea8..000000000 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UI.h +++ /dev/null @@ -1,119 +0,0 @@ -#pragma once - -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" - -#include "UIBitmapFont.h" -#include "UITTFFont.h" - -#include "UIScene.h" -#include "UILayer.h" -#include "UIGroup.h" -#include "UIController.h" - -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" - -#include "Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" - -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" \ No newline at end of file diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp rename to minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp index c7b5ff765..6c89ddf2d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.cpp @@ -1,5 +1,5 @@ #include "Consoles_SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" bool ConsoleSoundEngine::GetIsPlayingStreamingCDMusic() { return m_bIsPlayingStreamingCDMusic; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h rename to minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h index 8134ad41b..4a67a333e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h @@ -4,7 +4,7 @@ #include #include -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" class File; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp rename to minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp index d171b90f1..580fff2c1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.cpp +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp @@ -16,7 +16,7 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h rename to minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h index be66b6bce..aaa333163 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundEngine.h +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.h @@ -7,10 +7,10 @@ class Random; using namespace std; #include -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "miniaudio.h" #include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Common/Source Files/Audio/Consoles_SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/Consoles_SoundEngine.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" constexpr float SFX_3D_MIN_DISTANCE = 1.0f; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp b/minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp rename to minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp index 24cde1b8d..1a4d65019 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Audio/SoundNames.cpp +++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundNames.cpp @@ -1,5 +1,5 @@ #include "Consoles_SoundEngine.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" const wchar_t* ConsoleSoundEngine::wchSoundNames[eSoundType_MAX] = { L"mob/chicken/chicken", // eSoundType_MOB_CHICKEN_AMBIENT diff --git a/minecraft/Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h b/minecraft/Minecraft.Client/Common/src/BuildVer/BuildVer.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h rename to minecraft/Minecraft.Client/Common/src/BuildVer/BuildVer.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp b/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp rename to minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp index cc5300139..3555df5c2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp +++ b/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp @@ -4,10 +4,10 @@ #include "ColourTable.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h b/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.h rename to minecraft/Minecraft.Client/Common/src/Colours/ColourTable.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp b/minecraft/Minecraft.Client/Common/src/ConsoleGameMode.cpp similarity index 58% rename from minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp rename to minecraft/Minecraft.Client/Common/src/ConsoleGameMode.cpp index 569f26954..3833eea10 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/ConsoleGameMode.cpp @@ -1,7 +1,7 @@ #include "ConsoleGameMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/ConsoleGameMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h b/minecraft/Minecraft.Client/Common/src/ConsoleGameMode.h similarity index 78% rename from minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h rename to minecraft/Minecraft.Client/Common/src/ConsoleGameMode.h index 67a981c61..38d9816f8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/ConsoleGameMode.h +++ b/minecraft/Minecraft.Client/Common/src/ConsoleGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Console_Awards_enum.h b/minecraft/Minecraft.Client/Common/src/Console_Awards_enum.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Console_Awards_enum.h rename to minecraft/Minecraft.Client/Common/src/Console_Awards_enum.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Console_Debug_enum.h b/minecraft/Minecraft.Client/Common/src/Console_Debug_enum.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Console_Debug_enum.h rename to minecraft/Minecraft.Client/Common/src/Console_Debug_enum.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp index eeee3ddf5..d73f732ab 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCAudioFile.cpp @@ -7,11 +7,11 @@ #include "DLCAudioFile.h" #include "4J.Render/4J_Render.h" #include "4J_Storage.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #if defined(_WINDOWS64) #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCAudioFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCAudioFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp index 2ad3513a6..906737f28 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCCapeFile.cpp @@ -1,6 +1,6 @@ #include "DLCManager.h" #include "DLCCapeFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" DLCCapeFile::DLCCapeFile(const std::wstring& path) diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCCapeFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCCapeFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCCapeFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp index 7e36f8107..54a4a78bc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.cpp @@ -3,8 +3,8 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" DLCColourTableFile::DLCColourTableFile(const std::wstring& path) diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCColourTableFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCFile.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCFile.cpp index 1c09e0c9b..899172794 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCFile.cpp @@ -2,7 +2,7 @@ #include "DLCFile.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" DLCFile::DLCFile(DLCManager::EDLCType type, const std::wstring& path) { m_type = type; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRules.h similarity index 65% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCGameRules.h index 17167b2b6..cf1892dee 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRules.h @@ -1,7 +1,7 @@ #pragma once #include "DLCFile.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" class DLCGameRules : public DLCFile { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp index 590cff1c5..109588622 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.cpp @@ -1,6 +1,6 @@ #include "DLCManager.h" #include "DLCGameRulesFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" DLCGameRulesFile::DLCGameRulesFile(const std::wstring& path) : DLCGameRules(DLCManager::e_DLCType_GameRules, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp similarity index 83% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp index 8abb4693f..f79d531ab 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.cpp @@ -2,9 +2,9 @@ #include "DLCManager.h" #include "DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h" -#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" #include "Minecraft.Client/Linux/Linux_App.h" class StringTable; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h index 7b42967e7..7ae26fa9e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h @@ -4,7 +4,7 @@ #include #include "DLCGameRules.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" class StringTable; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp similarity index 73% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp index 4b1de96c9..784a0bf98 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.cpp @@ -1,7 +1,7 @@ #include "DLCManager.h" #include "DLCLocalisationFile.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCLocalisationFile::DLCLocalisationFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_LocalisationData, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp index 3f5edad36..90c843d9b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include #include @@ -6,8 +6,8 @@ #include "DLCPack.h" #include "DLCFile.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/Header Files/PortableFileIO.h" -#include "Minecraft.Client/Common/Source Files/UI/UIController.h" +#include "Minecraft.World/include/PortableFileIO.h" +#include "Minecraft.Client/Common/src/UI/UIController.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCManager.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp index 33b275d2e..c0efef6c6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp @@ -14,12 +14,12 @@ #include "DLCAudioFile.h" #include "DLCColourTableFile.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.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/Localisation/StringTable.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCPack.h index f0032e3a5..313353efd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCPack.h +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.h @@ -7,7 +7,7 @@ #include "DLCManager.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" class DLCFile; class DLCSkinFile; diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp index 4b1c3fe1c..a11cfd537 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.cpp @@ -2,14 +2,14 @@ #include "DLCManager.h" #include "DLCSkinFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" DLCSkinFile::DLCSkinFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Skin, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h index ba9835c2e..e8e7f022f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCSkinFile.h @@ -6,8 +6,8 @@ #include "DLCFile.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/include/SkinBox.h" class DLCSkinFile : public DLCFile { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp index 5144ef740..76974d6fa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCTextureFile.cpp @@ -1,6 +1,6 @@ #include "DLCManager.h" #include "DLCTextureFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" DLCTextureFile::DLCTextureFile(const std::wstring& path) : DLCFile(DLCManager::e_DLCType_Texture, path) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCTextureFile.h similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCTextureFile.h index 993539925..b17d3ad9f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCTextureFile.h @@ -3,7 +3,7 @@ #include #include "DLCFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" class DLCTextureFile : public DLCFile { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp rename to minecraft/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp index 59954aa23..e1123b868 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCUIDataFile.cpp @@ -1,6 +1,6 @@ #include "DLCManager.h" #include "DLCUIDataFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCFile.h" #include "Minecraft.Client/Linux/Linux_App.h" DLCUIDataFile::DLCUIDataFile(const std::wstring& path) diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h b/minecraft/Minecraft.Client/Common/src/DLC/DLCUIDataFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h rename to minecraft/Minecraft.Client/Common/src/DLC/DLCUIDataFile.h diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h b/minecraft/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h new file mode 100644 index 000000000..2e11934c3 --- /dev/null +++ b/minecraft/Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h @@ -0,0 +1,32 @@ +#pragma once +#include "ConsoleGameRulesConstants.h" + +#include "GameRuleManager.h" + +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.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/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/UseTileRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" + +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.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/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/LevelGeneration/BiomeOverride.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h" + +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h b/minecraft/Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h rename to minecraft/Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp index 419d18169..3dbd87358 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp @@ -1,15 +1,15 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/File.h" -#include "Minecraft.World/Header Files/compression.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRules.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.World/include/compression.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRules.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "ConsoleGameRules.h" #include "GameRuleManager.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.h similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h rename to minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.h index ce95165e2..2c7bffe83 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.h @@ -1,9 +1,9 @@ #pragma once ////using namespace std; -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" class LevelGenerationOptions; class RootGameRulesDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp index 169194d5e..794194009 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp @@ -6,15 +6,15 @@ #include "LevelGenerationOptions.h" #include "ConsoleSchematicFile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/InputOutputStream/DataOutputStream.h" ApplySchematicRuleDefinition::ApplySchematicRuleDefinition( diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h index cd68af5a2..fa6a52407 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.h @@ -3,10 +3,10 @@ #include #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "ConsoleSchematicFile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class AABB; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp index 1762f14e1..4204aacad 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp @@ -1,7 +1,7 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "BiomeOverride.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h similarity index 77% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h index 32bf8b301..57bd3a2a1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/BiomeOverride.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h @@ -4,8 +4,8 @@ #include #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class BiomeOverride : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp index 5ce711a66..b308023cd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp @@ -3,13 +3,13 @@ #include "ConsoleGenerateStructure.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.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/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 "Minecraft.World/net/minecraft/Direction.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h index b79061c16..38f494b49 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructure.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h @@ -2,9 +2,9 @@ #include #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h" class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h similarity index 63% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h index 674bfeea5..a29672dd2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" class ConsoleGenerateStructureAction : public GameRuleDefinition { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp index be0f8281c..3b1aa57b0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp @@ -6,7 +6,7 @@ #include #include "ConsoleSchematicFile.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" @@ -19,9 +19,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/Class.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h index ae2fc5d60..190768de0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -12,7 +12,7 @@ #include #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp index dc8bfcdfe..c4ed34a11 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -2,20 +2,20 @@ #include #include -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "LevelGenerationOptions.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "4J_Storage.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h index d496b7992..65536d49e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h @@ -7,9 +7,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" class ApplySchematicRuleDefinition; class LevelChunk; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp index 74922709e..cf1262b12 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.cpp @@ -2,7 +2,7 @@ #include "LevelGenerationOptions.h" #include "LevelGenerators.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h" LevelGenerators::LevelGenerators() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerators.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerators.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp index c75e1f147..df84c2605 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp @@ -1,7 +1,7 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "StartFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h similarity index 81% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h index 86bcef36a..5d7687607 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StartFeature.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h @@ -3,9 +3,9 @@ #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class StartFeature : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp index 950d1d4af..0b2419e58 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp @@ -1,8 +1,8 @@ #include "XboxStructureActionGenerateBox.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.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 "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h index be366f935..ebecae2c7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class StructurePiece; class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp index e46139acf..64804e04d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp @@ -1,8 +1,8 @@ #include "XboxStructureActionPlaceBlock.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.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 "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h similarity index 81% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h index 93e6e0040..8a6fb8a51 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h @@ -1,8 +1,8 @@ #pragma once #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class StructurePiece; class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp index 8c78b46b3..81a72139b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp @@ -3,9 +3,9 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "XboxStructureActionPlaceContainer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/Container.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h index 1ad4f0a22..3766b39e7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h @@ -4,7 +4,7 @@ #include #include "XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class StructurePiece; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp index 39ee5e3b4..9a3dba06b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.cpp @@ -2,8 +2,8 @@ #include #include "XboxStructureActionPlaceSpawner.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h index 5a43d7351..19b572c79 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceSpawner.h @@ -3,7 +3,7 @@ #include #include "XboxStructureActionPlaceBlock.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class StructurePiece; class Level; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp index fe15ded22..eaac5c289 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.cpp @@ -1,5 +1,5 @@ #include "LevelRules.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h" LevelRules::LevelRules() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/LevelRules.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/LevelRules.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp index a441824c4..9b5af0014 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp @@ -3,8 +3,8 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/item/EnchantedBookItem.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h index 4c148d90a..01a36db37 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h @@ -4,7 +4,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class ItemInstance; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp index ca63c72f5..e66b5cadc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp @@ -3,8 +3,8 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "AddItemRuleDefinition.h" #include "AddEnchantmentRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/Container.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h index 97da5f40f..03138a668 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class Container; class AddEnchantmentRuleDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp index aec526290..932a292ab 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp @@ -1,9 +1,9 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "CollectItemRuleDefinition.h" #include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.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 "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h index 8a524cb93..a5f4811a5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h @@ -4,8 +4,8 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" class Pos; class UseTileRuleDefinition; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp similarity index 86% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp index f92d06735..334757a8c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp @@ -5,10 +5,10 @@ #include "CompleteAllRuleDefinition.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/network/Connection.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.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/Rules/GameRule.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h index e2b0cfe9c..d2166c1f2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h @@ -3,7 +3,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class GameRule; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp similarity index 85% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp index 185ce531b..97828ce63 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp @@ -6,12 +6,12 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.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" CompoundGameRuleDefinition::CompoundGameRuleDefinition() { m_lastRuleStatusChanged = nullptr; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h index ee3aa59d4..320b86ebb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h @@ -3,8 +3,8 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" class CompoundGameRuleDefinition : public GameRuleDefinition { protected: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp index 6eaf33c27..2af9503a2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp @@ -7,12 +7,12 @@ #include #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#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/GameRuleDefinition.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 "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h index 2c8ace3be..75c0d686b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h @@ -6,8 +6,8 @@ #include #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" class GameRule; class LevelRuleset; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp similarity index 78% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp index f48cd1841..da5e200ae 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" #include "LevelRuleset.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" class AABB; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h index f8322069d..6ac68d3d3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h @@ -4,7 +4,7 @@ #include #include "CompoundGameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition; class AABB; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp index 1c4d92fe4..53e2e286a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp @@ -2,8 +2,8 @@ #include "NamedAreaRuleDefinition.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h index beff99224..d5e583331 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h @@ -4,7 +4,7 @@ #include "GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class NamedAreaRuleDefinition : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp index 4fccbe543..0cac25e2b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp @@ -4,9 +4,9 @@ #include "UpdatePlayerRuleDefinition.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.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 "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h index 856a8a28a..d27ef79e0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h @@ -5,7 +5,7 @@ #include #include "GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class AddItemRuleDefinition; class Pos; diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp index f33b60de1..4b6750afa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp @@ -1,7 +1,7 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h index 2a11c9d31..dac36ab02 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h @@ -5,7 +5,7 @@ #include "GameRuleDefinition.h" #include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" class UseTileRuleDefinition : public GameRuleDefinition { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp index ed62534e5..a1aa48850 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.cpp +++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.cpp @@ -5,8 +5,8 @@ #include #include -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.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/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRule.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRule.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h rename to minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.cpp rename to minecraft/Minecraft.Client/Common/src/GameRules/WstringLookup.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h b/minecraft/Minecraft.Client/Common/src/GameRules/WstringLookup.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/GameRules/WstringLookup.h rename to minecraft/Minecraft.Client/Common/src/GameRules/WstringLookup.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp rename to minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp index e92b5d1bf..286dd5130 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.cpp +++ b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.cpp @@ -1,7 +1,7 @@ #include #include "LeaderboardInterface.h" -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" LeaderboardInterface::LeaderboardInterface(LeaderboardManager* man) { m_manager = man; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h rename to minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp rename to minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp index 85ff6f2e2..8bdea5bb6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp @@ -1,9 +1,9 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "LeaderboardManager.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = { L"Friends", L"MyScore", L"TopRank"}; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h rename to minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.cpp b/minecraft/Minecraft.Client/Common/src/Leaderboards/base64.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.cpp rename to minecraft/Minecraft.Client/Common/src/Leaderboards/base64.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h b/minecraft/Minecraft.Client/Common/src/Leaderboards/base64.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Leaderboards/base64.h rename to minecraft/Minecraft.Client/Common/src/Leaderboards/base64.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp b/minecraft/Minecraft.Client/Common/src/Localisation/StringTable.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp rename to minecraft/Minecraft.Client/Common/src/Localisation/StringTable.cpp index b4f18fbf7..22a9ff57f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.cpp +++ b/minecraft/Minecraft.Client/Common/src/Localisation/StringTable.cpp @@ -2,7 +2,7 @@ #include #include "StringTable.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.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 "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h b/minecraft/Minecraft.Client/Common/src/Localisation/StringTable.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Localisation/StringTable.h rename to minecraft/Minecraft.Client/Common/src/Localisation/StringTable.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp rename to minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp index 735366aeb..48d526b0a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include #include @@ -24,18 +24,18 @@ #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" +#include "Minecraft.Client/Common/src/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" #include "4J_Input.h" // Global instance diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h rename to minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h b/minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h rename to minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp b/minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp rename to minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp index 829b706e9..9ba1a67b1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.cpp @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/System.h" NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h b/minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.h rename to minecraft/Minecraft.Client/Common/src/Network/NetworkPlayerQNet.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h rename to minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h index 17a4ff5d0..5c37d5f5d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h +++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h @@ -5,9 +5,9 @@ #include #endif #include "Minecraft.World/ConsoleHelpers/C4JThread.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "NetworkPlayerInterface.h" #include "SessionInfo.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp rename to minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp index 1c940521a..e94839bcb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp @@ -5,8 +5,8 @@ #include "Socket.h" #include "NetworkPlayerQNet.h" #include "PlatformNetworkManagerStub.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.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 "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h rename to minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h index 7e11bb51c..d34494b0b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h +++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h @@ -9,9 +9,9 @@ #include "PlatformNetworkManagerInterface.h" #include "SessionInfo.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class C4JThread; class CGameNetworkManager; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/SessionInfo.h b/minecraft/Minecraft.Client/Common/src/Network/SessionInfo.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Network/SessionInfo.h rename to minecraft/Minecraft.Client/Common/src/Network/SessionInfo.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp b/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp rename to minecraft/Minecraft.Client/Common/src/Network/Socket.cpp index bba99afbf..cbe37774e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp +++ b/minecraft/Minecraft.Client/Common/src/Network/Socket.cpp @@ -7,11 +7,11 @@ // 4jcraft TODO #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class SocketAddress {}; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h b/minecraft/Minecraft.Client/Common/src/Network/Socket.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h rename to minecraft/Minecraft.Client/Common/src/Network/Socket.h index a253bb2ba..f3dbfd5f0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.h +++ b/minecraft/Minecraft.Client/Common/src/Network/Socket.h @@ -13,8 +13,8 @@ #include "java/InputOutputStream/OutputStream.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" // 4jcraft TODO #include "Minecraft.World/ConsoleHelpers/ThreadName.h" // 4jcraft TODO -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" class INetworkPlayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp b/minecraft/Minecraft.Client/Common/src/Trial/TrialMode.cpp similarity index 55% rename from minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp rename to minecraft/Minecraft.Client/Common/src/Trial/TrialMode.cpp index 05d8ab0e5..4eddcbee4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Trial/TrialMode.cpp @@ -1,7 +1,7 @@ #include "TrialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.h" -#include "Minecraft.Client/Common/Source Files/Trial/TrialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/FullTutorial.h" +#include "Minecraft.Client/Common/src/Trial/TrialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h b/minecraft/Minecraft.Client/Common/src/Trial/TrialMode.h similarity index 75% rename from minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h rename to minecraft/Minecraft.Client/Common/src/Trial/TrialMode.h index e819f8fbd..6db8a11e7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Trial/TrialMode.h +++ b/minecraft/Minecraft.Client/Common/src/Trial/TrialMode.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" class ClientConnection; class Minecraft; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp index 4c3c21de5..00ef900b3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.cpp @@ -4,7 +4,7 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaConstraint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AreaConstraint::AreaConstraint(int descriptionId, double x0, double y0, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/AreaConstraint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/AreaConstraint.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp index 6ca5fdbb7..5714b3e2e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.cpp @@ -1,14 +1,14 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "ChangeStateConstraint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.h" #include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h index c91413657..8973910e1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/ChangeStateConstraint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/ChangeStateConstraint.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "TutorialConstraint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraints.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraints.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp index 81cc5c460..0c24ca1bc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "4J.Common/4J_InputActions.h" @@ -7,12 +7,12 @@ #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTasks.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h" #include "FullTutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraints.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h" #include "Minecraft.Client/Common/Potion_Macros.h" FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/) diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.h b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorial.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp similarity index 69% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp index 91f677203..da98ac6bd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.cpp @@ -1,9 +1,9 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "FullTutorial.h" #include "FullTutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" class ClientConnection; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h b/minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp index 1908bc4ad..7f6c8d542 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.cpp @@ -4,8 +4,8 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "AreaHint.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" AreaHint::AreaHint(eTutorial_Hint id, Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h index e12223fc9..faae17b7f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/AreaHint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/AreaHint.h @@ -1,7 +1,7 @@ #pragma once #include "TutorialHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" class AABB; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp index c1e0492cc..9720856a1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.cpp @@ -3,7 +3,7 @@ #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "DiggerItemHint.h" DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/DiggerItemHint.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp similarity index 83% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp index d0397305f..f00abe25b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "LookAtEntityHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" LookAtEntityHint::LookAtEntityHint(eTutorial_Hint id, Tutorial* tutorial, int descriptionId, int titleId, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h index 64737a3d9..4aade18f4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtEntityHint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtEntityHint.h @@ -3,7 +3,7 @@ #include "java/Class.h" #include "TutorialHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class ItemInstance; class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp index 688d87b96..2d0b67da1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.cpp @@ -1,8 +1,8 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "LookAtTileHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h index e35dd4fa9..948e280a0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/LookAtTileHint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/LookAtTileHint.h @@ -2,7 +2,7 @@ // using namespace std; #include "TutorialHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class ItemInstance; class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp index 09b672397..4492f0eeb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.cpp @@ -1,8 +1,8 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TakeItemHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial* tutorial, int items[], diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h similarity index 86% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h index 65891c979..874315cb8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TakeItemHint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TakeItemHint.h @@ -2,7 +2,7 @@ // using namespace std; #include "TutorialHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class ItemInstance; class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp index bf4ba4bc6..e26c9a227 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TutorialHint.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" class Entity; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h index 12e23364f..40131d293 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h @@ -3,7 +3,7 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHints.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHints.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp index cd0a59039..1a58676db 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.cpp @@ -1,9 +1,9 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "AreaTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" AreaTask::AreaTask(eTutorial_State state, Tutorial* tutorial, std::vector* inConstraints, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h index 195762903..858927c74 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/AreaTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/AreaTask.h @@ -4,7 +4,7 @@ #include #include "TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Tutorial; class TutorialConstraint; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp index ac9c5b6f1..bdcc29933 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.cpp @@ -3,12 +3,12 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "ChoiceTask.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "4J_Input.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Linux/Linux_UIController.h" ChoiceTask::ChoiceTask( diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h index d3ef093ef..f5ea3ee43 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h @@ -2,7 +2,7 @@ // using namespace std; #include "TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp index 70339b793..87908144c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.cpp @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "CompleteUsingItemTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CompleteUsingItemTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CompleteUsingItemTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp index 975bda2bd..b949b8578 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.cpp @@ -9,8 +9,8 @@ #include "ControllerTask.h" #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.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" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ControllerTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ControllerTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp index c42574045..08c7d718d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.cpp @@ -3,7 +3,7 @@ #include #include "CraftTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/CraftTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/CraftTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp index 0f5dadb2b..90595c3d8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.cpp @@ -1,5 +1,5 @@ #include "EffectChangedTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/EffectChangedTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/EffectChangedTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp similarity index 80% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp index 31c4536be..77c328a94 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "FullTutorialActiveTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" FullTutorialActiveTask::FullTutorialActiveTask( Tutorial* tutorial, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h index 245a95a5a..beef693ee 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/FullTutorialActiveTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/FullTutorialActiveTask.h @@ -2,7 +2,7 @@ // using namespace std; #include "TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp index 0316d414f..96d19cad2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.cpp @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" #include "HorseChoiceTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/ChoiceTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/ChoiceTask.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h index 2b8e2c65e..552fc2a57 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/HorseChoiceTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/HorseChoiceTask.h @@ -1,7 +1,7 @@ #pragma once #include "ChoiceTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp index c5832d15b..336dc82f7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.cpp @@ -5,12 +5,12 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "InfoTask.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "4J_Input.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/InputConstraint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/InputConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.Client/Linux/Linux_UIController.h" InfoTask::InfoTask( diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/InfoTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/InfoTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/PickupTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/PickupTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp index d00fc37f4..7df3a06cd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.cpp @@ -2,7 +2,7 @@ #include #include "ProcedureCompoundTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" ProcedureCompoundTask::~ProcedureCompoundTask() { for (auto it = m_taskSequence.begin(); it < m_taskSequence.end(); ++it) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h index a5973f2fa..f48f8166c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProcedureCompoundTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProcedureCompoundTask.h @@ -3,7 +3,7 @@ #include #include "TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h index bba2de7a9..5c78b3a2a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/ProgressFlagTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/ProgressFlagTask.h @@ -1,6 +1,6 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TutorialTask.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp index 7d08c3482..167ed9b9d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.cpp @@ -1,7 +1,7 @@ #include #include "RideEntityTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/RideEntityTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/RideEntityTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp index 0f12790a2..d95dacb2c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.cpp @@ -2,7 +2,7 @@ #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "StatTask.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StatTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StatTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h index 62b282d39..894ef62d0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/StateChangeTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/StateChangeTask.h @@ -1,6 +1,6 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TutorialTask.h" class StateChangeTask : public TutorialTask { diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp index 56a2b134c..ceb113698 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.cpp @@ -1,9 +1,9 @@ #include -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" TutorialTask::TutorialTask(Tutorial* tutorial, int descriptionId, bool enablePreCompletion, diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h index 32d95e21f..8763580e8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h @@ -4,7 +4,7 @@ #include // using namespace std; -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" class Level; class Tutorial; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTasks.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTasks.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp index e7864a743..6cb5bd368 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.cpp @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "UseItemTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; class TutorialConstraint; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseItemTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseItemTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp index 6ff9ef2f5..f5455d2f7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.cpp @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "UseTileTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" class Tutorial; class TutorialConstraint; diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/UseTileTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/UseTileTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp index bbee75d8a..6d963d137 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "XuiCraftingTask.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" bool XuiCraftingTask::isCompleted() { // This doesn't seem to work diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tasks/XuiCraftingTask.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tasks/XuiCraftingTask.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp index 463b14a19..ff0657eb5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" @@ -16,9 +16,9 @@ #include "Minecraft.Client/net/minecraft/server/level/SurvivalMode.h" #include "Tutorial.h" #include "TutorialMessage.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTasks.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraints.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHints.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "4J.Common/4J_InputActions.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.h index dbf5caec5..ed224af49 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.h @@ -1,8 +1,8 @@ #pragma once // using namespace std; -#include "Minecraft.Client/Common/Source Files/Tutorial/Tasks/TutorialTask.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Constraints/TutorialConstraint.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Hints/TutorialHint.h" +#include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTask.h" +#include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraint.h" +#include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHint.h" #include "TutorialMessage.h" #include "TutorialEnum.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialEnum.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/TutorialEnum.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMessage.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.h b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMessage.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMessage.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMessage.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp rename to minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp index 29548950f..32f689375 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.cpp +++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include @@ -7,8 +7,8 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h rename to minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp index e4ea105af..82a631ab8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp @@ -2,10 +2,10 @@ #include #include -#include "Minecraft.World/Header Files/PortableFileIO.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/PortableFileIO.h" +#include "Minecraft.World/include/compression.h" #include "ArchiveFile.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/ByteArrayInputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h index 83f138a20..403623489 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIController.h @@ -3,7 +3,7 @@ #include "UIEnums.h" #include "UIStructs.h" #include "4J_Storage.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" // 4J Stu - An interface class that defines all the public functions that we use // within the game code. This allows us to build the Xbox 360 version without diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index cee8b98a9..98531b62e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "IUIScene_AbstractContainerMenu.h" @@ -8,11 +8,12 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" +#include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "4J_Input.h" #include "4J.Common/4J_InputActions.h" @@ -373,7 +374,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick() { bool bPointerIsOverSlot = false; // Centre position of item under pointer, use this to snap pointer to item. - D3DXVECTOR3 vSnapPos; + Vec3 vSnapPos; for (int iSection = m_eFirstSection; iSection < m_eMaxSection; ++iSection) { // Do not check any further if we have already found the item under the diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h index d38676cba..70bc0e5eb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "UIStructs.h" class HtmlString; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp index 18925c219..dd1507b69 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "IUIScene_AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp index 142c22ae6..77dc82639 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.cpp @@ -9,7 +9,7 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" #include "Minecraft.World/net/minecraft/world/inventory/BeaconMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp index 5c43ae5d2..f32db1cb6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_BrewingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BrewingMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CommandBlockMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CommandBlockMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp index cffd51b29..a12122bd1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_ContainerMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp index 91e4321d0..3cf4863f3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "4J.Common/4J_InputActions.h" #include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" @@ -6,7 +6,7 @@ #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "IUIScene_CraftingMenu.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h index e9b630502..7a19c7ca9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h @@ -1,7 +1,7 @@ #pragma once #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" class LocalPlayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp index 94d797273..c892d31aa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "IUIScene_CreativeMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp index cd5b64baf..080952d79 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection(ESceneSection eSection, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_DispenserMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp index 0cf37cb1b..5c6ce4c20 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.cpp @@ -4,7 +4,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "IUIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp index 87e2028da..a72a38c3c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_FireworksMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/FireworksMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp index 80798d4b2..0a3858137 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_FurnaceMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/FurnaceMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp index 0e10473e8..7f12b0894 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_HopperMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/HopperMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HopperMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp index b7f04e0fc..558de5ba6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HorseInventoryMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp index 138ccd6aa..3fe7cd86f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.cpp @@ -1,7 +1,7 @@ #include #include "IUIScene_InventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" IUIScene_AbstractContainerMenu::ESceneSection diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp index 129797412..e3abea5c3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -3,7 +3,7 @@ #include "IUIScene_PauseMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" @@ -14,9 +14,9 @@ #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.World/Header Files/compression.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" +#include "Minecraft.World/include/compression.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" int IUIScene_PauseMenu::ExitGameDialogReturned( void* pParam, int iPad, C4JStorage::EMessageResult result) { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h index 9237a09eb..ad9bbd34b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "4J_Storage.h" #include "4J_Profile.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp index 60b65f7a4..354ae8b0f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h index 85a59b4f1..501f195ee 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" #include "Minecraft.World/net/minecraft/util/HtmlString.h" #include "Minecraft.World/net/minecraft/world/item/Rarity.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" class MerchantRecipe; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h rename to minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp index 704e8c4cb..1d25405e1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.cpp @@ -3,9 +3,9 @@ #include "UIComponent_Chat.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.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/Linux_UIController.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h index b6121e44a..760b58178 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Chat.h @@ -2,11 +2,11 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.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/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp similarity index 81% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp index 3882a9d7b..2094ee573 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.cpp @@ -1,7 +1,7 @@ #include "UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h index 3cf70889c..9456c066e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIConsole.h @@ -3,9 +3,9 @@ #include #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp similarity index 85% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp index 4b27089c4..1fc0c84dc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.cpp @@ -1,6 +1,6 @@ #include "UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h similarity index 83% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h index 395025639..524166141 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_DebugUIMarketingGuide.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp similarity index 83% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp index 159ad21fb..d9088e6cf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.cpp @@ -1,8 +1,8 @@ #include "UIComponent_Logo.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" UIComponent_Logo::UIComponent_Logo(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h index 669513b2a..7c4760e34 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp index f2ebefa1b..004f110af 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.cpp @@ -1,7 +1,7 @@ #include "UIComponent_MenuBackground.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.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/Linux_UIController.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h index 6decb0bb4..ad27eb500 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp index 7467d0360..00c2f84dd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.cpp @@ -4,9 +4,9 @@ #include "UIComponent_Panorama.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h index 7200d88a0..9667a7835 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp index b2a1db795..866e14257 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIComponent_PressStartToPlay.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h index dcd6c32de..545f1548d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIComponent_PressStartToPlay : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp index 2ce09700f..c02fb17b7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp @@ -1,8 +1,8 @@ #include "UIComponent_Tooltips.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h index ca60ba7d6..35b4e7287 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.h @@ -2,12 +2,12 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "4J.Common/4J_Compat.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.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 "4J.Common/4J_InputActions.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp index 5381c4979..bc33ee375 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp @@ -1,8 +1,8 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIComponent_TutorialPopup.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h index 4ca20f77d..0b153da57 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #define TUTORIAL_POPUP_FADE_TIMER_ID 0 #define TUTORIAL_POPUP_MOVE_SCENE_TIMER_ID 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp index f5f2555b7..bb770564d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_HUD.h" #include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h rename to minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h index 8db8f5f80..4c5522ef7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HUD.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_HUD.h" #define CHAT_LINES_COUNT 10 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp index 8e84668a5..6f1a12fd5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl.cpp @@ -1,6 +1,6 @@ #include "UIControl.h" #include "java/JavaMath.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" UIControl::UIControl() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl.h index 5c6854420..90827f9f9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp index e5aa59e6c..3342cc3a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp @@ -3,9 +3,9 @@ #include "UIControl.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h index 70a709bd6..05ab36271 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h @@ -3,9 +3,9 @@ #include #include "UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" // This class maps to the FJ_Base class in actionscript class UIControl_Base : public UIControl { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp index 6bc76de8e..c95d20cf4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.cpp @@ -1,7 +1,7 @@ #include "UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" UIControl_BeaconEffectButton::UIControl_BeaconEffectButton() { m_data = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h index 911f45714..33b874b44 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h @@ -4,7 +4,7 @@ #include "UIControl.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_BeaconEffectButton : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp similarity index 83% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp index d5f13b422..e42d76341 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp @@ -1,7 +1,7 @@ #include "UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h similarity index 86% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h index a8157c80d..6bbbcddc5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h @@ -4,7 +4,7 @@ #include "UIControl.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_BitmapIcon : public UIControl { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp similarity index 85% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp index 80060a176..dcb8d8b18 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp @@ -1,8 +1,8 @@ #include "UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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.World/ConsoleHelpers/StringHelpers.h" UIControl_Button::UIControl_Button() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h index aabe71d70..3d563f6c8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h @@ -3,9 +3,9 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_Button : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp index 891689c7f..7ebbdc6d6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp @@ -1,8 +1,8 @@ #include "UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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/Linux/Iggy/include/rrCore.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h index 767bd3666..99cdac91c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h @@ -4,9 +4,9 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_ButtonList : public UIControl_Base { protected: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp index 896a91d57..41086df8e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp @@ -1,8 +1,8 @@ #include "UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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/Linux/Iggy/include/rrCore.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h index 15cce51c4..1c2c054d3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h @@ -3,9 +3,9 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_CheckBox : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp similarity index 63% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp index 5379a92bc..6ec4077b1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.cpp @@ -1,7 +1,7 @@ #include "UIControl_Cursor.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" UIControl_Cursor::UIControl_Cursor() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h index 293b440a7..aae07e54d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h @@ -4,7 +4,7 @@ #include "UIControl_Base.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_Cursor : public UIControl_Base { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp index 7c617338b..45f5ad030 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp @@ -1,8 +1,8 @@ #include "UIControl_DLCList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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/rrCore.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h index f9d834469..9073d70f8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h @@ -4,7 +4,7 @@ #include "UIControl_ButtonList.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_DLCList : public UIControl_ButtonList { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp index 5554c346a..3bc6aab0e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp @@ -1,8 +1,8 @@ #include "UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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.World/ConsoleHelpers/StringHelpers.h" UIControl_DynamicLabel::UIControl_DynamicLabel() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h index c6099a316..e6ef7826a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h @@ -3,8 +3,8 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp index ca1d280b8..3404fe2d2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.cpp @@ -7,10 +7,10 @@ #include "Minecraft.Client/net/minecraft/client/renderer/tileentity/EnchantTableRenderer.h" #include "Minecraft.Client/net/minecraft/client/Lighting.h" #include "Minecraft.Client/net/minecraft/client/model/BookModel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.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.World/net/minecraft/world/inventory/EnchantmentMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/Slot.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h index b9664867c..8631120d5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h @@ -4,7 +4,7 @@ #include "UIControl.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "java/Random.h" class UIScene_EnchantingMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp index 11f33f934..ed1f51334 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp @@ -8,13 +8,13 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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/Linux_App.h" #include "Minecraft.World/net/minecraft/world/entity/player/Abilities.h" #include "Minecraft.World/net/minecraft/world/inventory/EnchantmentMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h index 9a1da92c3..8007cfc86 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h @@ -5,7 +5,7 @@ #include "UIControl_Button.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "java/Random.h" class UIControl_EnchantmentButton : public UIControl_Button { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp index cf9d9bc04..139610b75 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.cpp @@ -1,8 +1,8 @@ #include "UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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" UIControl_HTMLLabel::UIControl_HTMLLabel() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h index 30df43f80..25d9b022a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h @@ -3,8 +3,8 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp similarity index 80% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp index 26c880510..755447e5e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp @@ -1,9 +1,9 @@ #include "UIControl_Label.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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" UIControl_Label::UIControl_Label() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h similarity index 79% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h index a19ceb4e7..6f6268027 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h @@ -3,8 +3,8 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UIControl_Label : public UIControl_Base { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp index 5fb497de9..3908455a3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp @@ -1,8 +1,8 @@ #include "UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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.World/ConsoleHelpers/StringHelpers.h" UIControl_LeaderboardList::UIControl_LeaderboardList() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h index c43af4d32..55cc6ed9d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h @@ -4,7 +4,7 @@ #include "UIControl_Base.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_LeaderboardList : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp index 95ae5fa8c..603ed039c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.cpp @@ -7,10 +7,10 @@ #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/Lighting.h" #include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.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.World/net/minecraft/world/entity/LivingEntity.h" #include "Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.h" // #include diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp index 837f01304..6dfcf734a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.cpp @@ -9,10 +9,10 @@ #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "UIControl_MinecraftPlayer.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.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" UIControl_MinecraftPlayer::UIControl_MinecraftPlayer() { UIControl::setControlType(UIControl::eMinecraftPlayer); diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp index cee7ebf1e..b5d0305b5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp @@ -1,8 +1,8 @@ #include "UIControl_PlayerList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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/rrCore.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h index 2aa155a4a..b74e79189 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h @@ -4,7 +4,7 @@ #include "UIControl_ButtonList.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_PlayerList : public UIControl_ButtonList { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp index baaab511a..cca43a1fe 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.cpp @@ -14,7 +14,7 @@ #include "UIControl_PlayerSkinPreview.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp index 72726c2df..6d608b456 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp @@ -1,8 +1,8 @@ #include "UIControl_Progress.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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.World/ConsoleHelpers/StringHelpers.h" UIControl_Progress::UIControl_Progress() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h index 6d3514067..8e45221a3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h @@ -3,9 +3,9 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_Progress : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp index 268f85abc..b395c29e3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp @@ -1,8 +1,8 @@ #include "UIControl_SaveList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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/rrCore.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h index 7a22f7d83..b3203e715 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h @@ -4,7 +4,7 @@ #include "UIControl_ButtonList.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_SaveList : public UIControl_ButtonList { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp index b1056ecba..75efa49e8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp @@ -1,11 +1,11 @@ #include "UIControl_Slider.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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/Linux/Linux_UIController.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" UIControl_Slider::UIControl_Slider() { m_id = 0; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h index 4e6f5bdb1..f436d2195 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.h @@ -4,10 +4,10 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.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/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_Slider : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp index df11cc334..32f4908bc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.cpp @@ -1,8 +1,8 @@ #include "UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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" UIControl_SlotList::UIControl_SlotList() { m_lastHighlighted = -1; } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h index 6e54361f8..2034c0edc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h @@ -4,7 +4,7 @@ #include "UIControl_Base.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_SlotList : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp index eb4565d15..380d2bec7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp @@ -1,8 +1,8 @@ #include "UIControl_SpaceIndicatorBar.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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.World/ConsoleHelpers/StringHelpers.h" UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h index 708612d20..d451f4b68 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SpaceIndicatorBar.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h @@ -7,9 +7,9 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_SpaceIndicatorBar : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp index 54e312339..87c3ccdd2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp @@ -1,9 +1,9 @@ #include "UIControl_TextInput.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/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" UIControl_TextInput::UIControl_TextInput() { m_bHasFocus = false; } diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h index e866c121c..598941c74 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h @@ -3,8 +3,8 @@ #include #include "UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UIControl_TextInput : public UIControl_Base { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp index ad22130c9..23df169ff 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp @@ -1,9 +1,9 @@ #include "UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/UIString.h" +#include "Minecraft.Client/Common/src/UI/Controls/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.World/ConsoleHelpers/StringHelpers.h" UIControl_TexturePackList::UIControl_TexturePackList() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h index d424b0555..8e63acecf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h @@ -5,7 +5,7 @@ #include "UIControl_Base.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_TexturePackList : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp similarity index 84% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp index a9cac3afa..6bedb01f8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.cpp @@ -1,6 +1,6 @@ #include "UIControl_Touch.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h" UIControl_Touch::UIControl_Touch() {} diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h similarity index 86% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h rename to minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h index 5c7491a34..a449e5903 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Touch.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Touch.h @@ -4,7 +4,7 @@ #include "UIControl_Base.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIControl_Touch : public UIControl_Base { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp index 5dc04d0d0..4aeda6a09 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp @@ -1,15 +1,15 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" #include "4J_Input.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.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.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h similarity index 81% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h index 4ac89e5a3..3e99b9c7b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h @@ -2,13 +2,13 @@ #ifdef _DEBUG_MENUS_ENABLED #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#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/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp index a7e6cb461..77dad9b8a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.cpp @@ -1,8 +1,8 @@ #include "UIScene_DebugOptions.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h similarity index 86% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h index 21a773d8b..4b564cb40 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.h @@ -2,10 +2,10 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp index b4a929ad5..a39196bd1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp @@ -2,12 +2,12 @@ #include #include -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.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.World/net/minecraft/commands/common/EnchantItemCommand.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h similarity index 86% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h index 4db11a9a6..22f8747d0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h @@ -5,11 +5,11 @@ #include #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_ButtonList.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Slider.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.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_Slider.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" #include "java/Class.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp index 62a2a38d5..a229acc16 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp @@ -2,11 +2,11 @@ #include #include -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h" #include "4J_Input.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.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.World/net/minecraft/world/phys/Vec3.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h similarity index 80% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h index 95b22a6fe..1c875da21 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.h @@ -2,13 +2,13 @@ #ifdef _DEBUG_MENUS_ENABLED #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_CheckBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/UIScene.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_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/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp index 83ea5a357..52a97123c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.cpp @@ -7,8 +7,8 @@ #include "IUIScene_StartGame.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_App.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h similarity index 80% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h index 20efa912f..1c4219e64 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/IUIScene_StartGame.h @@ -2,13 +2,13 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "4J_Storage.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BitmapIcon.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_TexturePackList.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/Linux/Iggy/include/rrCore.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 893ab56e4..a5389799f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_CreateWorldMenu.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" @@ -11,7 +11,7 @@ #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" #include "Minecraft.World/net/minecraft/world/level/LevelType.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #if defined(_WINDOWS64) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index 61e174345..c2f3e9592 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -1,7 +1,7 @@ #pragma once #include "IUIScene_StartGame.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" class UIScene_CreateWorldMenu : public IUIScene_StartGame { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 993c3bb2e..897c97e0a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_DLCMainMenu.h" #define PLAYER_ONLINE_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h index 68c024c77..cf2711430 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_DLCMainMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index 2668cdd1e..7d3d0c971 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_DLCOffersMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h similarity index 89% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h index 9617c2204..40ccbb28c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DLCList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" class UIScene_DLCOffersMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index b1c36a210..091a4aeec 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_EULA.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h index f7ea08ffd..6fce36396 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_EULA : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp index f4eaaceea..3da63a4d5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.cpp @@ -1,7 +1,7 @@ #include "UIScene_Intro.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Linux/Linux_UIController.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h similarity index 88% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h index bcbfc069f..0bc54e45b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_Intro.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index b7d827191..82f75ffa5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_JoinMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h index 4b0398b6b..260014910 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_JoinMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index b515f87ca..9b74c3b0a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_LaunchMoreOptionsMenu.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h index 61f85798d..a20b3c261 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_LaunchMoreOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index f1337c8f3..d4a099e9c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_LeaderboardsMenu.h" -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h index 9eab05da1..331292181 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardInterface.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardInterface.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index 58433938e..023801d44 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_LoadMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" @@ -8,7 +8,7 @@ #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #define GAME_CREATE_ONLINE_TIMER_ID 0 #define GAME_CREATE_ONLINE_TIMER_TIME 100 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index e4e9a6868..42479abc8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -3,7 +3,7 @@ #include #include "IUIScene_StartGame.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" class UIScene_LoadMenu : public IUIScene_StartGame { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index 0c48ec5f0..ed99aea5c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_LoadOrJoinMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" @@ -12,12 +12,12 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" -#include "Minecraft.World/Header Files/PortableFileIO.h" +#include "Minecraft.World/include/PortableFileIO.h" #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" -#include "Minecraft.Client/Common/Source Files/Network/SessionInfo.h" +#include "Minecraft.Client/Common/src/Network/SessionInfo.h" #if defined(SONY_REMOTE_STORAGE_DOWNLOAD) unsigned long UIScene_LoadOrJoinMenu::m_ulFileSize = 0L; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index b2f8555b8..4c0c01051 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -4,9 +4,9 @@ #include #include "java/File.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SaveList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" #include "4J_Storage.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index ed06002c8..229f9ba1f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -4,7 +4,7 @@ #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/User.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h index 775ee3272..f3b63d3af 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_MainMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index f849d42ae..7da0125eb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_NewUpdateMessage.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h similarity index 83% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h index c7afe7f74..78e1c0e89 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h @@ -1,8 +1,8 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Button.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Button.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" class UIScene_NewUpdateMessage : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index 285271e7c..420169dd7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SaveMessage.h" #define PROFILE_LOADED_TIMER_ID 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h index b30a7c11b..a5c33bfaf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_SaveMessage : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index 8da69afef..1360a6e97 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_TrialExitUpsell.h" UIScene_TrialExitUpsell::UIScene_TrialExitUpsell(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h index 3bf85c6f7..dc5fa62bc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_TrialExitUpsell : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index dd90d5240..8e9fa5a41 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_ControlsMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "4J_Input.h" UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h index d4963533f..c48366b99 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ControlsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_ControlsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp index 11ea90645..d9b75e263 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_Credits.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h index e606674de..ccfca0029 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #define PS3_CREDITS_COUNT 80 #define PSVITA_CREDITS_COUNT 82 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index afbadbc0c..8c1d0dfbb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_HelpAndOptionsMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h index 54f0a5052..b54d90ff8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #define BUTTON_HAO_CHANGESKIN 0 #define BUTTON_HAO_HOWTOPLAY 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index 383087c5b..41a7726c2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_HowToPlay.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h index 79a57141a..1e1e4ed0f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_DynamicLabel.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.h" class UIScene_HowToPlay : public UIScene { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 6fae03a21..42beb6354 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_HowToPlayMenu.h" // strings for buttons in the list diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h index 4d5318516..6ff45a2c2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_HowToPlayMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index bb9e65388..948965abe 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_LanguageSelector.h" // strings for buttons in the list diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index cd786c652..5b4d52d8d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -1,10 +1,10 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #include "Minecraft.Client/Common/App_Defines.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class UIScene_LanguageSelector : public UIScene { public: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index e9809a98a..f6bbe6edb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_ReinstallMenu.h" UIScene_ReinstallMenu::UIScene_ReinstallMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h index 8488e85ab..18d10ce9c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_ReinstallMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index 8411767b5..d1e4b6e01 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsAudioMenu.h" UIScene_SettingsAudioMenu::UIScene_SettingsAudioMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h index 3cb29a3a6..574dc9c56 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_SettingsAudioMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index e26b59ddc..2f1bf26fd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsControlMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h index d75b00d14..ef13d9c3d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_SettingsControlMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index 4ef128335..26b94f5c7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsGraphicsMenu.h" UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h index 9b8eab08e..e7668b3c2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_SettingsGraphicsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index f8841f81c..cbf3f196e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h index 1781e60f8..2198933fd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" #define BUTTON_ALL_OPTIONS 0 #define BUTTON_ALL_AUDIO 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index b4bf42147..743b85c68 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsOptionsMenu.h" int UIScene_SettingsOptionsMenu::m_iDifficultySettingA[4] = { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h index a1a45f942..8035c2159 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_SettingsOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index e310717f7..c19edb7f5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SettingsUIMenu.h" UIScene_SettingsUIMenu::UIScene_SettingsUIMenu(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h index 6dc30e35b..2cdde0f1d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_SettingsUIMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index 4fdc47b00..7f87b9484 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_SkinSelectMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" #define SKIN_SELECT_PACK_DEFAULT 0 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h index 854ef5d45..3a51dc9c7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h @@ -2,8 +2,8 @@ #include #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" class UIScene_SkinSelectMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index 88c89d9a8..85461f259 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_AbstractContainerMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu( int iPad, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h index fd8de0fc4..5cb6f7a79 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h @@ -1,10 +1,10 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Cursor.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" class AbstractContainerMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index a834b96bf..340107dbc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h index e79270c5f..4a81a7bb3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h @@ -1,9 +1,9 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" #include "4J_Input.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index 98825e0d9..4680b7d37 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -1,11 +1,11 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_BeaconMenu.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h index 47636b577..bf13d7aee 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h @@ -1,9 +1,9 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_BeaconEffectButton.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BeaconMenu.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_BeaconMenu.h" class UIScene_BeaconMenu : public UIScene_AbstractContainerMenu, public IUIScene_BeaconMenu { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp index fb6e252ed..5bffd0893 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.cpp @@ -2,12 +2,12 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_BrewingStandMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.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/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/world/inventory/BrewingStandMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h similarity index 76% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h index a9b4a2f31..806e34d25 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h @@ -4,14 +4,14 @@ #include #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_BrewingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Progress.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#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" class InventoryMenu; class BrewingStandTileEntity; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp index 203a84865..ba2d3b464 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.cpp @@ -3,11 +3,11 @@ #include "UIScene_ContainerMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.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_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/Container.h" #include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h similarity index 73% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h index d00874cb8..cb909fce8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h @@ -3,13 +3,13 @@ #include #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#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" class InventoryMenu; class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp index ec2458078..c7a5926bb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp @@ -3,20 +3,20 @@ #include "UIScene_CreativeMenu.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.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/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.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.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.World/net/minecraft/world/SimpleContainer.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h similarity index 85% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h index 3322e7db8..afa3b6796 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h @@ -3,13 +3,13 @@ #include #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#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" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp index 700607426..7c0b6e000 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.cpp @@ -3,11 +3,11 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.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/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/inventory/TrapMenu.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h similarity index 73% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h index 48c81e5c0..3e3721e6a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h @@ -3,13 +3,13 @@ #include #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#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" class InventoryMenu; class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index 95fc9c5ca..b0a1b59e5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h index 2155493c2..65f3290a7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h @@ -1,9 +1,9 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentButton.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_EnchantmentBook.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_EnchantingMenu.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index ca7235949..fafba59af 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h index 19f92775d..53d48c439 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FireworksMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FireworksMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index b11be22c1..404d59e67 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h index c15dd6fc3..625fb1c40 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h @@ -1,7 +1,7 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_FurnaceMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_FurnaceMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp similarity index 92% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp index 976ed6e77..ce53a72b1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.cpp @@ -3,11 +3,11 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_HopperMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.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/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/Container.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h similarity index 73% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h index 1674be3d2..3f708515a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h @@ -3,13 +3,13 @@ #include #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HopperMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#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" class InventoryMenu; class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp index 7cdd4d083..43189c73e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.cpp @@ -3,11 +3,11 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "UIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.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/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.World/net/minecraft/world/Container.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h similarity index 77% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h index 5fc2b1146..5efe6e475 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h @@ -3,14 +3,14 @@ #include #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftHorse.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#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" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index 622ed1dae..5ce7cc5d7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InventoryMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" @@ -11,9 +11,9 @@ #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/Lighting.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h similarity index 91% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h index c028c424f..ac70e8fb9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h @@ -1,8 +1,8 @@ #pragma once #include "UIScene_AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_InventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_InventoryMenu.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" #include "Minecraft.World/net/minecraft/world/effect/MobEffect.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index d60b275d1..41785028f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/net/minecraft/util/HtmlString.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h index 922518168..16fe78e7c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h @@ -1,9 +1,9 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.h" class InventoryMenu; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 2404cba6a..0392e6c1d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h index 1a2bdd5ce..b636b960a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h @@ -1,10 +1,10 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_SlotList.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Label.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_HTMLLabel.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_HTMLLabel.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CraftingMenu.h" #define CRAFTING_INVENTORY_SLOT_START 0 #define CRAFTING_INVENTORY_SLOT_END (CRAFTING_INVENTORY_SLOT_START + 27) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index dbc1bcf8f..824d3f4fa 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_DeathMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h index 36602533b..c25d1b393 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_DeathMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 19a6ff2dc..2b5c9b45a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -1,7 +1,7 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_EndPoem.h" -#include "Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h" +#include "Minecraft.Client/Common/src/UI/UIBitmapFont.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h similarity index 94% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h index 516e417df..41b587062 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_EndPoem : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 5e602954d..91a3f05fd 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGameHostOptionsMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h index 94af9b940..55804eb0e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_InGameHostOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index ecd9deaa3..1bcf2c25f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGameInfoMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h similarity index 90% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h index fa07498d8..0cbc979ea 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" class UIScene_InGameInfoMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 4dc7c2ee3..28e86713a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGamePlayerOptionsMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h similarity index 95% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h index 349159f74..e163d5486 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h @@ -2,8 +2,8 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" class UIScene_InGamePlayerOptionsMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp index 14bcb9453..ca45f162f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_InGameSaveManagementMenu.h" namespace { diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h index 1cdf4296d..a2fc70b75 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_InGameSaveManagementMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index 013cad1e0..0c7658808 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_PauseMenu.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" @@ -7,8 +7,8 @@ #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h similarity index 93% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h index a17065dd2..e17f3ee53 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.h" #define BUTTON_PAUSE_RESUMEGAME 0 #define BUTTON_PAUSE_HELPANDOPTIONS 1 diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index 646f6e597..80e587760 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_SignEntryMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h index ec5dc0134..aedc71d05 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class SignTileEntity; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 56d595d53..b4405d6a2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_TeleportMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h similarity index 87% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h index 0248d07b3..d84857319 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_PlayerList.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.h" class UIScene_TeleportMenu : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp index d40cc8f00..ee1731308 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_ConnectingProgress.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h index 70dee981b..8fb437089 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_ConnectingProgress : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp index 379b71825..ef909a2e4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_FullscreenProgress.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h index f84234d62..de4c6cfb2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_FullscreenProgress : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp index bd86c17f7..00319f772 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_Keyboard.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h index 420b033fd..a7877f44b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_Keyboard : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp index ee97bf1b3..414b49964 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.cpp @@ -1,9 +1,9 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_MessageBox.h" UIScene_MessageBox::UIScene_MessageBox(int iPad, void* initData, diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h index fc5ed8b64..e3716cd45 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_MessageBox : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp index 244913c9d..9b84de710 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -1,5 +1,5 @@ -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "UIScene_QuadrantSignin.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h index 277e6a306..4dca2733e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UIScene_QuadrantSignin : public UIScene { private: diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp similarity index 82% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp index 47808f544..00a03dda6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.cpp @@ -1,6 +1,6 @@ #include "UIScene_Timer.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h similarity index 78% rename from minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h rename to minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h index a5e83d9cb..7bda82f45 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h +++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h @@ -2,9 +2,9 @@ #include -#include "Minecraft.Client/Common/Source Files/UI/UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" +#include "Minecraft.Client/Common/src/UI/UIScene.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl.h" class UILayer; diff --git a/minecraft/Minecraft.Client/Common/src/UI/UI.h b/minecraft/Minecraft.Client/Common/src/UI/UI.h new file mode 100644 index 000000000..d55bb5668 --- /dev/null +++ b/minecraft/Minecraft.Client/Common/src/UI/UI.h @@ -0,0 +1,119 @@ +#pragma once + +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" + +#include "UIBitmapFont.h" +#include "UITTFFont.h" + +#include "UIScene.h" +#include "UILayer.h" +#include "UIGroup.h" +#include "UIController.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_Button.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/Controls/UIControl_Label.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SlotList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Cursor.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.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_DynamicLabel.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftPlayer.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_MinecraftHorse.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentBook.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.h" +#include "Minecraft.Client/Common/src/UI/Controls/UIControl_BeaconEffectButton.h" + +#include "Minecraft.Client/Common/src/UI/Components/UIScene_HUD.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Panorama.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_Logo.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/UIComponent_Chat.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.h" +#include "Minecraft.Client/Common/src/UI/Components/UIComponent_MenuBackground.h" + +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_QuadrantSignin.h" +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_MessageBox.h" +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Timer.h" +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.h" + +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOptions.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/Scenes/Debug/UIScene_DebugSetCamera.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" + +#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.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_SaveMessage.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_LoadMenu.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_LoadOrJoinMenu.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_LaunchMoreOptionsMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_FullscreenProgress.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_DLCMainMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" + +#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.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_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_SettingsUIMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.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_HowToPlay.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/In-Game Menu Screens/UIScene_PauseMenu.h" + +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.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_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_InventoryMenu.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_CreativeMenu.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/Containers/UIScene_AnvilMenu.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_HopperMenu.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_FireworksMenu.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_SignEntryMenu.h" + +#include "Minecraft.Client/Common/src/UI/Scenes/UIScene_ConnectingProgress.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_InGameInfoMenu.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_InGamePlayerOptionsMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" +#include "Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.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_NewUpdateMessage.h" \ No newline at end of file diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp index 1c7d78748..86986af3f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIBitmapFont.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "UIFontData.h" #include "UIBitmapFont.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h b/minecraft/Minecraft.Client/Common/src/UI/UIBitmapFont.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h rename to minecraft/Minecraft.Client/Common/src/UI/UIBitmapFont.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp similarity index 99% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UIController.cpp index e766b6467..7f2e4be6c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp @@ -1,10 +1,10 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "UIController.h" #include "UI.h" #include "UIScene.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h b/minecraft/Minecraft.Client/Common/src/UI/UIController.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h rename to minecraft/Minecraft.Client/Common/src/UI/UIController.h index 4ee7dade4..9ba5e0d2f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h +++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.h @@ -13,9 +13,9 @@ #include "4J_Storage.h" #include "4J.Common/4J_InputActions.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.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 "UIGroup.h" class UIAbstractBitmapFont; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIFontData.cpp similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UIFontData.cpp diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.h b/minecraft/Minecraft.Client/Common/src/UI/UIFontData.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIFontData.h rename to minecraft/Minecraft.Client/Common/src/UI/UIFontData.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp index b9f087116..62291fb86 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.cpp @@ -1,9 +1,9 @@ #include "UIGroup.h" #include "4J_Profile.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.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/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h rename to minecraft/Minecraft.Client/Common/src/UI/UIGroup.h index c5ce1f7f3..8307bec1c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIGroup.h +++ b/minecraft/Minecraft.Client/Common/src/UI/UIGroup.h @@ -2,7 +2,7 @@ #include #include "UILayer.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp b/minecraft/Minecraft.Client/Common/src/UI/UILayer.cpp similarity index 79% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UILayer.cpp index be131055c..e1ca25ba9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UILayer.cpp @@ -2,83 +2,83 @@ #include "UILayer.h" #include "UIScene.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Chat.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIConsole.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_DebugUIMarketingGuide.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Logo.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_MenuBackground.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Panorama.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_Tooltips.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.h" -#include "Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugCreateSchematic.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOptions.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugOverlay.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Debug/UIScene_DebugSetCamera.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_Intro.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BrewingStandMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_ContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_DispenserMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HopperMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.h" -#include "Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Timer.h" -#include "Minecraft.Client/Common/Source Files/UI/UIGroup.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/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" UILayer::UILayer(UIGroup* parent) { m_parentGroup = parent; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h b/minecraft/Minecraft.Client/Common/src/UI/UILayer.h similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h rename to minecraft/Minecraft.Client/Common/src/UI/UILayer.h index 795e0bfa2..b84313bde 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.h +++ b/minecraft/Minecraft.Client/Common/src/UI/UILayer.h @@ -5,7 +5,7 @@ #include #include -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp index e0ce48c0a..94f0d3b50 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp @@ -8,22 +8,22 @@ #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl.h" -#include "Minecraft.Client/Common/Source Files/UI/Controls/UIControl_Base.h" -#include "Minecraft.Client/Common/Source Files/UI/UIController.h" -#include "Minecraft.Client/Common/Source Files/UI/UIGroup.h" -#include "Minecraft.Client/Common/Source Files/UI/UILayer.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_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/Linux_App.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/System.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h b/minecraft/Minecraft.Client/Common/src/UI/UIScene.h similarity index 98% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h rename to minecraft/Minecraft.Client/Common/src/UI/UIScene.h index b7eacd9b1..8afd15f41 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.h +++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.h @@ -12,9 +12,9 @@ #include #include -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIEnums.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp similarity index 96% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UIString.cpp index 97f141e4c..b6d46cef1 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp @@ -1,9 +1,9 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIString.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" bool UIString::setCurrentLanguage() { int nextLanguage, nextLocale; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.h b/minecraft/Minecraft.Client/Common/src/UI/UIString.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UIString.h rename to minecraft/Minecraft.Client/Common/src/UI/UIString.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp similarity index 97% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp rename to minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp index 08c803b7e..d10187336 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.cpp +++ b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.World/Header Files/PortableFileIO.h" +#include "Minecraft.World/include/PortableFileIO.h" #include "UITTFFont.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.h b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.h similarity index 100% rename from minecraft/Minecraft.Client/Common/Source Files/UI/UITTFFont.h rename to minecraft/Minecraft.Client/Common/src/UI/UITTFFont.h diff --git a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp index 56747ff80..eb7a5fcdb 100644 --- a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp +++ b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.cpp @@ -1,5 +1,5 @@ #include "LinuxLeaderboardManager.h" -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" LeaderboardManager* LeaderboardManager::m_instance = new LinuxLeaderboardManager(); // Singleton instance of the diff --git a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h index 55b9d2e7d..17302286c 100644 --- a/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h +++ b/minecraft/Minecraft.Client/Linux/Leaderboards/LinuxLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "4J.Common/4J_Compat.h" class LinuxLeaderboardManager : public LeaderboardManager { diff --git a/minecraft/Minecraft.Client/Linux/LinuxGL.cpp b/minecraft/Minecraft.Client/Linux/LinuxGL.cpp index 031ee5012..b44b0e4ff 100644 --- a/minecraft/Minecraft.Client/Linux/LinuxGL.cpp +++ b/minecraft/Minecraft.Client/Linux/LinuxGL.cpp @@ -6,7 +6,7 @@ #include "java/IntBuffer.h" #include "java/FloatBuffer.h" #include "java/ByteBuffer.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" extern C4JRender RenderManager; diff --git a/minecraft/Minecraft.Client/Linux/Linux_App.cpp b/minecraft/Minecraft.Client/Linux/Linux_App.cpp index d14cc0643..a0fd77425 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp @@ -11,8 +11,8 @@ #include "4J_Profile.h" #include "4J.Render/4J_Render.h" #include "4J_Storage.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" CConsoleMinecraftApp app; diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp index 613f760a9..937100762 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -1,6 +1,6 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include #include // #include @@ -51,17 +51,17 @@ static void sigsegv_handler(int sig) { #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.World/ConsoleHelpers/ThreadName.h" #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h" -// #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +// #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_Defines.h" diff --git a/minecraft/Minecraft.Client/Linux/Linux_UIController.h b/minecraft/Minecraft.Client/Linux/Linux_UIController.h index 070340efe..7a80f5fbf 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_UIController.h +++ b/minecraft/Minecraft.Client/Linux/Linux_UIController.h @@ -1,7 +1,7 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIController.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/UIController.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" #include "Minecraft.Client/Linux/Iggy/include/rrCore.h" diff --git a/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp b/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp index c71b05f5e..688e49176 100644 --- a/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp +++ b/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp @@ -1,14 +1,14 @@ #ifdef __linux__ #include "Minecraft.Client/Common/Consoles_App.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" void Display::update() {} int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; } -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #endif diff --git a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp index e7131fdce..c331c7fb5 100644 --- a/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp +++ b/minecraft/Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" // 4J +#include "Minecraft.World/include/stdafx.h" // 4J // gdraw_d3d11.cpp - author: Fabian Giesen - copyright 2011 RAD Game Tools // diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h index 8a77983c1..2c7794075 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" class WindowsLeaderboardManager : public LeaderboardManager { public: diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp index da6e67cb6..09d2e458d 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp @@ -20,12 +20,12 @@ #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.Client/net/minecraft/client/User.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.World/ConsoleHelpers/ThreadName.h" #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h" // #include "Social/SocialManager.h" -// #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +// #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" // #include "../Common/XUI/XUI_Scene_Container.h" // #include "NetworkManager.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" @@ -33,7 +33,7 @@ #include "Sentient/SentientManager.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "../Resource.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" HINSTANCE hMyInst; diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h index 95dd2baa1..633f815d5 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h +++ b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.Client/Common/Source Files/UI/UIController.h" +#include "Minecraft.Client/Common/src/UI/UIController.h" class ConsoleUIController : public UIController { private: diff --git a/minecraft/Minecraft.Client/Header Files/BufferedImage.h b/minecraft/Minecraft.Client/include/BufferedImage.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/BufferedImage.h rename to minecraft/Minecraft.Client/include/BufferedImage.h diff --git a/minecraft/Minecraft.Client/Header Files/FrameProfiler.h b/minecraft/Minecraft.Client/include/FrameProfiler.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/FrameProfiler.h rename to minecraft/Minecraft.Client/include/FrameProfiler.h diff --git a/minecraft/Minecraft.Client/Header Files/MemTexture.h b/minecraft/Minecraft.Client/include/MemTexture.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/MemTexture.h rename to minecraft/Minecraft.Client/include/MemTexture.h diff --git a/minecraft/Minecraft.Client/Header Files/MemTextureProcessor.h b/minecraft/Minecraft.Client/include/MemTextureProcessor.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/MemTextureProcessor.h rename to minecraft/Minecraft.Client/include/MemTextureProcessor.h diff --git a/minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h b/minecraft/Minecraft.Client/include/MobSkinMemTextureProcessor.h similarity index 85% rename from minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h rename to minecraft/Minecraft.Client/include/MobSkinMemTextureProcessor.h index a2e2fb53e..c3a3734c6 100644 --- a/minecraft/Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h +++ b/minecraft/Minecraft.Client/include/MobSkinMemTextureProcessor.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Header Files/MemTextureProcessor.h" +#include "Minecraft.Client/include/MemTextureProcessor.h" class MobSkinMemTextureProcessor : public MemTextureProcessor { private: diff --git a/minecraft/Minecraft.Client/Header Files/NetTypes.h b/minecraft/Minecraft.Client/include/NetTypes.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/NetTypes.h rename to minecraft/Minecraft.Client/include/NetTypes.h diff --git a/minecraft/Minecraft.Client/Header Files/SkinBox.h b/minecraft/Minecraft.Client/include/SkinBox.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/SkinBox.h rename to minecraft/Minecraft.Client/include/SkinBox.h diff --git a/minecraft/Minecraft.Client/Header Files/XboxStubs.h b/minecraft/Minecraft.Client/include/XboxStubs.h similarity index 97% rename from minecraft/Minecraft.Client/Header Files/XboxStubs.h rename to minecraft/Minecraft.Client/include/XboxStubs.h index 1d5b743a2..c75559624 100644 --- a/minecraft/Minecraft.Client/Header Files/XboxStubs.h +++ b/minecraft/Minecraft.Client/include/XboxStubs.h @@ -55,14 +55,6 @@ inline constexpr int D3DBLEND_CONSTANTALPHA = 0; inline constexpr int D3DBLEND_INVCONSTANTALPHA = 0; inline constexpr int D3DPT_QUADLIST = 0; -class D3DXVECTOR3 { -public: - D3DXVECTOR3(); - D3DXVECTOR3(float, float, float); - float x, y, z, pad; - D3DXVECTOR3& operator+=(const D3DXVECTOR3& add); -}; - // XUI string table class CXuiStringTable { public: diff --git a/minecraft/Minecraft.Client/Header Files/stdafx.h b/minecraft/Minecraft.Client/include/stdafx.h similarity index 83% rename from minecraft/Minecraft.Client/Header Files/stdafx.h rename to minecraft/Minecraft.Client/include/stdafx.h index 80f25d66f..8343e6e21 100644 --- a/minecraft/Minecraft.Client/Header Files/stdafx.h +++ b/minecraft/Minecraft.Client/include/stdafx.h @@ -8,7 +8,7 @@ #ifdef _WINDOWS64 #include "Minecraft.Client/Windows64/Windows64_App.h" #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Windows64/Iggy/include/iggy.h" #include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h" #include "Minecraft.Client/Windows64/Windows64_UIController.h" @@ -16,6 +16,6 @@ #include "Minecraft.Client/Linux/Stubs/LinuxStubs.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Iggy/include/iggy.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Linux/Linux_UIController.h" #endif diff --git a/minecraft/Minecraft.Client/Header Files/stubs.h b/minecraft/Minecraft.Client/include/stubs.h similarity index 100% rename from minecraft/Minecraft.Client/Header Files/stubs.h rename to minecraft/Minecraft.Client/include/stubs.h diff --git a/minecraft/Minecraft.Client/meson.build b/minecraft/Minecraft.Client/meson.build index edb3f0faa..ac68c1590 100644 --- a/minecraft/Minecraft.Client/meson.build +++ b/minecraft/Minecraft.Client/meson.build @@ -105,14 +105,13 @@ platform_services_src = files('../platform/PlatformServices.cpp') client = executable( 'Minecraft.Client', client_sources + platform_sources + platform_services_src + localisation[1], - include_directories: include_directories('Header Files', '..'), + include_directories: include_directories('include', '..'), dependencies: client_dependencies, cpp_args: global_cpp_args + global_cpp_defs + [ '-DUNICODE', '-D_UNICODE', - # '-include', meson.current_source_dir() / 'Header Files/stdafx.h', ], c_args: global_cpp_defs + ['-DUNICODE', '-D_UNICODE'], install: true, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp index 5cb397720..807969395 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Camera.cpp @@ -15,7 +15,7 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "java/FloatBuffer.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" float Camera::xPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp index 84eeeb23d..07c347e18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/ClientConstants.cpp @@ -1,6 +1,6 @@ #include "ClientConstants.h" #include "Minecraft.Client/net/minecraft/client/ClientConstants.h" -#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" const std::wstring ClientConstants::VERSION_STRING = std::wstring(L"Minecraft Xbox ") + VER_FILEVERSION_STR_W + diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp index 9971092f0..61273c2bd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Lighting.cpp @@ -4,7 +4,7 @@ #include "java/FloatBuffer.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" FloatBuffer* Lighting::lb = new FloatBuffer(16); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index 2e6220dc7..080c95a67 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "Minecraft.h" #include "Minecraft.Client/net/minecraft/server/level/GameMode.h" @@ -60,7 +60,7 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/net.minecraft.world.level.chunk.h" #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" -#include "Minecraft.World/Header Files/Minecraft.World.h" +#include "Minecraft.World/include/Minecraft.World.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.h" #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" @@ -71,23 +71,23 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/UIFontData.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/src/UI/UIFontData.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" #include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h" #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h" +#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRules.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/ConsoleGameMode.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Common/Potion_Macros.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "4J_Input.h" // #define DISABLE_SPU_CODE diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp index 773ac4c89..3899be8a6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp @@ -10,11 +10,11 @@ #include "java/InputOutputStream/FileOutputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/locale/I18n.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" // 4J - the Option sub-class used to be an java enumerated type, trying to // emulate that functionality here diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp index 2ba2e7934..d30086dba 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp @@ -7,7 +7,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" const std::wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp index 524b1a72c..723b79a6e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp @@ -13,20 +13,20 @@ #include "MessageScreen.h" #include "4J_Storage.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.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.World/net/minecraft/locale/Language.h" #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h" #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" CreateWorldScreen::CreateWorldScreen(Screen* lastScreen) { done = false; // 4J added diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp index c963b4703..76fc320d4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/EditBox.cpp @@ -1,7 +1,7 @@ #include "EditBox.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" EditBox::EditBox(Screen* screen, Font* font, int x, int y, int width, int height, const std::wstring& value) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp index a61452a81..6c3b62cb0 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp @@ -11,7 +11,7 @@ #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" Font::Font(Options* options, const std::wstring& name, Textures* textures, diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp index e7a3aab05..a338c671d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "Gui.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp index a7310ef48..7bdd1f93c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/GuiComponent.cpp @@ -7,7 +7,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" void GuiComponent::hLine(int x0, int x1, int y, int col) { if (x1 < x0) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp index 6296f19f7..15b136d24 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp @@ -9,7 +9,7 @@ #include "Minecraft.World/net/minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/ChatScreen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" void InBedChatScreen::init() { Keyboard::enableRepeatEvents(true); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp index 3d0ebcd45..706012eb9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp @@ -8,7 +8,7 @@ #include "Minecraft.World/net/minecraft/locale/Language.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" JoinMultiplayerScreen::JoinMultiplayerScreen(Screen* lastScreen) { ipEdit = nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp index 2b3a9f6e9..7aa41368b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Minimap.cpp @@ -9,9 +9,9 @@ #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "Minecraft.World/net/minecraft/world/level/material/MaterialColor.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp index cd3b792dd..48c1b7e59 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp @@ -5,7 +5,7 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" const std::wstring NameEntryScreen::allowedChars = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 " diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp index 80f933e66..517c3b502 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/PauseScreen.cpp @@ -13,7 +13,7 @@ #include "4J_Profile.h" #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/locale/I18n.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp index 196bee6c3..69e6b1ae6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp @@ -8,7 +8,7 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" RenameWorldScreen::RenameWorldScreen(Screen* lastScreen, const std::wstring& levelId) { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp index f173d0f4e..4326fe21e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Screen.cpp @@ -1,16 +1,16 @@ #include "Screen.h" #include "Button.h" #include "Minecraft.Client/net/minecraft/client/gui/particle/GuiParticles.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "4J_Profile.h" #include "4J_Input.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.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/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" Screen::Screen() // 4J added { diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp index 25e3e08fd..b5d515bed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/AchievementScreen.cpp @@ -13,7 +13,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Button.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" AchievementScreen::AchievementScreen(StatsCounter* statsCounter) { // 4J - added initialisers diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp index 77a827912..b1a9cd718 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp @@ -3,9 +3,9 @@ #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "Minecraft.Client/net/minecraft/client/gui/Button.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.World/net/minecraft/locale/I18n.h" #include "Minecraft.World/net/minecraft/locale/Language.h" #include "Minecraft.World/net/minecraft/stats/ItemStat.h" @@ -14,7 +14,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "Minecraft.Client/net/minecraft/client/gui/ScrolledSelectionList.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp index 8fed6b02b..3d5d21b89 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.cpp @@ -15,7 +15,7 @@ #include "Minecraft.Client/net/minecraft/client/gui/Font.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" ItemRenderer* AbstractContainerScreen::itemRenderer = new ItemRenderer(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp index 6db90e58d..16f2b86cd 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp @@ -10,7 +10,7 @@ #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "Minecraft.World/net/minecraft/world/inventory/InventoryMenu.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" @@ -20,7 +20,7 @@ #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" // Static member initialization int CreativeInventoryScreen::selectedTabIndex = diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h index 368f6d9dc..142b6c6c2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/CreativeInventoryScreen.h @@ -4,7 +4,7 @@ #include "AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/AbstractContainerMenu.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/IUIScene_CreativeMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" class Player; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp index 5d983f1ee..6bafa5df1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/inventory/TextEditScreen.cpp @@ -12,7 +12,7 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Screen.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" const std::wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp index ba8dc4f33..e167abb63 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/particle/GuiParticle.cpp @@ -1,6 +1,6 @@ #include "GuiParticle.h" #include "java/Random.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" Random* GuiParticle::random = new Random(); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h index 37f1164a6..d2c5c2197 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/HumanoidModel.h @@ -1,6 +1,6 @@ #pragma once #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp index 2ada35cc0..1718cd5dc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "DragonModel.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h index 1904f4556..b5f3d8875 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Model.h @@ -6,8 +6,8 @@ #include #include "java/Random.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" class Mob; class ModelPart; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h index a0a72e698..0d9e55c54 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h @@ -5,8 +5,8 @@ #include "Minecraft.Client/net/minecraft/client/model/Vertex.h" #include "Minecraft.Client/net/minecraft/client/model/Polygon.h" #include "Model.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" class Cube; class Model; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index 45d996f5a..477a3bbcb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "ClientConnection.h" #include @@ -38,23 +38,23 @@ #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/Pos.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" #include "Minecraft.Client/net/minecraft/client/Options.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/client/ClientConstants.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h" -#include "Minecraft.Client/Common/Source Files/UI/UI.h" +#include "Minecraft.Client/Common/src/UI/UI.h" #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h" #include "Minecraft.Client/net/minecraft/client/gui/Gui.h" -#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/ConsoleGameMode.h" +#include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h" +#include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp index 9fcc914f8..99b100386 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp @@ -8,7 +8,7 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/LevelType.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp index 6688f1684..86ec8a69d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.cpp @@ -6,7 +6,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "ClientConnection.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" #include "Minecraft.World/net/minecraft/network/packet/ContainerButtonClickPacket.h" #include "Minecraft.World/net/minecraft/network/packet/ContainerClickPacket.h" #include "Minecraft.World/net/minecraft/network/packet/CraftItemPacket.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp index 6d49ad8a4..5d0991470 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp @@ -18,11 +18,11 @@ #include "4J.Common/4J_Compat.h" #include "4J_Profile.h" #include "4J_Input.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.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 "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" #include "Minecraft.World/net/minecraft/world/level/ChunkPos.h" @@ -33,9 +33,9 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h" #include "Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp index e99969a99..3c77c2094 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.cpp @@ -5,9 +5,9 @@ #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.Client/net/minecraft/client/player/Input.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.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 "Minecraft.World/net/minecraft/network/packet/AnimatePacket.h" #include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h index 88532bb6f..b10dd2e14 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/CritParticle.h @@ -3,7 +3,7 @@ #include #include "Particle.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp index 4e249c7c3..00c332e4f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DragonBreathParticle.cpp @@ -1,7 +1,7 @@ #include "java/JavaMath.h" #include "DragonBreathParticle.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" #include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp index 5b1954d7a..b1488f3ae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/DripParticle.cpp @@ -2,8 +2,8 @@ #include "Minecraft.World/net/minecraft/util/Mth.h" #include "DripParticle.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp index 7dff4eea5..19c595057 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnchantmentTableParticle.cpp @@ -1,7 +1,7 @@ #include "java/JavaMath.h" #include "EnchantmentTableParticle.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp index 03e8d64fe..0a073083a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/EnderParticle.cpp @@ -2,7 +2,7 @@ #include "java/JavaMath.h" #include "java/Random.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp index 0e77cb60c..ac832badc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ExplodeParticle.cpp @@ -2,7 +2,7 @@ #include "java/JavaMath.h" #include "java/Random.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp index 89dcbce5c..951b508e4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/FireworksParticles.cpp @@ -6,7 +6,7 @@ #include "FireworksParticles.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" #include "Minecraft.World/net/minecraft/world/item/FireworksItem.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp index 9f057a2a1..cc7ff086c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionParticle.cpp @@ -8,7 +8,7 @@ #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" #include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp index 5cc73ddbe..94508ccc6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/HugeExplosionSeedParticle.cpp @@ -1,6 +1,6 @@ #include "HugeExplosionSeedParticle.h" #include "java/Random.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp index a4bef5bdc..a926ad91c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/LavaParticle.cpp @@ -1,7 +1,7 @@ #include "LavaParticle.h" #include "java/JavaMath.h" #include "java/Random.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp index f9bf0c2f8..3544dfefc 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/NetherPortalParticle.cpp @@ -3,7 +3,7 @@ #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" class Level; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp index f8e60c08f..f27ac05c8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/NoteParticle.cpp @@ -2,7 +2,7 @@ #include "NoteParticle.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h index 594da9370..53c2dc820 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/Particle.h @@ -4,7 +4,7 @@ #include #include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "ParticleEngine.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp index 7ef857059..a1925e4d8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SmokeParticle.cpp @@ -1,7 +1,7 @@ #include "java/JavaMath.h" #include "SmokeParticle.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/particle/Particle.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp index a8ffc31b6..c88912f81 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/SuspendedParticle.cpp @@ -3,7 +3,7 @@ #include "java/JavaMath.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp index 76cfc260e..8762d7af2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/player/LocalPlayer.cpp @@ -32,16 +32,16 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Common/App_structs.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.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 "Minecraft.World/Header Files/ParticleTypes.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/stats/Achievement.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp index f6f09fc59..c41aa5ae3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp @@ -10,7 +10,7 @@ #include "TileRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" #include "LevelRenderer.h" -#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" @@ -20,9 +20,9 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" #include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp index cf138e074..523ddf65a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp @@ -32,22 +32,22 @@ #include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" #include "Minecraft.Client/net/minecraft/client/Camera.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "BossMobGuiInfo.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" -#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Common/4J_Compat.h" #include "4J_Input.h" #include "4J_Profile.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.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.World/net/minecraft/SharedConstants.h" @@ -69,9 +69,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/world/phys/HitResult.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" @@ -83,7 +83,7 @@ #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h" #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" bool GameRenderer::anaglyph3d = false; int GameRenderer::anaglyphPass = 0; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp index 41b64df8e..b54a67f18 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp @@ -17,7 +17,7 @@ #include "Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/util/Mth.h" @@ -33,9 +33,9 @@ #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/System.h" #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp index 1b59c0a35..1879eb4d8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp @@ -17,7 +17,7 @@ #include "Chunk.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h" #include "Minecraft.Client/net/minecraft/client/renderer/tileentity/TileEntityRenderDispatcher.h" -#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" #include "GameRenderer.h" #include "Minecraft.Client/net/minecraft/client/particle/BubbleParticle.h" #include "Minecraft.Client/net/minecraft/client/particle/SmokeParticle.h" @@ -46,22 +46,22 @@ #include "Minecraft.Client/net/minecraft/client/particle/FireworksParticles.h" #include "Minecraft.Client/net/minecraft/client/Lighting.h" #include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/JavaMath.h" #include "java/System.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h" -#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "Minecraft.Client/include/FrameProfiler.h" #include "4J.Common/4J_Compat.h" #include "4J_Profile.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.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.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/util/Mth.h" @@ -102,7 +102,7 @@ #include "Minecraft.Client/net/minecraft/client/renderer/culling/Frustum.h" #include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h" #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" #include "4J_Input.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h index 52e9aa780..b8de5367f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h @@ -5,11 +5,11 @@ #include "java/JavaIntHash.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class ClipChunk; class HitResult; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp index cca3fc60a..e0cc2d563 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MemTexture.cpp @@ -1,8 +1,8 @@ #include #include -#include "Minecraft.Client/Header Files/MemTexture.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/MemTexture.h" +#include "Minecraft.Client/include/BufferedImage.h" class MemTextureProcessor; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp index 2bc541b36..d49f919b6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp @@ -1,6 +1,6 @@ -#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/include/BufferedImage.h" +#include "Minecraft.Client/include/stubs.h" BufferedImage* MobSkinMemTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp index 96db97b86..edef37c64 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/MobSkinTextureProcessor.cpp @@ -1,6 +1,6 @@ #include "MobSkinTextureProcessor.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/BufferedImage.h" +#include "Minecraft.Client/include/stubs.h" BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) { if (in == nullptr) return nullptr; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp index 7145c258b..ab877a7ed 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Tesselator.cpp @@ -6,7 +6,7 @@ #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" bool Tesselator::TRIANGLE_MODE = false; bool Tesselator::USE_VBO = false; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp index 9ec87a27b..1f3579d50 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp @@ -8,12 +8,12 @@ #include "Textures.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "HttpTexture.h" -#include "Minecraft.Client/Header Files/MemTexture.h" +#include "Minecraft.Client/include/MemTexture.h" #include "java/ByteBuffer.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/net/minecraft/client/Options.h" -#include "Minecraft.Client/Header Files/MemTextureProcessor.h" -#include "Minecraft.Client/Header Files/MobSkinMemTextureProcessor.h" +#include "Minecraft.Client/include/MemTextureProcessor.h" +#include "Minecraft.Client/include/MobSkinMemTextureProcessor.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" @@ -21,7 +21,7 @@ #include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/Icon.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp index 4a246714e..a51113e62 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp @@ -10,12 +10,12 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Textures.h" #include "Tesselator.h" -#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "Minecraft.Client/include/FrameProfiler.h" #include "EntityTileRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.World/net/minecraft/Direction.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" @@ -63,9 +63,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" bool TileRenderer::fancy = true; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp index 3e25f03b8..3d883f3f3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp @@ -20,9 +20,9 @@ #include "Minecraft.World/net/minecraft/world/item/Item.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/Random.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/gui/Font.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp index d801265db..3583efee9 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/MobRenderer.cpp @@ -8,7 +8,7 @@ #include "EntityRenderDispatcher.h" #include "4J.Render/4J_Render.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" #include "Minecraft.World/net/minecraft/world/entity/Mob.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h index 7f81f7825..44677c2b7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h @@ -4,9 +4,9 @@ #include "MobRenderer.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h" class HumanoidModel; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp index af792bf8d..d8ec7c38f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp @@ -13,7 +13,7 @@ #include "SimpleIcon.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h" #include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/world/Icon.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp index d4a0620b9..217c187f3 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/Texture.cpp @@ -7,7 +7,7 @@ #include "TextureManager.h" #include "Texture.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Buffer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp index 8d1315a13..2745d5233 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureManager.cpp @@ -8,7 +8,7 @@ #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "TextureManager.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/File.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp index 86af3ab7d..5f4e4692d 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureMap.cpp @@ -14,7 +14,7 @@ #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h" #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h" #include "TextureMap.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/world/Icon.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp index 14c48eb3d..104a023bb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "SignRenderer.h" @@ -12,7 +12,7 @@ #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp index 6f51ca3a7..7e1c1a8a5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp @@ -5,8 +5,8 @@ #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "AbstractTexturePack.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/include/BufferedImage.h" +#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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp index b2bce514a..04701c43a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp @@ -3,28 +3,28 @@ #include #include -#include "Minecraft.Client/Common/Source Files/DLC/DLCGameRulesHeader.h" +#include "Minecraft.Client/Common/src/DLC/DLCGameRulesHeader.h" #include "DLCTexturePack.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCColourTableFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCUIDataFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCTextureFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCLocalisationFile.h" -#include "Minecraft.World/Header Files/PortableFileIO.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCColourTableFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCUIDataFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCTextureFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h" +#include "Minecraft.World/include/PortableFileIO.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/DLC/DLCAudioFile.h" #include "4J_Profile.h" #include "4J_Storage.h" #include "4J_Input.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h" +#include "Minecraft.Client/Common/src/Audio/SoundEngine.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.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/Common/src/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.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" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h index 6c3209b12..af9b6321a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h @@ -5,7 +5,7 @@ #include "AbstractTexturePack.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h" +#include "Minecraft.Client/Common/src/Localisation/StringTable.h" class DLCPack; class StringTable; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h index c43d3cb3d..f259f171e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "AbstractTexturePack.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp index 5fe347aeb..0820d69e4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "TexturePackRepository.h" #include "DefaultTexturePack.h" @@ -10,8 +10,8 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/net/minecraft/client/gui/Minimap.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/DLC/DLCManager.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" #include "4J_Input.h" #include "strings.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp index dcfd825f0..978cdf18f 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp @@ -10,7 +10,7 @@ #include "java/Random.h" #include "TitleScreen.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/locale/Language.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index c851a9a4b..52571c485 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include #include @@ -33,7 +33,7 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h" #endif #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" @@ -42,17 +42,17 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h" #include "Minecraft.Client/Common/ShutdownManager.h" -#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h" +#include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h" #include "Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h" #include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h" #include "4J_Input.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #define DEBUG_SERVER_DONT_SPAWN_MOBS 0 diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp index e041fefab..eee8ec5cb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "PlayerList.h" #include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" @@ -29,8 +29,8 @@ #include "java/JavaMath.h" #include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" -#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/LevelRuleset.h" +#include "Minecraft.Client/Common/src/Tutorial/Tutorial.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" // 4J - this class is fairly substantially altered as there didn't seem any diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp index 33a3b58df..1eaa5e293 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.cpp @@ -13,8 +13,8 @@ #include "ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.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 "Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.h" #include "Minecraft.World/net/minecraft/network/packet/ChunkTilesUpdatePacket.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp index 18e7d2b5c..63cf942a2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp @@ -7,7 +7,7 @@ #include "ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/util/ProgressListener.h" -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.Client/Linux/Linux_App.h" @@ -17,9 +17,9 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h" #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage, ChunkSource* source) { diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp index 120828209..6b55dafea 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp @@ -2,7 +2,7 @@ #include #include -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.Client/include/stdafx.h" #include "ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" @@ -43,13 +43,13 @@ #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "PlayerChunkMap.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/DLC/DLCPack.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "4J_Input.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" std::vector ServerLevel::RANDOM_BONUS_ITEMS; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h index fadf66c5f..6ef89f1c5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevelListener.h @@ -2,7 +2,7 @@ #include #include "Minecraft.World/net/minecraft/world/level/LevelListener.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" class Player; class TileEntity; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp index 346722b27..1b1ed4037 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp @@ -10,7 +10,7 @@ #include "Minecraft.Client/net/minecraft/server/Settings.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" #include "Minecraft.World/net/minecraft/world/damageSource/net.minecraft.world.damagesource.h" @@ -30,7 +30,7 @@ #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/locale/net.minecraft.locale.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "4J_Input.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp index d7c40c182..a2b75a538 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayerGameMode.cpp @@ -6,7 +6,7 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelRules/Rules/GameRulesInstance.h" +#include "Minecraft.Client/Common/src/GameRules/LevelRules/Rules/GameRulesInstance.h" #include "Minecraft.World/net/minecraft/network/packet/TileUpdatePacket.h" #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp index dd73694d7..ff1b8ac76 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp @@ -13,7 +13,7 @@ #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "EntityTracker.h" #include "4J.Common/4J_Compat.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/network/packet/AddEntityPacket.h" @@ -53,9 +53,9 @@ #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" #include "Minecraft.World/net/minecraft/world/item/MapItem.h" #include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/Class.h" class AttributeInstance; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp index da57bc57e..2de3f68ef 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp @@ -12,16 +12,16 @@ #include "4J.Common/4J_Compat.h" #include "4J_Storage.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" -#include "Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/network/Connection.h" #include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h" #include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "java/Random.h" class Packet; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp index 7ec7e7d8d..22f12dc39 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp @@ -13,16 +13,16 @@ #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "ServerConnection.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "java/JavaMath.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.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/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/commands/CommandDispatcher.h" @@ -92,10 +92,10 @@ #include "Minecraft.World/net/minecraft/world/level/tile/entity/CommandBlockEntity.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/Header Files/SkinBox.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "java/Class.h" #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp index 1f47a265a..404f74f4b 100644 --- a/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/stats/StatsCounter.cpp @@ -11,7 +11,7 @@ #include "Minecraft.World/net/minecraft/stats/Stats.h" #include "Minecraft.World/net/minecraft/stats/Achievement.h" #include "Minecraft.World/net/minecraft/stats/Achievements.h" -#include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" +#include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h" #include "4J_Profile.h" #include "Minecraft.Client/Common/App_structs.h" #include "Minecraft.Client/Linux/Linux_App.h" diff --git a/minecraft/Minecraft.Client/Source Files/BufferedImage.cpp b/minecraft/Minecraft.Client/src/BufferedImage.cpp similarity index 97% rename from minecraft/Minecraft.Client/Source Files/BufferedImage.cpp rename to minecraft/Minecraft.Client/src/BufferedImage.cpp index c9e63a7d0..96d07b060 100644 --- a/minecraft/Minecraft.Client/Source Files/BufferedImage.cpp +++ b/minecraft/Minecraft.Client/src/BufferedImage.cpp @@ -1,10 +1,10 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/ConsoleHelpers/PathHelper.h" -#include "Minecraft.Client/Header Files/BufferedImage.h" +#include "Minecraft.Client/include/BufferedImage.h" #include "4J.Render/4J_Render.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.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" diff --git a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp b/minecraft/Minecraft.Client/src/Extrax64Stubs.cpp similarity index 95% rename from minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp rename to minecraft/Minecraft.Client/src/Extrax64Stubs.cpp index 87534ee2d..a041df389 100644 --- a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp +++ b/minecraft/Minecraft.Client/src/Extrax64Stubs.cpp @@ -9,8 +9,8 @@ #include "4J.Common/4J_Compat.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" class INVITE_INFO; #if defined(_WINDOWS64) @@ -39,15 +39,6 @@ int32_t XPartyGetUserList(void* pUserList) { return 0; } bool IsEqualXUID(PlayerUID a, PlayerUID b) { return false; } -D3DXVECTOR3::D3DXVECTOR3() {} -D3DXVECTOR3::D3DXVECTOR3(float x, float y, float z) : x(x), y(y), z(z) {} -D3DXVECTOR3& D3DXVECTOR3::operator+=(const D3DXVECTOR3& add) { - x += add.x; - y += add.y; - z += add.z; - return *this; -} - uint8_t IQNetPlayer::GetSmallId() { return 0; } void IQNetPlayer::SendData(IQNetPlayer* player, const void* pvData, uint32_t dwDataSize, uint32_t dwFlags) { diff --git a/minecraft/Minecraft.Client/Source Files/FrameProfiler.cpp b/minecraft/Minecraft.Client/src/FrameProfiler.cpp similarity index 100% rename from minecraft/Minecraft.Client/Source Files/FrameProfiler.cpp rename to minecraft/Minecraft.Client/src/FrameProfiler.cpp diff --git a/minecraft/Minecraft.Client/Source Files/stubs.cpp b/minecraft/Minecraft.Client/src/stubs.cpp similarity index 96% rename from minecraft/Minecraft.Client/Source Files/stubs.cpp rename to minecraft/Minecraft.Client/src/stubs.cpp index 34b9616ad..581649817 100644 --- a/minecraft/Minecraft.Client/Source Files/stubs.cpp +++ b/minecraft/Minecraft.Client/src/stubs.cpp @@ -1,6 +1,6 @@ #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.Client/Header Files/stubs.h" +#include "Minecraft.Client/include/stubs.h" #if defined(__linux__) void LinuxLogStubLightmapProbe() { diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp index 9bdf000d8..ae867a9ac 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp @@ -3,7 +3,7 @@ #include "ConsoleSaveFileIO.h" #include "ConsoleSaveFileConverter.h" #include "Minecraft.World/net/minecraft/util/ProgressListener.h" -#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.h" +#include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h" void ConsoleSaveFileConverter::ProcessSimpleFile(ConsoleSaveFile* sourceSave, FileEntry* sourceFileEntry, diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp index 3117182e8..35b267c0f 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp @@ -9,20 +9,20 @@ #include #include -#include "Minecraft.World/Header Files/PortableFileIO.h" +#include "Minecraft.World/include/PortableFileIO.h" #include "ConsoleSaveFileOriginal.h" #include "java/File.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "4J.Common/4J_Compat.h" #include "platform/IPlatformStorage.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "compression.h" @@ -30,9 +30,9 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "platform/PlatformServices.h" #define RESERVE_ALLOCATION MEM_RESERVE diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp index ec175361b..874680494 100644 --- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp +++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp @@ -9,7 +9,7 @@ #include #include -#include "Minecraft.World/Header Files/PortableFileIO.h" +#include "Minecraft.World/include/PortableFileIO.h" #include "ConsoleSaveFileSplit.h" #include "ConsoleSaveFileConverter.h" #include "java/File.h" @@ -17,14 +17,14 @@ #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "4J.Common/4J_Compat.h" #include "platform/IPlatformStorage.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "compression.h" @@ -35,9 +35,9 @@ #include "java/System.h" #include "java/File.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "platform/PlatformServices.h" class ProgressListener; diff --git a/minecraft/Minecraft.World/Header Files/LevelObjectInputStream.h b/minecraft/Minecraft.World/include/LevelObjectInputStream.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/LevelObjectInputStream.h rename to minecraft/Minecraft.World/include/LevelObjectInputStream.h diff --git a/minecraft/Minecraft.World/Header Files/Minecraft.World.h b/minecraft/Minecraft.World/include/Minecraft.World.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/Minecraft.World.h rename to minecraft/Minecraft.World/include/Minecraft.World.h diff --git a/minecraft/Minecraft.World/Header Files/ParticleTypes.h b/minecraft/Minecraft.World/include/ParticleTypes.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/ParticleTypes.h rename to minecraft/Minecraft.World/include/ParticleTypes.h diff --git a/minecraft/Minecraft.World/Header Files/PortableFileIO.h b/minecraft/Minecraft.World/include/PortableFileIO.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/PortableFileIO.h rename to minecraft/Minecraft.World/include/PortableFileIO.h diff --git a/minecraft/Minecraft.World/Header Files/SoundTypes.h b/minecraft/Minecraft.World/include/SoundTypes.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/SoundTypes.h rename to minecraft/Minecraft.World/include/SoundTypes.h diff --git a/minecraft/Minecraft.World/Header Files/compression.h b/minecraft/Minecraft.World/include/compression.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/compression.h rename to minecraft/Minecraft.World/include/compression.h diff --git a/minecraft/Minecraft.World/Header Files/libdivide.h b/minecraft/Minecraft.World/include/libdivide.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/libdivide.h rename to minecraft/Minecraft.World/include/libdivide.h diff --git a/minecraft/Minecraft.World/Header Files/stdafx.h b/minecraft/Minecraft.World/include/stdafx.h similarity index 100% rename from minecraft/Minecraft.World/Header Files/stdafx.h rename to minecraft/Minecraft.World/include/stdafx.h diff --git a/minecraft/Minecraft.World/meson.build b/minecraft/Minecraft.World/meson.build index 4cee77f0e..5ab32a997 100644 --- a/minecraft/Minecraft.World/meson.build +++ b/minecraft/Minecraft.World/meson.build @@ -39,7 +39,7 @@ lib_world = static_library('Minecraft.World', platform_dep, simdutf_dep, ], - include_directories : include_directories('Header Files', '..'), + include_directories : include_directories('include', '..'), cpp_args : global_cpp_args + global_cpp_defs, ) diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp index be62853ee..780a797cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp @@ -2,12 +2,12 @@ #include #include -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "Connection.h" #include "Minecraft.Client/Common/ShutdownManager.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" @@ -17,9 +17,9 @@ #include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h" #include "Minecraft.World/net/minecraft/network/packet/Packet.h" #include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class SocketAddress; diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.h b/minecraft/Minecraft.World/net/minecraft/network/Connection.h index 7a41f6dba..0888cfa79 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/Connection.h +++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.h @@ -11,7 +11,7 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" -#include "Minecraft.Client/Common/Source Files/Network/Socket.h" +#include "Minecraft.Client/Common/src/Network/Socket.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp index 3cd2dcd69..54d39f7d9 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddMobPacket.cpp @@ -7,7 +7,7 @@ #include "Minecraft.World/net/minecraft/world/entity/EntityIO.h" #include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h" #include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" AddMobPacket::AddMobPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp index 238c88a7b..00a8b0eac 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp @@ -8,9 +8,9 @@ #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" AddPlayerPacket::AddPlayerPacket() { id = -1; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp index 1d2b6d529..dd4c27467 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp @@ -6,9 +6,9 @@ #include "java/InputOutputStream/DataOutputStream.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" LoginPacket::LoginPacket() { this->userName = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp index b34df74c3..b3da9f2ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PlayerInfoPacket.cpp @@ -1,6 +1,6 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" -#include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h" +#include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "Minecraft.World/net/minecraft/network/packet/PacketListener.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp index 8e289b14a..c320c42bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/PreLoginPacket.cpp @@ -3,12 +3,12 @@ #include "PacketListener.h" #include "PreLoginPacket.h" -#include "Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h" +#include "Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h" +#include "Minecraft.Client/Common/src/BuildVer/BuildVer.h" PreLoginPacket::PreLoginPacket() { loginKey = L""; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp index 7c54a094a..58c049c30 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.cpp @@ -4,7 +4,7 @@ #include "PacketListener.h" #include "TextureAndGeometryPacket.h" #include "Minecraft.Client/Common/Minecraft_Macros.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h" +#include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h index 09b101993..0690f4b05 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/TextureAndGeometryPacket.h @@ -6,7 +6,7 @@ #include "Packet.h" #include "Minecraft.Client/net/minecraft/client/model/geom/Model.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/SkinBox.h" #include "Minecraft.World/net/minecraft/network/packet/Packet.h" class DLCSkinFile; diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h index df80d5ea5..41ac1ff71 100644 --- a/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h +++ b/minecraft/Minecraft.World/net/minecraft/network/packet/UpdateGameRuleProgressPacket.h @@ -6,7 +6,7 @@ #include #include "Packet.h" -#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRulesConstants.h" +#include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h" #include "Minecraft.World/net/minecraft/network/packet/Packet.h" class UpdateGameRuleProgressPacket diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp index 05ae5e8bd..ad8ac9c46 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp +++ b/minecraft/Minecraft.World/net/minecraft/stats/Achievements.cpp @@ -4,7 +4,7 @@ #include "Achievement.h" #include "Achievements.h" -#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "Minecraft.Client/Common/src/Console_Awards_enum.h" #include "Minecraft.World/net/minecraft/world/item/BowItem.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" #include "Minecraft.World/net/minecraft/world/item/PotionItem.h" diff --git a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h b/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h index dbcb73d16..c47e5849f 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/CommonStats.h @@ -5,7 +5,7 @@ #include #include "GenericStats.h" -#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "Minecraft.Client/Common/src/Console_Awards_enum.h" #include "java/Class.h" class CommonStats : public GenericStats { diff --git a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h b/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h index 1c10f9baf..961f11862 100644 --- a/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h +++ b/minecraft/Minecraft.World/net/minecraft/stats/GenericStats.h @@ -7,7 +7,7 @@ #include "Stat.h" #include "Stats.h" -#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +#include "Minecraft.Client/Common/src/Console_Awards_enum.h" #include "java/Class.h" class DamageSource; @@ -18,7 +18,7 @@ class Stat; // #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" -// #include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h" +// #include "Minecraft.Client/Common/src/Console_Awards_enum.h" /** 4J-JEV: diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp index 4c9265e5e..fae7b2189 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp @@ -12,7 +12,7 @@ #include "SyncedEntityData.h" #include "EntityIO.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "EntityPos.h" #include "Entity.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" @@ -46,9 +46,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" thread_local bool Entity::m_tlsUseSmallIds = false; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.h b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.h index 7e3faeb0c..aa1ebd541 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/EntityIO.h @@ -2,7 +2,7 @@ #include "Entity.h" #include "java/JavaIntHash.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" class Level; class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp index a9b2efec8..f1bc91b7e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/LivingEntity.cpp @@ -15,7 +15,7 @@ #include "LivingEntity.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "SoundTypes.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp index a9d36bd08..a536e1d50 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp @@ -9,7 +9,7 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "net/minecraft/world/entity/item/ItemEntity.h" #include "net/minecraft/world/entity/Mob.h" #include "ConsoleHelpers/StringHelpers.h" @@ -50,9 +50,9 @@ #include "net/minecraft/world/level/Level.h" #include "net/minecraft/world/level/tile/Tile.h" #include "net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" const float Mob::MAX_WEARING_ARMOR_CHANCE = 0.15f; const float Mob::MAX_PICKUP_LOOT_CHANCE = 0.55f; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp index 2dfc000da..aa5288ddb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/TamableAnimal.cpp @@ -1,5 +1,5 @@ #include "SyncedEntityData.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "TamableAnimal.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp index 490254cc7..ad66336ec 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/ai/goal/BreedGoal.cpp @@ -5,7 +5,7 @@ #include "BreedGoal.h" #include "Minecraft.World/net/minecraft/world/entity/ExperienceOrb.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp index f52c0e7d1..05983f1cd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp @@ -7,7 +7,7 @@ #include "EntityHorse.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp index f1a5b6834..5d846fe87 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/MushroomCow.cpp @@ -1,7 +1,7 @@ #include #include "MushroomCow.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/entity/PathfinderMob.h" #include "Minecraft.World/net/minecraft/world/entity/animal/Cow.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp index 126293313..ce6ac339f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/VillagerGolem.cpp @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/entity/SyncedEntityData.h" #include "VillagerGolem.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp index ff831ab94..11ebd9cb6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp @@ -5,7 +5,7 @@ #include "Sheep.h" #include "Wolf.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp index ccf03d75a..8cf82bb01 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h index 510314c05..46dad7479 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/world/entity/boss/BossMob.h" #include "Minecraft.World/net/minecraft/world/entity/boss/MultiEntityMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp index a1f800516..3f2c57fe1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.cpp @@ -13,7 +13,7 @@ #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "WitherBoss.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h index 102c2fd4a..b113b8a0e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h @@ -1,6 +1,6 @@ #pragma once -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/world/entity/monster/Monster.h" #include "Minecraft.World/net/minecraft/world/entity/monster/RangedAttackMob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp index 35ccd511c..5d0264be3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/Boat.cpp @@ -5,7 +5,7 @@ #include #include "Boat.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp index ce2422b6c..042016493 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartContainer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "net.minecraft.world.entity.item.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp index 75c9b2b57..8cee7c6c9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartFurnace.cpp @@ -3,7 +3,7 @@ #include #include "MinecartFurnace.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp index 72199cb72..04a2a8a03 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/MinecartTNT.cpp @@ -3,7 +3,7 @@ #include #include "MinecartTNT.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp index 17996d3bd..87cc6f490 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/item/PrimedTnt.cpp @@ -5,7 +5,7 @@ #include "java/JavaMath.h" #include "PrimedTnt.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp index 294994947..185534b68 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Blaze.cpp @@ -4,7 +4,7 @@ #include #include "Blaze.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp index 26165d7c9..fa5d3b7b3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/EnderMan.cpp @@ -6,7 +6,7 @@ #include "EnderMan.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h index 128208ff9..fdd92ef2d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/LavaSlime.h @@ -1,7 +1,7 @@ #pragma once #include "Slime.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" class Entity; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp index 228403db2..1b5dfc514 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.cpp @@ -4,7 +4,7 @@ #include #include "Slime.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h index dc73af226..9f9ec3a65 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Slime.h @@ -4,7 +4,7 @@ #include "Minecraft.World/net/minecraft/world/entity/Mob.h" #include "Enemy.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "Minecraft.World/net/minecraft/world/entity/Mob.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp index 822293f56..1627bbdc1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/monster/Witch.cpp @@ -3,7 +3,7 @@ #include #include "Witch.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp index 386990555..2fa948bed 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/entity/ai/attributes/net.minecraft.world.entity.ai.attributes.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h index afd21a21f..f45c57961 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/npc/Villager.h @@ -3,7 +3,7 @@ #include "Minecraft.World/net/minecraft/world/entity/AgeableMob.h" #include "Npc.h" #include "Minecraft.World/net/minecraft/world/item/trading/Merchant.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" class Level; class Village; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp index ad0c18d09..f480b4716 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp @@ -20,15 +20,15 @@ #include "java/JavaMath.h" #include "Inventory.h" #include "Player.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h" #include "net/minecraft/world/entity/player/Player.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/Source Files/DLC/DLCManager.h" -#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.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 "SoundTypes.h" #include "java/Random.h" @@ -82,9 +82,9 @@ #include "net/minecraft/world/scores/Scoreboard.h" #include "net/minecraft/world/scores/Team.h" #include "net/minecraft/world/scores/criteria/ObjectiveCriteria.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class ModelPart; class Objective; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp index 5929757ad..5b05e0b51 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Arrow.cpp @@ -10,7 +10,7 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Arrow.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h index 0ba6156fd..a4687dc96 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/DragonFireball.h @@ -3,7 +3,7 @@ #include #include "Fireball.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" class HitResult; diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp index 87cbac683..48ce24932 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/EyeOfEnderSignal.cpp @@ -4,7 +4,7 @@ #include "java/JavaMath.h" #include "EyeOfEnderSignal.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp index ab830d3e9..a5eaf33e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.cpp @@ -9,7 +9,7 @@ #include "Fireball.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "nbt/DoubleTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h index daa64c329..5fdb2d19c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Fireball.h @@ -3,7 +3,7 @@ #include #include "Minecraft.World/net/minecraft/world/entity/Entity.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp index 397d73694..3c1900175 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FireworksRocketEntity.cpp @@ -3,7 +3,7 @@ #include #include "FireworksRocketEntity.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp index b8d03bb7d..81e4d5956 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/FishingHook.cpp @@ -6,7 +6,7 @@ #include #include "FishingHook.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp index 5f1bd95db..40aaea6cc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Snowball.cpp @@ -1,5 +1,5 @@ #include "Snowball.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/entity/projectile/Throwable.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp index a54c4c63e..27409e316 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/Throwable.cpp @@ -5,7 +5,7 @@ #include #include "Throwable.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp index e2674b242..a47e1a60d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEgg.cpp @@ -1,5 +1,5 @@ #include "ThrownEgg.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp index f777bfe02..9a8e2dfc1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/entity/projectile/ThrownEnderpearl.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h" #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "ThrownEnderpearl.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/damageSource/DamageSource.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp index 0ffc32ec7..374650264 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "net.minecraft.world.inventory.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp index 69c226995..beffbffbd 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/ArmorItem.cpp @@ -4,7 +4,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "ArmorItem.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/Class.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp index 9fb7e0266..cb5fc31f4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/BucketItem.cpp @@ -8,7 +8,7 @@ #include "Minecraft.Client/net/minecraft/server/network/PlayerConnection.h" #include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Class.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp index 251ed8855..082d80440 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/EnderEyeItem.cpp @@ -3,7 +3,7 @@ #include "EnderEyeItem.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Direction.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp index 0f4d30c22..c6f4b775b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksChargeItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp index 8a0b72da3..defa28c9c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" #include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp index a2ac9e729..c6c2b2f83 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PlanterTileItem.cpp @@ -2,7 +2,7 @@ #include "PlanterTileItem.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp index 7751dfb04..0d6e20b37 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/world/item/alchemy/net.minecraft.world.item.alchemy.h" @@ -12,7 +12,7 @@ #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "PotionItem.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include "Minecraft.Client/Common/Potion_Macros.h" const std::wstring PotionItem::DEFAULT_ICON = L"potion"; diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp index f62120018..adadb8cff 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" @@ -12,7 +12,7 @@ #include "SpawnEggItem.h" #include "Minecraft.World/net/minecraft/world/Difficulty.h" #include "Minecraft.World/net/minecraft/util/Mth.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp index 27ac915ba..35d458db2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/TileItem.cpp @@ -4,7 +4,7 @@ #include "TileItem.h" #include "Minecraft.World/net/minecraft/Facing.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "Minecraft.World/net/minecraft/stats/GenericStats.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp index c60ca55bf..e8ee4f4b4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/alchemy/PotionBrewing.cpp @@ -3,7 +3,7 @@ #include "java/JavaMath.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "PotionBrewing.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" const int PotionBrewing::DEFAULT_APPEARANCES[] = { IDS_POTION_PREFIX_MUNDANE, IDS_POTION_PREFIX_UNINTERESTING, diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp index 784cbea84..8a8354ec0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/item/enchantment/Enchantment.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "net.minecraft.world.item.enchantment.h" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp index 5bc39f4e5..ff377987f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/BaseMobSpawner.cpp @@ -2,7 +2,7 @@ #include "BaseMobSpawner.h" #include "Minecraft.World/net/minecraft/world/level/BaseMobSpawner.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp index f2e163033..b28e38e8d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp @@ -5,7 +5,7 @@ #include "Explosion.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Class.h" #include "java/Random.h" @@ -18,9 +18,9 @@ #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" Explosion::Explosion(Level* level, std::shared_ptr source, double x, double y, double z, float r) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp index 79ed6997b..e554e4cd2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/FoliageColor.cpp @@ -1,7 +1,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "FoliageColor.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" // 4J Stu - Don't use this any more // std::vector FoliageColor::pixels; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp index 7f7b2ebd3..d827a1fd1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp @@ -14,11 +14,11 @@ #include "ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" -#include "Minecraft.Client/Header Files/FrameProfiler.h" +#include "Minecraft.Client/include/FrameProfiler.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.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 "ParticleTypes.h" @@ -64,9 +64,9 @@ #include "net/minecraft/world/phys/HitResult.h" #include "net/minecraft/world/phys/Vec3.h" #include "net/minecraft/world/scores/Scoreboard.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "platform/PlatformServices.h" class CompoundTag; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h index e8d13494a..d2dfd67ba 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h @@ -15,7 +15,7 @@ #include "TickNextTickData.h" #include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h" #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" #include "4J.Common/4J_Compat.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h b/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h index 9c9053f54..5b35000d1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/LevelListener.h @@ -2,7 +2,7 @@ class TileEntity; #include "Minecraft.World/net/minecraft/world/entity/player/Player.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" class LevelListener { public: diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp index be4252a25..11f023442 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/Biome.cpp @@ -6,7 +6,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/entity/MobCategory.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp index 7218e9bf8..9354bc7c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp @@ -18,9 +18,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h" #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" BiomeDecorator::BiomeDecorator(Biome* biome) { _init(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp index d625b9e6e..c8325e6dc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeSource.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" @@ -8,7 +8,7 @@ #include "BiomeSource.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "platform/PlatformServices.h" // 4J - removal of separate temperature & downfall layers brought forward diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp index 84682fd14..318097df3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp @@ -15,9 +15,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" JungleBiome::JungleBiome(int id) : Biome(id) { decorator->treeCount = 50; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp index 81c6e7af0..c768eb59c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp @@ -9,9 +9,9 @@ #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" #include "java/System.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" // Note: See header for an overview of this class diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp index a6ae8f949..de071c1e0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp @@ -13,7 +13,7 @@ #include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h" #include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" #include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h" -#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h" +#include "Minecraft.Client/Common/src/Network/GameNetworkManager.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" @@ -43,9 +43,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class DataInputStream; class DataOutputStream; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp index c7efedeb0..160f41fac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp @@ -7,9 +7,9 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" // Note: See header for an overview of this class diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp index ab7e120be..f744ab814 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp @@ -7,9 +7,9 @@ #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" // Note: See header for an overview of this class diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp index 341908ef5..a46947fe8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp @@ -14,7 +14,7 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "compression.h" #include "java/InputOutputStream/BufferedOutputStream.h" @@ -28,9 +28,9 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h" #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "platform/PlatformServices.h" class DataInput; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp index b3d484a6e..8530c8109 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp @@ -11,7 +11,7 @@ #include "OldChunkStorage.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" @@ -28,9 +28,9 @@ #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "platform/PlatformServices.h" thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage = diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp index 2cc5a0588..26446fab6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp @@ -13,9 +13,9 @@ #include "java/InputOutputStream/ByteArrayInputStream.h" #include "java/InputOutputStream/DataInputStream.h" #include "java/InputOutputStream/DataOutputStream.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" std::vector RegionFile::emptySector(SECTOR_BYTES); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h index 8cb825786..b59e543c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h @@ -3,7 +3,7 @@ #include #include -#include "Minecraft.World/Header Files/compression.h" +#include "Minecraft.World/include/compression.h" #include "java/InputOutputStream/InputOutputStream.h" #include "java/InputOutputStream/ByteArrayOutputStream.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp index 74f193c0a..346471f69 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/Dimension.cpp @@ -9,9 +9,9 @@ #include "NormalDimension.h" #include "TheEndDimension.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/LevelType.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp index 8675b839b..29ca1ae87 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/HellDimension.cpp @@ -2,9 +2,9 @@ #include "HellDimension.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/LevelType.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp index 654b3389e..ac03c6f99 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.cpp @@ -4,7 +4,7 @@ #include "TheEndDimension.h" #include "Minecraft.World/net/minecraft/world/level/biome/FixedBiomeSource.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.World/net/minecraft/Pos.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp index 528baadfb..8a2e8f7a4 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp @@ -4,7 +4,7 @@ #include #include "CustomLevelSource.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #if defined(__linux__) #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" @@ -27,9 +27,9 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" const double CustomLevelSource::SNOW_SCALE = 0.3; const double CustomLevelSource::SNOW_CUTOFF = 0.5; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp index fff659a1c..90d88d153 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp @@ -9,9 +9,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" // FlatLevelSource::villageFeature = new VillageFeature(1); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp index 0b3abcdb0..d5ca11436 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp @@ -12,9 +12,9 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" HellFlatLevelSource::HellFlatLevelSource(Level* level, int64_t seed) { int xzSize = level->getLevelData()->getXZSize(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp index 033e5d2bf..d61378c44 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp @@ -22,9 +22,9 @@ #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h" #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" HellRandomLevelSource::HellRandomLevelSource(Level* level, int64_t seed) { int xzSize = level->getLevelData()->getXZSize(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp index 1579da996..e33686213 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp @@ -1,5 +1,5 @@ #include "RandomLevelSource.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.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 "Minecraft.World/ConsoleHelpers/PlatformTime.h" @@ -24,9 +24,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" const double RandomLevelSource::SNOW_SCALE = 0.3; const double RandomLevelSource::SNOW_CUTOFF = 0.5; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp index 6ad34eb0a..fe9f6a097 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp @@ -10,9 +10,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h" #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" TheEndLevelRandomLevelSource::TheEndLevelRandomLevelSource(Level* level, int64_t seed) { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp index 1a46a243a..8c9c4d0c0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp @@ -3,7 +3,7 @@ #include #include "BasicTreeFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" @@ -11,9 +11,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" uint8_t BasicTree::axisConversionArray[] = {2, 0, 0, 1, 2, 1}; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp index ef800b933..e5dc0bd59 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BirchFeature.cpp @@ -1,7 +1,7 @@ #include #include "BirchFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp index 80b62212c..17e74257b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/CaveFeature.cpp @@ -3,7 +3,7 @@ #include #include "CaveFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp index 915344845..1641d1268 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/FlowerFeature.cpp @@ -1,5 +1,5 @@ #include "FlowerFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp index 3dee6ba83..411154411 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp @@ -4,9 +4,9 @@ #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" GroundBushFeature::GroundBushFeature(int trunkType, int leafType) { trunkTileType = trunkType; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp index 926c915cb..bf81d66e1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/LakeFeature.cpp @@ -1,5 +1,5 @@ #include "LakeFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp index 2874f32d0..af0bb339b 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp @@ -1,7 +1,7 @@ #include #include "MegaTreeFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" @@ -9,9 +9,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" MegaTreeFeature::MegaTreeFeature(bool doUpdate, int baseHeight, int trunkType, int leafType) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp index a9f3a4fbe..7855688df 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp @@ -1,15 +1,15 @@ #include #include "OreFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" void OreFeature::_init(int tile, int count, int targetTile) { this->tile = tile; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp index 1f468fc1d..126d241f0 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/PineFeature.cpp @@ -1,7 +1,7 @@ #include #include "PineFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp index 924be68c8..7bd6cc843 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/ReedsFeature.cpp @@ -1,5 +1,5 @@ #include "ReedsFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp index 80aa858cd..af8556e4d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.cpp @@ -1,5 +1,5 @@ #include "SandFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp index 15c2d12c5..dda7c5b09 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.cpp @@ -1,5 +1,5 @@ #include "SpringFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp index 311456011..8c019f5fc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SpruceFeature.cpp @@ -1,7 +1,7 @@ #include #include "SpruceFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp index 1792e4b29..f776757bc 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/SwampTreeFeature.cpp @@ -1,7 +1,7 @@ #include #include "SwampTreeFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp index e7b5d080d..eacb931c5 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp @@ -1,7 +1,7 @@ #include #include "TreeFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Direction.h" @@ -9,9 +9,9 @@ #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h" #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" TreeFeature::TreeFeature(bool doUpdate) : Feature(doUpdate), diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp index 763bdc3bd..f8d7945ac 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/MineShaftFeature.cpp @@ -6,7 +6,7 @@ #include #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp index 87bd2df2f..d06140c05 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/NetherBridgeFeature.cpp @@ -3,7 +3,7 @@ #include "NetherBridgeFeature.h" #include "NetherBridgePieces.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp index 5e6352fc3..3f3d378c2 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/RandomScatteredLargeFeature.cpp @@ -3,7 +3,7 @@ #include "ScatteredFeaturePieces.h" #include "RandomScatteredLargeFeature.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Class.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp index 0fcca8220..cd7e9b1b6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/ScatteredFeaturePieces.cpp @@ -5,7 +5,7 @@ #include "Minecraft.World/net/minecraft/util/WeighedTreasure.h" #include "ScatteredFeaturePieces.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp index da190638f..88dee681e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdFeature.cpp @@ -9,7 +9,7 @@ #include "StrongholdPieces.h" #include "java/JavaMath.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.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 "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp index 5e809a7b2..921476f3a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.cpp @@ -5,7 +5,7 @@ #include "VillageFeature.h" #include "VillagePieces.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.h" +#include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "java/Random.h" #include "nbt/CompoundTag.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp index 3e25534f3..a07d28e1d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.cpp @@ -3,7 +3,7 @@ #include #include "BiomeOverrideLayer.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" +#include "Minecraft.Client/Common/src/Console_Debug_enum.h" #include "Minecraft.Client/Linux/Linux_App.h" #include "Minecraft.World/net/minecraft/world/level/LevelType.h" #include "Minecraft.World/net/minecraft/world/level/newbiome/layer/AddIslandLayer.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp index 136e5eac2..a6c65701e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp @@ -18,8 +18,8 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" -#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h" -#include "Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.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 "java/InputOutputStream/ByteArrayInputStream.h" @@ -37,9 +37,9 @@ #include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h" #include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h" #include "Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #include "platform/PlatformServices.h" const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/"); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp index 3ba8096c5..fad8f9da3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BrewingStandTile.cpp @@ -3,7 +3,7 @@ #include "BrewingStandTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/world/Container.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp index e4f4b55f2..3fcbf71bb 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EggTile.cpp @@ -1,7 +1,7 @@ #include #include "EggTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/entity/item/FallingTile.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp index 44a11ff86..9b418b9ad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnchantmentTableTile.cpp @@ -2,7 +2,7 @@ #include "EnchantmentTableTile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp index f7cc64091..86b5fdc2a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/EnderChestTile.cpp @@ -2,7 +2,7 @@ #include #include "EnderChestTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp index ec82a3f61..50eb88776 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.cpp @@ -6,7 +6,7 @@ #include "Minecraft.Client/net/minecraft/server/PlayerList.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp index 44918fafc..046e8aab3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FurnaceTile.cpp @@ -5,7 +5,7 @@ #include "FurnaceTile.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "FurnaceTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "nbt/CompoundTag.h" #include "Minecraft.World/net/minecraft/util/Mth.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp index bb968015f..481b2774c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/GrassTile.cpp @@ -3,7 +3,7 @@ #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "GrassTile.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp index e4dad50ed..ba76a6dd7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LeafTile.cpp @@ -5,7 +5,7 @@ #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "strings.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp index 7808c2ea2..39e5a822a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.cpp @@ -7,7 +7,7 @@ #include "LiquidTile.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp index c59072f1c..81fd5923a 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/MycelTile.cpp @@ -1,7 +1,7 @@ #include #include "MycelTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp index eeca14bf4..5e7e5cf62 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NotGateTile.cpp @@ -1,6 +1,6 @@ #include "NotGateTile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp index 980ee4805..68033df25 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NoteBlockTile.cpp @@ -3,7 +3,7 @@ #include "NoteBlockTile.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp index 6e30b4102..130421760 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.cpp @@ -2,7 +2,7 @@ #include #include "PortalTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "SoundTypes.h" #include "java/Class.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp index 62b16fefe..fb0b034f7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PumpkinTile.cpp @@ -2,7 +2,7 @@ #include "PumpkinTile.h" #include "Minecraft.World/net/minecraft/world/entity/animal/SnowMan.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp index 979e9e31e..b6f10af11 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.cpp @@ -7,8 +7,8 @@ #include "Minecraft.World/net/minecraft/Direction.h" #include "DiodeTile.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Facing.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp index 64dd7e42e..50fffe1c8 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneOreTile.cpp @@ -1,7 +1,7 @@ #include #include "RedStoneOreTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp index 8b1bee8c1..bba38f207 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RepeaterTile.cpp @@ -1,7 +1,7 @@ #include #include "RepeaterTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/Direction.h" #include "Minecraft.World/net/minecraft/world/item/Item.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp index 655e7377a..baf06ee02 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StemTile.cpp @@ -1,7 +1,7 @@ #include #include "Minecraft.Client/net/minecraft/client/Minecraft.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "StemTile.h" #include "Minecraft.Client/Common/App_enums.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp index f2443d7ff..efb1b5627 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/StoneMonsterTile.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/world/entity/monster/net.minecraft.world.entity.monster.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp index 52bcbaf4b..4b3c15047 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.cpp @@ -5,7 +5,7 @@ #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" #include "TallGrassPlantTile.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" const unsigned int TallGrass::TALL_GRASS_TILE_NAMES[TALL_GRASS_TILE_NAMES_LENGTH] = { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h index ffab6ad7c..e017f3450 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h @@ -2,7 +2,7 @@ #include "Minecraft.World/net/minecraft/world/level/material/Material.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" #include "Minecraft.World/ConsoleHelpers/Definitions.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" #include #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp index b72fb19e2..61432f0db 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.cpp @@ -1,7 +1,7 @@ #include #include "TorchTile.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" #include "Minecraft.World/net/minecraft/world/level/LevelSource.h" #include "Minecraft.World/net/minecraft/world/level/material/Material.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp index c2ac9684d..743ad33c1 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/WaterLilyTile.cpp @@ -4,7 +4,7 @@ #include "WaterLilyTile.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" #include "Minecraft.Client/Common/App_enums.h" -#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h" +#include "Minecraft.Client/Common/src/Colours/ColourTable.h" #include "java/Class.h" #include "Minecraft.World/net/minecraft/world/entity/Entity.h" #include "Minecraft.World/net/minecraft/world/level/Level.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp index db3d34b29..746b3d07e 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BeaconTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp index 86dfed6b2..58c190b31 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/BrewingStandTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "BrewingStandTileEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp index db6ebc3b8..b4c43d8b7 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/ChestTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h" @@ -12,7 +12,7 @@ #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h" #include "ChestTileEntity.h" #include "Minecraft.World/net/minecraft/network/packet/ContainerOpenPacket.h" -#include "Minecraft.World/Header Files/SoundTypes.h" +#include "Minecraft.World/include/SoundTypes.h" int ChestTileEntity::getContainerType() { if (isBonusChest) diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp index 788a7ce45..6206e9d4d 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "TileEntity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp index 27044d872..202f54c14 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/DropperTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include #include diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp index 2c91b4df6..ca99a7000 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/EnchantmentTableTileEntity.cpp @@ -1,6 +1,6 @@ #include -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "EnchantmentTableTileEntity.h" #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp index 3c5375de8..f70ca659c 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/FurnaceTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "nbt/com.mojang.nbt.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp index c45b3d55b..9f8267936 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/stdafx.h" +#include "Minecraft.World/include/stdafx.h" #include "Minecraft.World/net/minecraft/net.minecraft.h" #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp index c2965ade7..fd701aae3 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TheEndPortalTile.cpp @@ -4,7 +4,7 @@ #include "TheEndPortalTileEntity.h" #include "Minecraft.Client/Common/App_enums.h" #include "Minecraft.Client/Linux/Linux_App.h" -#include "Minecraft.World/Header Files/ParticleTypes.h" +#include "Minecraft.World/include/ParticleTypes.h" #include "java/Class.h" #include "java/Random.h" #include "Minecraft.World/net/minecraft/world/IconRegister.h" diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp index 0cb06a171..3bc53813f 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp +++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp @@ -21,9 +21,9 @@ #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h" #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" class Icon; diff --git a/minecraft/Minecraft.World/Source Files/Minecraft.World.cpp b/minecraft/Minecraft.World/src/Minecraft.World.cpp similarity index 98% rename from minecraft/Minecraft.World/Source Files/Minecraft.World.cpp rename to minecraft/Minecraft.World/src/Minecraft.World.cpp index b2fafb16f..e4844eef4 100644 --- a/minecraft/Minecraft.World/Source Files/Minecraft.World.cpp +++ b/minecraft/Minecraft.World/src/Minecraft.World.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.World/Header Files/Minecraft.World.h" +#include "Minecraft.World/include/Minecraft.World.h" #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h" #include "Minecraft.World/net/minecraft/stats/CommonStats.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" diff --git a/minecraft/Minecraft.World/Source Files/compression.cpp b/minecraft/Minecraft.World/src/compression.cpp similarity index 99% rename from minecraft/Minecraft.World/Source Files/compression.cpp rename to minecraft/Minecraft.World/src/compression.cpp index 204b16eb0..c674b571c 100644 --- a/minecraft/Minecraft.World/Source Files/compression.cpp +++ b/minecraft/Minecraft.World/src/compression.cpp @@ -7,9 +7,9 @@ #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "compression.h" -#include "Minecraft.Client/Header Files/NetTypes.h" -#include "Minecraft.Client/Header Files/XboxStubs.h" -#include "Minecraft.Client/Header Files/SkinBox.h" +#include "Minecraft.Client/include/NetTypes.h" +#include "Minecraft.Client/include/XboxStubs.h" +#include "Minecraft.Client/include/SkinBox.h" #if defined(_WIN64) || defined(__linux__) // zconf.h defines "typedef unsigned char Byte" which conflicts with the // project's "class Byte" from BasicTypeContainers.h (via stdafx.h).