From c65d01c4dc95bb6008b07a9bddd495b8b18e9618 Mon Sep 17 00:00:00 2001 From: izzy Date: Wed, 4 Mar 2026 01:56:35 -0500 Subject: [PATCH] revert: revert reformatting of headers, tbd This reverts commit fef5c7b094b400d2fa8cc8554d9e0a1dfa3289c7. --- CMakeLists.txt | 2 +- Minecraft.Client/AbstractContainerScreen.cpp | 6 +- .../AbstractProjectileDispenseBehavior.cpp | 8 +- .../AbstractProjectileDispenseBehavior.h | 2 +- Minecraft.Client/AbstractTexturePack.cpp | 4 +- Minecraft.Client/AchievementPopup.cpp | 8 +- Minecraft.Client/AchievementScreen.cpp | 8 +- Minecraft.Client/AchievementScreen.h | 2 +- Minecraft.Client/ArchiveFile.cpp | 4 +- Minecraft.Client/ArchiveFile.h | 4 +- Minecraft.Client/ArrowRenderer.cpp | 4 +- Minecraft.Client/BatModel.cpp | 2 +- Minecraft.Client/BatRenderer.cpp | 2 +- Minecraft.Client/BeaconRenderer.cpp | 4 +- Minecraft.Client/BlazeModel.cpp | 2 +- Minecraft.Client/BlazeRenderer.cpp | 2 +- Minecraft.Client/BoatRenderer.cpp | 4 +- Minecraft.Client/BookModel.cpp | 2 +- Minecraft.Client/BossMobGuiInfo.cpp | 2 +- Minecraft.Client/BreakingItemParticle.cpp | 6 +- Minecraft.Client/BubbleParticle.cpp | 10 +- Minecraft.Client/BufferedImage.cpp | 4 +- Minecraft.Client/Camera.cpp | 8 +- Minecraft.Client/Camera.h | 4 +- Minecraft.Client/ChatScreen.cpp | 6 +- Minecraft.Client/ChestRenderer.cpp | 6 +- Minecraft.Client/ChickenModel.cpp | 2 +- Minecraft.Client/ChickenRenderer.cpp | 4 +- Minecraft.Client/Chunk.cpp | 14 +- Minecraft.Client/Chunk.h | 2 +- Minecraft.Client/ClientConnection.cpp | 68 ++-- Minecraft.Client/ClientConnection.h | 2 +- Minecraft.Client/ClockTexture.cpp | 8 +- .../Common/Audio/Consoles_SoundEngine.h | 10 +- Minecraft.Client/Common/Audio/SoundEngine.cpp | 15 +- Minecraft.Client/Common/Audio/SoundEngine.h | 2 +- .../Common/C4JMemoryPoolAllocator.h | 2 +- .../Common/Colours/ColourTable.cpp | 2 +- Minecraft.Client/Common/ConsoleGameMode.cpp | 2 +- Minecraft.Client/Common/ConsoleGameMode.h | 2 +- Minecraft.Client/Common/Consoles_App.cpp | 106 +++--- Minecraft.Client/Common/Consoles_App.h | 24 +- Minecraft.Client/Common/DLC/DLCAudioFile.cpp | 4 +- .../Common/DLC/DLCColourTableFile.cpp | 6 +- Minecraft.Client/Common/DLC/DLCGameRules.h | 2 +- .../Common/DLC/DLCGameRulesHeader.cpp | 6 +- .../Common/DLC/DLCGameRulesHeader.h | 2 +- .../Common/DLC/DLCLocalisationFile.cpp | 2 +- Minecraft.Client/Common/DLC/DLCManager.cpp | 6 +- Minecraft.Client/Common/DLC/DLCPack.cpp | 2 +- Minecraft.Client/Common/DLC/DLCSkinFile.cpp | 10 +- Minecraft.Client/Common/DLC/DLCSkinFile.h | 2 +- .../AddEnchantmentRuleDefinition.cpp | 6 +- .../GameRules/AddItemRuleDefinition.cpp | 8 +- .../ApplySchematicRuleDefinition.cpp | 12 +- .../Common/GameRules/BiomeOverride.cpp | 2 +- .../GameRules/CollectItemRuleDefinition.cpp | 10 +- .../GameRules/CompleteAllRuleDefinition.cpp | 6 +- .../GameRules/CompoundGameRuleDefinition.cpp | 4 +- .../GameRules/ConsoleGameRulesConstants.h | 2 +- .../GameRules/ConsoleGenerateStructure.cpp | 10 +- .../GameRules/ConsoleGenerateStructure.h | 2 +- .../Common/GameRules/ConsoleSchematicFile.cpp | 20 +- .../Common/GameRules/ConsoleSchematicFile.h | 2 +- .../Common/GameRules/GameRuleDefinition.cpp | 4 +- .../Common/GameRules/GameRuleDefinition.h | 2 +- .../Common/GameRules/GameRuleManager.cpp | 20 +- .../GameRules/LevelGenerationOptions.cpp | 14 +- .../Common/GameRules/LevelGenerationOptions.h | 2 +- .../Common/GameRules/LevelRuleset.cpp | 4 +- .../GameRules/NamedAreaRuleDefinition.cpp | 4 +- .../Common/GameRules/StartFeature.cpp | 2 +- .../Common/GameRules/StartFeature.h | 2 +- .../GameRules/UpdatePlayerRuleDefinition.cpp | 10 +- .../GameRules/UseTileRuleDefinition.cpp | 2 +- .../Common/GameRules/UseTileRuleDefinition.h | 2 +- .../XboxStructureActionGenerateBox.cpp | 4 +- .../XboxStructureActionPlaceBlock.cpp | 4 +- .../XboxStructureActionPlaceContainer.cpp | 10 +- .../XboxStructureActionPlaceSpawner.cpp | 8 +- .../Leaderboards/LeaderboardManager.cpp | 2 +- .../Leaderboards/SonyLeaderboardManager.cpp | 18 +- .../Leaderboards/SonyLeaderboardManager.h | 2 +- .../Common/Network/GameNetworkManager.cpp | 64 ++-- .../Common/Network/GameNetworkManager.h | 10 +- .../Network/PlatformNetworkManagerInterface.h | 2 +- .../Network/PlatformNetworkManagerStub.cpp | 12 +- .../Network/PlatformNetworkManagerStub.h | 2 +- Minecraft.Client/Common/Network/SessionInfo.h | 2 +- .../Common/Network/Sony/NetworkPlayerSony.h | 2 +- .../Sony/PlatformNetworkManagerSony.cpp | 6 +- .../Network/Sony/PlatformNetworkManagerSony.h | 8 +- .../Common/Network/Sony/SQRNetworkManager.h | 6 +- .../Common/Network/Sony/SQRNetworkPlayer.cpp | 6 +- .../Common/Network/Sony/SonyCommerce.cpp | 2 +- .../Common/Network/Sony/SonyHttp.cpp | 6 +- .../Common/Network/Sony/SonyRemoteStorage.h | 2 +- .../Common/Telemetry/TelemetryManager.cpp | 6 +- .../Common/Telemetry/TelemetryManager.h | 2 +- Minecraft.Client/Common/Trial/TrialMode.cpp | 2 +- Minecraft.Client/Common/Trial/TrialMode.h | 2 +- .../Common/Tutorial/AreaConstraint.cpp | 7 +- Minecraft.Client/Common/Tutorial/AreaHint.cpp | 7 +- .../Common/Tutorial/ChangeStateConstraint.cpp | 12 +- .../Common/Tutorial/ChoiceTask.cpp | 9 +- .../Common/Tutorial/CompleteUsingItemTask.cpp | 2 +- .../Common/Tutorial/ControllerTask.cpp | 5 + .../Common/Tutorial/CraftTask.cpp | 2 +- .../Common/Tutorial/DiggerItemHint.cpp | 8 +- .../Common/Tutorial/EffectChangedTask.cpp | 2 +- .../Common/Tutorial/FullTutorial.cpp | 12 +- .../Common/Tutorial/FullTutorialMode.cpp | 2 +- .../Common/Tutorial/HorseChoiceTask.cpp | 2 +- Minecraft.Client/Common/Tutorial/InfoTask.cpp | 9 +- .../Common/Tutorial/LookAtEntityHint.h | 2 +- .../Common/Tutorial/LookAtTileHint.cpp | 4 +- .../Common/Tutorial/RideEntityTask.cpp | 2 +- Minecraft.Client/Common/Tutorial/StatTask.cpp | 8 +- .../Common/Tutorial/TakeItemHint.cpp | 4 +- Minecraft.Client/Common/Tutorial/Tutorial.cpp | 26 +- .../Common/Tutorial/TutorialHint.cpp | 11 +- .../Common/Tutorial/TutorialMode.cpp | 10 + .../Common/Tutorial/TutorialMode.h | 2 +- .../Common/Tutorial/UseItemTask.cpp | 6 +- .../Common/Tutorial/UseTileTask.cpp | 6 +- .../Common/Tutorial/XuiCraftingTask.cpp | 4 +- .../Common/Tutorial/XuiCraftingTask.h | 2 +- .../UI/IUIScene_AbstractContainerMenu.cpp | 9 + .../Common/UI/IUIScene_AnvilMenu.cpp | 12 +- .../Common/UI/IUIScene_AnvilMenu.h | 2 +- .../Common/UI/IUIScene_BeaconMenu.cpp | 10 +- .../Common/UI/IUIScene_BeaconMenu.h | 2 +- .../Common/UI/IUIScene_BrewingMenu.cpp | 2 +- .../Common/UI/IUIScene_CommandBlockMenu.cpp | 2 +- .../Common/UI/IUIScene_CommandBlockMenu.h | 2 +- .../Common/UI/IUIScene_ContainerMenu.cpp | 2 +- .../Common/UI/IUIScene_CraftingMenu.cpp | 8 +- .../Common/UI/IUIScene_CraftingMenu.h | 4 +- .../Common/UI/IUIScene_CreativeMenu.cpp | 13 + .../Common/UI/IUIScene_CreativeMenu.h | 2 +- .../Common/UI/IUIScene_DispenserMenu.cpp | 2 +- .../Common/UI/IUIScene_EnchantingMenu.cpp | 6 + .../Common/UI/IUIScene_FireworksMenu.cpp | 2 +- .../Common/UI/IUIScene_FurnaceMenu.cpp | 2 +- Minecraft.Client/Common/UI/IUIScene_HUD.cpp | 12 +- .../Common/UI/IUIScene_HopperMenu.cpp | 2 +- .../Common/UI/IUIScene_HopperMenu.h | 4 +- .../Common/UI/IUIScene_HorseInventoryMenu.cpp | 2 +- .../Common/UI/IUIScene_HorseInventoryMenu.h | 6 +- .../Common/UI/IUIScene_InventoryMenu.cpp | 2 +- .../Common/UI/IUIScene_PauseMenu.cpp | 20 +- .../Common/UI/IUIScene_TradingMenu.cpp | 14 +- .../Common/UI/IUIScene_TradingMenu.h | 2 +- .../Common/UI/UIComponent_Chat.cpp | 4 +- .../Common/UI/UIComponent_Panorama.cpp | 4 +- .../UI/UIComponent_PressStartToPlay.cpp | 2 +- .../Common/UI/UIComponent_TutorialPopup.cpp | 8 + Minecraft.Client/Common/UI/UIControl.cpp | 4 +- Minecraft.Client/Common/UI/UIControl_Base.cpp | 4 +- .../Common/UI/UIControl_EnchantmentBook.cpp | 14 +- .../Common/UI/UIControl_EnchantmentButton.cpp | 7 + .../Common/UI/UIControl_Label.cpp | 2 +- .../Common/UI/UIControl_MinecraftHorse.cpp | 28 +- .../Common/UI/UIControl_MinecraftPlayer.cpp | 13 + .../Common/UI/UIControl_PlayerSkinPreview.cpp | 18 +- .../Common/UI/UIControl_PlayerSkinPreview.h | 2 +- Minecraft.Client/Common/UI/UIController.cpp | 34 +- Minecraft.Client/Common/UI/UIScene.cpp | 8 +- .../UI/UIScene_AbstractContainerMenu.cpp | 8 +- .../Common/UI/UIScene_AnvilMenu.cpp | 6 +- .../Common/UI/UIScene_AnvilMenu.h | 2 +- .../Common/UI/UIScene_BeaconMenu.cpp | 6 +- .../Common/UI/UIScene_BrewingStandMenu.cpp | 8 +- .../Common/UI/UIScene_ConnectingProgress.cpp | 2 +- .../Common/UI/UIScene_ContainerMenu.cpp | 16 +- .../Common/UI/UIScene_ControlsMenu.cpp | 5 + .../Common/UI/UIScene_CraftingMenu.cpp | 6 + .../Common/UI/UIScene_CreateWorldMenu.cpp | 26 +- .../Common/UI/UIScene_CreativeMenu.cpp | 12 +- .../Common/UI/UIScene_Credits.cpp | 2 +- .../Common/UI/UIScene_DLCMainMenu.cpp | 2 +- .../Common/UI/UIScene_DLCOffersMenu.cpp | 6 +- .../Common/UI/UIScene_DeathMenu.cpp | 5 + .../UI/UIScene_DebugCreateSchematic.cpp | 4 +- .../Common/UI/UIScene_DebugCreateSchematic.h | 2 +- .../Common/UI/UIScene_DebugOverlay.cpp | 20 +- .../Common/UI/UIScene_DebugSetCamera.cpp | 2 +- .../Common/UI/UIScene_DispenserMenu.cpp | 6 +- Minecraft.Client/Common/UI/UIScene_EULA.cpp | 2 +- .../Common/UI/UIScene_EnchantingMenu.cpp | 6 +- .../Common/UI/UIScene_EndPoem.cpp | 6 + .../Common/UI/UIScene_FireworksMenu.cpp | 8 +- .../Common/UI/UIScene_FullscreenProgress.cpp | 4 +- .../Common/UI/UIScene_FurnaceMenu.cpp | 6 +- Minecraft.Client/Common/UI/UIScene_HUD.cpp | 9 + .../Common/UI/UIScene_HelpAndOptionsMenu.cpp | 2 +- .../Common/UI/UIScene_HopperMenu.cpp | 6 +- .../Common/UI/UIScene_HorseInventoryMenu.cpp | 6 +- .../Common/UI/UIScene_HowToPlay.cpp | 2 +- .../UI/UIScene_InGameHostOptionsMenu.cpp | 10 +- .../Common/UI/UIScene_InGameInfoMenu.cpp | 8 +- .../UI/UIScene_InGamePlayerOptionsMenu.cpp | 8 +- .../Common/UI/UIScene_InventoryMenu.cpp | 15 + .../Common/UI/UIScene_InventoryMenu.h | 2 +- .../Common/UI/UIScene_JoinMenu.cpp | 12 +- .../Common/UI/UIScene_LeaderboardsMenu.cpp | 6 +- .../Common/UI/UIScene_LeaderboardsMenu.h | 4 +- .../Common/UI/UIScene_LoadMenu.cpp | 16 +- .../Common/UI/UIScene_LoadOrJoinMenu.cpp | 26 +- .../Common/UI/UIScene_MainMenu.cpp | 10 +- .../Common/UI/UIScene_NewUpdateMessage.cpp | 2 +- .../Common/UI/UIScene_PauseMenu.cpp | 13 +- .../Common/UI/UIScene_QuadrantSignin.cpp | 4 +- .../Common/UI/UIScene_SettingsMenu.cpp | 2 +- .../Common/UI/UIScene_SignEntryMenu.cpp | 12 +- .../Common/UI/UIScene_SkinSelectMenu.cpp | 2 +- .../Common/UI/UIScene_SkinSelectMenu.h | 2 +- .../Common/UI/UIScene_TeleportMenu.cpp | 8 +- .../Common/UI/UIScene_TradingMenu.cpp | 10 +- Minecraft.Client/Common/UI/UIString.cpp | 2 +- Minecraft.Client/Common/UI/UITTFFont.cpp | 4 +- .../Common/XUI/SlotProgressControl.cpp | 4 +- Minecraft.Client/Common/XUI/XUI_Chat.cpp | 4 +- Minecraft.Client/Common/XUI/XUI_Chat.h | 2 +- .../Common/XUI/XUI_ConnectingProgress.cpp | 4 +- .../Common/XUI/XUI_ConnectingProgress.h | 2 +- .../Common/XUI/XUI_Control_ComboBox.cpp | 2 +- .../Common/XUI/XUI_Ctrl_BrewProgress.cpp | 6 +- .../Common/XUI/XUI_Ctrl_BubblesProgress.cpp | 2 +- .../Common/XUI/XUI_Ctrl_BurnProgress.cpp | 4 +- .../XUI/XUI_Ctrl_CraftIngredientSlot.cpp | 2 +- .../Common/XUI/XUI_Ctrl_EnchantButton.cpp | 10 +- .../Common/XUI/XUI_Ctrl_EnchantmentBook.cpp | 22 +- .../Common/XUI/XUI_Ctrl_EnchantmentBook.h | 2 +- .../XUI/XUI_Ctrl_EnchantmentButtonText.cpp | 16 +- .../Common/XUI/XUI_Ctrl_FireProgress.cpp | 4 +- .../Common/XUI/XUI_Ctrl_LoadingProgress.cpp | 4 +- .../Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp | 10 +- .../XUI/XUI_Ctrl_MinecraftSkinPreview.cpp | 22 +- .../XUI/XUI_Ctrl_MinecraftSkinPreview.h | 7 + .../Common/XUI/XUI_Ctrl_MinecraftSlot.cpp | 18 +- .../Common/XUI/XUI_Ctrl_MobEffect.h | 2 +- .../Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp | 10 +- .../Common/XUI/XUI_Ctrl_SlotList.cpp | 2 +- .../Common/XUI/XUI_Ctrl_SplashPulser.cpp | 12 +- Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp | 10 +- Minecraft.Client/Common/XUI/XUI_DLCOffers.h | 6 +- Minecraft.Client/Common/XUI/XUI_Death.cpp | 22 +- Minecraft.Client/Common/XUI/XUI_Death.h | 4 + Minecraft.Client/Common/XUI/XUI_Debug.h | 2 +- .../Common/XUI/XUI_DebugItemEditor.cpp | 16 +- .../Common/XUI/XUI_DebugItemEditor.h | 4 +- .../Common/XUI/XUI_DebugOverlay.cpp | 47 +-- .../Common/XUI/XUI_DebugOverlay.h | 6 +- .../Common/XUI/XUI_DebugSchematicCreator.cpp | 6 +- .../Common/XUI/XUI_DebugSchematicCreator.h | 4 +- .../Common/XUI/XUI_DebugSetCamera.cpp | 11 +- .../Common/XUI/XUI_DebugSetCamera.h | 4 +- Minecraft.Client/Common/XUI/XUI_DebugTips.cpp | 2 +- Minecraft.Client/Common/XUI/XUI_DebugTips.h | 4 + .../Common/XUI/XUI_FullscreenProgress.cpp | 8 +- .../Common/XUI/XUI_FullscreenProgress.h | 4 +- Minecraft.Client/Common/XUI/XUI_HUD.cpp | 10 + Minecraft.Client/Common/XUI/XUI_HUD.h | 2 +- .../Common/XUI/XUI_HelpAndOptions.cpp | 2 +- .../Common/XUI/XUI_HelpAndOptions.h | 2 +- .../Common/XUI/XUI_HelpControls.cpp | 8 +- .../Common/XUI/XUI_HelpControls.h | 2 +- Minecraft.Client/Common/XUI/XUI_HelpCredits.h | 2 +- .../Common/XUI/XUI_HelpHowToPlay.cpp | 4 +- .../Common/XUI/XUI_HelpHowToPlay.h | 2 +- .../Common/XUI/XUI_HowToPlayMenu.cpp | 4 +- .../Common/XUI/XUI_HowToPlayMenu.h | 2 +- .../Common/XUI/XUI_InGameHostOptions.cpp | 10 +- .../Common/XUI/XUI_InGameHostOptions.h | 2 +- .../Common/XUI/XUI_InGameInfo.cpp | 22 +- Minecraft.Client/Common/XUI/XUI_InGameInfo.h | 2 +- .../Common/XUI/XUI_InGamePlayerOptions.cpp | 12 +- .../Common/XUI/XUI_InGamePlayerOptions.h | 2 +- Minecraft.Client/Common/XUI/XUI_Intro.cpp | 2 +- Minecraft.Client/Common/XUI/XUI_Intro.h | 2 +- .../Common/XUI/XUI_Leaderboards.cpp | 4 +- .../Common/XUI/XUI_Leaderboards.h | 4 +- .../Common/XUI/XUI_LoadSettings.cpp | 36 +- .../Common/XUI/XUI_LoadSettings.h | 2 +- Minecraft.Client/Common/XUI/XUI_MainMenu.cpp | 30 +- Minecraft.Client/Common/XUI/XUI_MainMenu.h | 2 +- .../Common/XUI/XUI_MultiGameCreate.cpp | 28 +- .../Common/XUI/XUI_MultiGameCreate.h | 2 +- .../Common/XUI/XUI_MultiGameInfo.cpp | 8 +- .../Common/XUI/XUI_MultiGameInfo.h | 2 +- .../Common/XUI/XUI_MultiGameJoinLoad.cpp | 34 +- .../Common/XUI/XUI_MultiGameJoinLoad.h | 2 +- .../XUI/XUI_MultiGameLaunchMoreOptions.cpp | 4 +- .../XUI/XUI_MultiGameLaunchMoreOptions.h | 2 +- .../Common/XUI/XUI_NewUpdateMessage.cpp | 4 +- .../Common/XUI/XUI_NewUpdateMessage.h | 2 +- .../Common/XUI/XUI_PartnernetPassword.cpp | 2 +- .../Common/XUI/XUI_PartnernetPassword.h | 2 +- Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp | 20 ++ Minecraft.Client/Common/XUI/XUI_PauseMenu.h | 5 + Minecraft.Client/Common/XUI/XUI_Reinstall.cpp | 26 +- Minecraft.Client/Common/XUI/XUI_Reinstall.h | 4 + .../Common/XUI/XUI_SaveMessage.cpp | 2 +- Minecraft.Client/Common/XUI/XUI_SaveMessage.h | 2 +- .../XUI/XUI_Scene_AbstractContainer.cpp | 30 +- .../Common/XUI/XUI_Scene_AbstractContainer.h | 4 +- .../Common/XUI/XUI_Scene_Anvil.cpp | 14 +- Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h | 6 +- .../Common/XUI/XUI_Scene_Base.cpp | 29 +- Minecraft.Client/Common/XUI/XUI_Scene_Base.h | 6 +- .../Common/XUI/XUI_Scene_BrewingStand.cpp | 12 +- .../Common/XUI/XUI_Scene_BrewingStand.h | 4 +- .../Common/XUI/XUI_Scene_Container.cpp | 12 +- .../Common/XUI/XUI_Scene_Container.h | 4 +- .../Common/XUI/XUI_Scene_CraftingPanel.cpp | 13 + .../Common/XUI/XUI_Scene_CraftingPanel.h | 10 +- .../Common/XUI/XUI_Scene_Enchant.cpp | 17 +- .../Common/XUI/XUI_Scene_Enchant.h | 10 +- .../Common/XUI/XUI_Scene_Furnace.cpp | 9 + .../Common/XUI/XUI_Scene_Furnace.h | 4 +- .../Common/XUI/XUI_Scene_Inventory.cpp | 11 + .../Common/XUI/XUI_Scene_Inventory.h | 4 +- .../XUI/XUI_Scene_Inventory_Creative.cpp | 26 +- .../Common/XUI/XUI_Scene_Inventory_Creative.h | 8 +- .../Common/XUI/XUI_Scene_Trading.cpp | 18 +- .../Common/XUI/XUI_Scene_Trading.h | 4 +- .../Common/XUI/XUI_Scene_Trap.cpp | 12 +- Minecraft.Client/Common/XUI/XUI_Scene_Trap.h | 4 +- Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp | 10 + Minecraft.Client/Common/XUI/XUI_Scene_Win.h | 4 + .../Common/XUI/XUI_SettingsAll.cpp | 2 +- Minecraft.Client/Common/XUI/XUI_SettingsAll.h | 4 + .../Common/XUI/XUI_SettingsAudio.cpp | 2 +- .../Common/XUI/XUI_SettingsAudio.h | 4 + .../Common/XUI/XUI_SettingsControl.cpp | 2 +- .../Common/XUI/XUI_SettingsControl.h | 4 + .../Common/XUI/XUI_SettingsGraphics.cpp | 2 +- .../Common/XUI/XUI_SettingsGraphics.h | 4 + .../Common/XUI/XUI_SettingsOptions.cpp | 2 +- .../Common/XUI/XUI_SettingsOptions.h | 2 +- .../Common/XUI/XUI_SettingsUI.cpp | 2 +- Minecraft.Client/Common/XUI/XUI_SettingsUI.h | 2 +- Minecraft.Client/Common/XUI/XUI_SignEntry.cpp | 10 + Minecraft.Client/Common/XUI/XUI_SignEntry.h | 2 +- Minecraft.Client/Common/XUI/XUI_SkinSelect.h | 6 +- .../Common/XUI/XUI_SocialPost.cpp | 20 +- Minecraft.Client/Common/XUI/XUI_SocialPost.h | 2 +- Minecraft.Client/Common/XUI/XUI_Teleport.cpp | 22 +- Minecraft.Client/Common/XUI/XUI_Teleport.h | 2 +- Minecraft.Client/Common/XUI/XUI_TextEntry.cpp | 4 + Minecraft.Client/Common/XUI/XUI_TextEntry.h | 2 +- .../Common/XUI/XUI_TransferToXboxOne.cpp | 2 +- .../Common/XUI/XUI_TransferToXboxOne.h | 2 +- .../Common/XUI/XUI_TrialExitUpsell.h | 2 +- .../Common/XUI/XUI_TutorialPopup.cpp | 8 + .../Common/XUI/XUI_TutorialPopup.h | 2 +- Minecraft.Client/Common/XUI/XUI_debug.cpp | 2 +- Minecraft.Client/Common/zlib/crc32.c | 2 +- Minecraft.Client/CompassTexture.cpp | 8 +- Minecraft.Client/ConfirmScreen.cpp | 2 +- Minecraft.Client/ConnectScreen.cpp | 2 +- Minecraft.Client/ContainerScreen.cpp | 2 +- Minecraft.Client/ControlsScreen.cpp | 2 +- Minecraft.Client/CraftingScreen.cpp | 4 +- Minecraft.Client/CreateWorldScreen.cpp | 12 +- Minecraft.Client/CreativeMode.cpp | 10 +- Minecraft.Client/CreeperModel.cpp | 2 +- Minecraft.Client/CreeperRenderer.cpp | 4 +- Minecraft.Client/CritParticle.cpp | 8 +- Minecraft.Client/CritParticle2.cpp | 2 +- Minecraft.Client/Cube.h | 2 +- Minecraft.Client/Culler.h | 2 +- Minecraft.Client/DLCTexturePack.cpp | 22 +- Minecraft.Client/DeathScreen.cpp | 2 +- Minecraft.Client/DefaultRenderer.cpp | 2 +- Minecraft.Client/DefaultTexturePack.cpp | 2 +- Minecraft.Client/DemoLevel.cpp | 2 +- Minecraft.Client/DemoLevel.h | 2 +- Minecraft.Client/DemoMode.cpp | 2 +- Minecraft.Client/DerivedServerLevel.cpp | 4 +- Minecraft.Client/DirtyChunkSorter.cpp | 2 +- Minecraft.Client/DisconnectedScreen.cpp | 2 +- Minecraft.Client/DispenserBootstrap.h | 8 +- Minecraft.Client/DistanceChunkSorter.cpp | 2 +- Minecraft.Client/DragonBreathParticle.cpp | 2 +- Minecraft.Client/DragonModel.cpp | 4 +- Minecraft.Client/DripParticle.cpp | 10 +- Minecraft.Client/Durango/Durango_App.cpp | 26 +- .../Durango/Durango_Minecraft.cpp | 54 +-- .../Durango/Durango_UIController.h | 2 +- .../Durango/Iggy/gdraw/gdraw_d3d11.cpp | 2 +- Minecraft.Client/Durango/Iggy/include/iggy.h | 2 +- .../DurangoLeaderboardManager.cpp | 2 +- .../Leaderboards/DurangoLeaderboardManager.h | 2 +- .../Leaderboards/DurangoStatsDebugger.cpp | 12 +- .../Durango/Leaderboards/GameProgress.cpp | 4 +- .../Durango/Network/ChatIntegrationLayer.h | 2 +- .../Durango/Network/DQRNetworkManager.cpp | 4 +- .../Durango/Network/DQRNetworkManager.h | 2 +- .../DQRNetworkManager_FriendSessions.cpp | 4 +- .../Durango/Network/DQRNetworkManager_Log.cpp | 4 +- .../Network/DQRNetworkManager_SendReceive.cpp | 4 +- .../Network/DQRNetworkManager_XRNSEvent.cpp | 4 +- .../Durango/Network/NetworkPlayerDurango.h | 2 +- .../Durango/Network/PartyController.cpp | 6 +- .../Network/PlatformNetworkManagerDurango.cpp | 4 +- .../Network/PlatformNetworkManagerDurango.h | 8 +- .../Durango/Sentient/DurangoTelemetry.cpp | 14 +- .../Durango/Sentient/DurangoTelemetry.h | 4 +- Minecraft.Client/Durango/XboxGameMode.cpp | 2 +- Minecraft.Client/Durango/XboxGameMode.h | 2 +- Minecraft.Client/EchantmentTableParticle.cpp | 2 +- Minecraft.Client/EditBox.cpp | 2 +- Minecraft.Client/EnchantTableRenderer.cpp | 4 +- Minecraft.Client/EnderChestRenderer.cpp | 2 +- Minecraft.Client/EnderCrystalRenderer.cpp | 2 +- Minecraft.Client/EnderDragonRenderer.cpp | 2 +- Minecraft.Client/EnderParticle.cpp | 4 +- Minecraft.Client/EndermanRenderer.cpp | 4 +- Minecraft.Client/EntityRenderDispatcher.cpp | 26 +- Minecraft.Client/EntityRenderDispatcher.h | 4 +- Minecraft.Client/EntityRenderer.cpp | 14 +- Minecraft.Client/EntityTileRenderer.cpp | 4 +- Minecraft.Client/EntityTracker.cpp | 28 +- Minecraft.Client/EntityTracker.h | 4 +- Minecraft.Client/ExperienceOrbRenderer.cpp | 10 +- Minecraft.Client/ExplodeParticle.cpp | 4 +- Minecraft.Client/Extrax64Stubs.cpp | 32 +- Minecraft.Client/FallingTileRenderer.cpp | 6 +- Minecraft.Client/FireballRenderer.cpp | 10 +- Minecraft.Client/FireworksParticles.cpp | 4 +- Minecraft.Client/FireworksParticles.h | 2 +- Minecraft.Client/FishingHookRenderer.cpp | 8 +- Minecraft.Client/FlameParticle.cpp | 4 +- Minecraft.Client/Font.cpp | 8 +- Minecraft.Client/FootstepParticle.cpp | 4 +- Minecraft.Client/Frustum.cpp | 2 +- Minecraft.Client/FrustumData.h | 2 +- Minecraft.Client/FurnaceScreen.cpp | 4 +- Minecraft.Client/GameMode.cpp | 14 +- Minecraft.Client/GameRenderer.cpp | 54 +-- Minecraft.Client/GameRenderer.h | 4 +- Minecraft.Client/GhastModel.cpp | 4 +- Minecraft.Client/GhastRenderer.cpp | 2 +- Minecraft.Client/Gui.cpp | 32 +- Minecraft.Client/GuiParticle.cpp | 2 +- Minecraft.Client/HorseRenderer.cpp | 2 +- Minecraft.Client/HugeExplosionParticle.cpp | 2 +- .../HugeExplosionSeedParticle.cpp | 4 +- Minecraft.Client/HumanoidMobRenderer.cpp | 10 +- Minecraft.Client/HumanoidModel.cpp | 4 +- Minecraft.Client/InBedChatScreen.cpp | 6 +- Minecraft.Client/Input.cpp | 8 +- Minecraft.Client/InventoryScreen.cpp | 2 +- Minecraft.Client/ItemFrameRenderer.cpp | 24 +- Minecraft.Client/ItemInHandRenderer.cpp | 12 +- Minecraft.Client/ItemRenderer.cpp | 16 +- Minecraft.Client/ItemSpriteRenderer.cpp | 8 +- Minecraft.Client/JoinMultiplayerScreen.cpp | 2 +- Minecraft.Client/LavaParticle.cpp | 6 +- Minecraft.Client/LavaSlimeModel.cpp | 4 +- Minecraft.Client/LavaSlimeRenderer.cpp | 2 +- Minecraft.Client/LevelRenderer.cpp | 40 +-- Minecraft.Client/LevelRenderer.h | 8 +- Minecraft.Client/Lighting.cpp | 4 +- Minecraft.Client/LightningBoltRenderer.cpp | 2 +- Minecraft.Client/LivingEntityRenderer.cpp | 6 +- Minecraft.Client/LivingEntityRenderer.h | 2 +- Minecraft.Client/LocalPlayer.cpp | 54 +-- Minecraft.Client/LocalPlayer.h | 6 +- Minecraft.Client/MemoryTracker.cpp | 6 +- Minecraft.Client/MinecartRenderer.cpp | 4 +- Minecraft.Client/MinecartSpawnerRenderer.cpp | 4 +- Minecraft.Client/Minecraft.cpp | 62 ++-- Minecraft.Client/Minecraft.h | 6 +- Minecraft.Client/MinecraftServer.cpp | 56 ++-- Minecraft.Client/MinecraftServer.h | 6 +- Minecraft.Client/Minimap.cpp | 4 +- Minecraft.Client/Minimap.h | 2 +- Minecraft.Client/MobRenderer.cpp | 12 +- Minecraft.Client/MobSpawnerRenderer.cpp | 4 +- Minecraft.Client/Model.h | 4 +- Minecraft.Client/ModelHorse.cpp | 4 +- Minecraft.Client/ModelPart.h | 4 +- Minecraft.Client/MultiPlayerChunkCache.cpp | 12 +- Minecraft.Client/MultiPlayerChunkCache.h | 6 +- Minecraft.Client/MultiPlayerGameMode.cpp | 14 +- Minecraft.Client/MultiPlayerLevel.cpp | 14 +- Minecraft.Client/MultiPlayerLevel.h | 8 +- Minecraft.Client/MultiPlayerLocalPlayer.cpp | 24 +- Minecraft.Client/MultiPlayerLocalPlayer.h | 2 +- Minecraft.Client/MushroomCowRenderer.cpp | 4 +- Minecraft.Client/NameEntryScreen.cpp | 2 +- Minecraft.Client/NetherPortalParticle.cpp | 4 +- Minecraft.Client/NoteParticle.cpp | 2 +- Minecraft.Client/OcelotModel.cpp | 4 +- Minecraft.Client/OcelotRenderer.cpp | 2 +- Minecraft.Client/OffsettedRenderList.cpp | 2 +- Minecraft.Client/Options.cpp | 20 +- Minecraft.Client/Options.h | 2 +- Minecraft.Client/OptionsScreen.cpp | 2 +- Minecraft.Client/Orbis/Iggy/include/iggy.h | 2 +- .../Leaderboards/OrbisLeaderboardManager.cpp | 10 +- .../Leaderboards/OrbisLeaderboardManager.h | 2 +- .../Orbis/Network/Orbis_NPToolkit.cpp | 4 +- .../Orbis/Network/SQRNetworkManager_Orbis.cpp | 8 +- .../Orbis/Network/SQRNetworkManager_Orbis.h | 4 +- .../Orbis/Network/SonyCommerce_Orbis.cpp | 2 +- .../Orbis/Network/SonyCommerce_Orbis.h | 2 +- .../Orbis/Network/SonyRemoteStorage_Orbis.cpp | 2 +- .../Orbis/Network/SonyRemoteStorage_Orbis.h | 2 +- .../Orbis/Network/SonyVoiceChatParty_Orbis.h | 2 +- .../Orbis/Network/SonyVoiceChat_Orbis.h | 2 +- .../Orbis/OrbisExtras/OrbisTypes.h | 2 +- Minecraft.Client/Orbis/Orbis_App.cpp | 30 +- Minecraft.Client/Orbis/Orbis_App.h | 4 +- Minecraft.Client/Orbis/Orbis_Minecraft.cpp | 66 ++-- Minecraft.Client/Orbis/Orbis_PlayerUID.cpp | 2 +- Minecraft.Client/Orbis/Orbis_UIController.cpp | 4 +- Minecraft.Client/Orbis/Orbis_UIController.h | 2 +- Minecraft.Client/Orbis/user_malloc.cpp | 2 +- Minecraft.Client/OzelotModel.cpp | 4 +- Minecraft.Client/OzelotRenderer.cpp | 2 +- .../PS3/4JLibs/STO_TitleSmallStorage.cpp | 2 +- Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h | 2 +- .../PS3/Audio/PS3_SoundEngine.cpp | 8 +- Minecraft.Client/PS3/Iggy/include/iggy.h | 2 +- .../Leaderboards/PS3LeaderboardManager.cpp | 10 +- .../PS3/Leaderboards/PS3LeaderboardManager.h | 6 +- .../PS3/Network/SQRNetworkManager_PS3.cpp | 12 +- .../PS3/Network/SQRNetworkManager_PS3.h | 6 +- .../PS3/Network/SonyCommerce_PS3.cpp | 2 +- .../PS3/Network/SonyCommerce_PS3.h | 2 +- .../PS3/Network/SonyRemoteStorage_PS3.cpp | 2 +- .../PS3/Network/SonyRemoteStorage_PS3.h | 2 +- .../PS3/PS3Extras/C4JSpursJob.cpp | 2 +- .../PS3/PS3Extras/C4JThread_SPU.cpp | 6 +- Minecraft.Client/PS3/PS3Extras/DirectX/sal.h | 2 +- Minecraft.Client/PS3/PS3Extras/EdgeZLib.cpp | 2 +- .../HeapInspector/Samples/Hook/PS3/Main.cpp | 4 +- .../Samples/Manual/ManualSample.cpp | 2 +- .../Samples/MultiThreadedHook/PS3/Main.cpp | 4 +- .../MultiThreadedHook/PS3/ThreadPS3.cpp | 2 +- .../ReplaceNewDeleteSample.cpp | 2 +- Minecraft.Client/PS3/PS3Extras/Ps3Types.h | 10 +- .../PS3/PS3Extras/ShutdownManager.cpp | 4 +- .../boost_1_53_0/boost/asio/impl/src.cpp | 4 +- .../char_encoding/unicode/create_tables.cpp | 2 +- Minecraft.Client/PS3/PS3_App.cpp | 28 +- Minecraft.Client/PS3/PS3_App.h | 4 +- Minecraft.Client/PS3/PS3_Minecraft.cpp | 80 ++--- Minecraft.Client/PS3/PS3_PlayerUID.cpp | 2 +- Minecraft.Client/PS3/PS3_UIController.cpp | 6 +- Minecraft.Client/PS3/PS3_UIController.h | 2 +- .../ChunkUpdate/ChunkRebuildData.cpp | 30 +- .../SPU_Tasks/ChunkUpdate/ChunkRebuildData.h | 10 +- .../SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp | 8 +- .../SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp | 2 +- .../SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp | 10 +- .../SPU_Tasks/ChunkUpdate/Tesselator_SPU.h | 2 +- .../ChunkUpdate/TileRenderer_SPU.cpp | 26 +- .../PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp | 2 +- .../PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h | 8 +- .../PS3/SPU_Tasks/ChunkUpdate/task.cpp | 2 +- .../CompressedTileStorage_SPU.cpp | 8 +- .../CompressedTileStorage_SPU.h | 6 +- .../CompressedTile/CompressedTile_main.cpp | 2 +- .../CompressedTileStorage_compress.cpp | 2 +- .../CompressedTileStorage_getData.cpp | 2 +- .../GameRenderer_updateLightTexture.cpp | 2 +- .../LevelRenderChunks_main.cpp | 2 +- .../LevelRenderer_FindNearestChunk.cpp | 2 +- .../LevelRenderer_cull/LevelRenderer_cull.cpp | 2 +- .../LevelRenderer_cull/LevelRenderer_cull.h | 2 +- .../LevelRenderer_zSort.cpp | 2 +- .../LevelRenderer_zSort/LevelRenderer_zSort.h | 4 +- .../SPU_Tasks/PerlinNoise/ImprovedNoise_SPU.h | 2 +- .../SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp | 2 +- .../SPU_Tasks/PerlinNoise/PerlinNoiseJob.h | 2 +- .../SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp | 2 +- .../SPU_Tasks/PerlinNoise/PerlinNoise_SPU.h | 2 +- .../PS3/SPU_Tasks/RLECompress/RLECompress.cpp | 2 +- .../PS3/SPU_Tasks/RLECompress/RLECompress.h | 2 +- .../CompressedTileStorage_SPU.cpp | 8 +- .../CompressedTileStorage_SPU.h | 6 +- .../Renderer_TextureUpdate.cpp | 2 +- .../SPU_Tasks/Texture_blit/Texture_blit.cpp | 2 +- Minecraft.Client/PS3/XboxGameMode.cpp | 2 +- Minecraft.Client/PS3/XboxGameMode.h | 2 +- Minecraft.Client/PS3/Xbox_Minecraft.cpp | 54 +-- Minecraft.Client/PSVita/Iggy/include/iggy.h | 2 +- .../Leaderboards/PSVitaLeaderboardManager.cpp | 10 +- .../Leaderboards/PSVitaLeaderboardManager.h | 4 +- .../PSVita/Network/PSVita_NPToolkit.cpp | 4 +- .../Network/SQRNetworkManager_AdHoc_Vita.cpp | 8 +- .../Network/SQRNetworkManager_AdHoc_Vita.h | 2 +- .../PSVita/Network/SQRNetworkManager_Vita.cpp | 8 +- .../PSVita/Network/SQRNetworkManager_Vita.h | 2 +- .../PSVita/Network/SonyCommerce_Vita.h | 2 +- .../PSVita/Network/SonyRemoteStorage_Vita.cpp | 2 +- .../PSVita/Network/SonyRemoteStorage_Vita.h | 2 +- .../PSVita/Network/SonyVoiceChat_Vita.h | 2 +- .../PSVita/PSVitaExtras/CustomMap.h | 2 +- .../PSVita/PSVitaExtras/CustomSet.h | 2 +- .../PSVita/PSVitaExtras/PSVitaTypes.h | 2 +- .../PSVita/PSVitaExtras/ShutdownManager.cpp | 4 +- Minecraft.Client/PSVita/PSVita_App.cpp | 34 +- Minecraft.Client/PSVita/PSVita_App.h | 4 +- Minecraft.Client/PSVita/PSVita_Minecraft.cpp | 88 ++--- Minecraft.Client/PSVita/PSVita_PlayerUID.cpp | 2 +- .../PSVita/PSVita_UIController.cpp | 4 +- Minecraft.Client/PSVita/PSVita_UIController.h | 2 +- Minecraft.Client/PaintingRenderer.cpp | 10 +- Minecraft.Client/Particle.cpp | 8 +- Minecraft.Client/Particle.h | 4 +- Minecraft.Client/ParticleEngine.cpp | 10 +- Minecraft.Client/PauseScreen.cpp | 8 +- Minecraft.Client/PendingConnection.cpp | 16 +- Minecraft.Client/PendingConnection.h | 2 +- Minecraft.Client/PigRenderer.cpp | 2 +- Minecraft.Client/PistonPieceRenderer.cpp | 6 +- Minecraft.Client/PlayerChunkMap.cpp | 12 +- Minecraft.Client/PlayerChunkMap.h | 4 +- Minecraft.Client/PlayerCloudParticle.cpp | 8 +- Minecraft.Client/PlayerConnection.cpp | 44 +-- Minecraft.Client/PlayerConnection.h | 4 +- Minecraft.Client/PlayerList.cpp | 32 +- Minecraft.Client/PlayerList.h | 2 +- Minecraft.Client/PlayerRenderer.cpp | 14 +- Minecraft.Client/PlayerRenderer.h | 2 +- Minecraft.Client/Polygon.h | 2 +- Minecraft.Client/PreStitchedTextureMap.cpp | 8 +- Minecraft.Client/PreStitchedTextureMap.h | 2 +- Minecraft.Client/ProgressRenderer.cpp | 2 +- Minecraft.Client/ProgressRenderer.h | 2 +- Minecraft.Client/QuadrupedModel.cpp | 2 +- Minecraft.Client/ReceivingLevelScreen.cpp | 2 +- Minecraft.Client/RedDustParticle.cpp | 2 +- Minecraft.Client/RemotePlayer.cpp | 4 +- Minecraft.Client/RemotePlayer.h | 4 +- Minecraft.Client/RenameWorldScreen.cpp | 6 +- Minecraft.Client/Screen.cpp | 4 +- Minecraft.Client/ScrolledSelectionList.cpp | 2 +- Minecraft.Client/SelectWorldScreen.cpp | 6 +- Minecraft.Client/ServerChunkCache.cpp | 20 +- Minecraft.Client/ServerChunkCache.h | 12 +- Minecraft.Client/ServerCommandDispatcher.cpp | 4 +- Minecraft.Client/ServerCommandDispatcher.h | 4 +- Minecraft.Client/ServerConnection.cpp | 6 +- Minecraft.Client/ServerLevel.cpp | 54 +-- Minecraft.Client/ServerLevel.h | 4 +- Minecraft.Client/ServerLevelListener.cpp | 6 +- Minecraft.Client/ServerLevelListener.h | 2 +- Minecraft.Client/ServerPlayer.cpp | 40 +-- Minecraft.Client/ServerPlayer.h | 6 +- Minecraft.Client/ServerPlayerGameMode.cpp | 14 +- Minecraft.Client/ServerScoreboard.h | 2 +- Minecraft.Client/Settings.cpp | 2 +- Minecraft.Client/SheepFurModel.cpp | 2 +- Minecraft.Client/SheepModel.cpp | 2 +- Minecraft.Client/SheepRenderer.cpp | 2 +- Minecraft.Client/SignRenderer.cpp | 8 +- Minecraft.Client/SilverfishModel.cpp | 2 +- Minecraft.Client/SilverfishRenderer.cpp | 2 +- Minecraft.Client/SkeletonModel.cpp | 4 +- Minecraft.Client/SkeletonRenderer.cpp | 2 +- Minecraft.Client/SkullTileRenderer.cpp | 6 +- Minecraft.Client/SlimeRenderer.cpp | 2 +- Minecraft.Client/SmokeParticle.cpp | 2 +- Minecraft.Client/SnowManModel.cpp | 4 +- Minecraft.Client/SnowManRenderer.cpp | 6 +- Minecraft.Client/SnowShovelParticle.cpp | 2 +- Minecraft.Client/SpellParticle.cpp | 2 +- Minecraft.Client/SpiderModel.cpp | 2 +- Minecraft.Client/SpiderRenderer.cpp | 2 +- Minecraft.Client/SquidModel.cpp | 2 +- Minecraft.Client/SquidRenderer.cpp | 2 +- Minecraft.Client/StatsCounter.cpp | 16 +- Minecraft.Client/StatsScreen.cpp | 6 +- Minecraft.Client/StitchSlot.cpp | 2 +- Minecraft.Client/StitchedTexture.cpp | 2 +- Minecraft.Client/StitchedTexture.h | 2 +- Minecraft.Client/SurvivalMode.cpp | 8 +- Minecraft.Client/SuspendedParticle.cpp | 10 +- Minecraft.Client/SuspendedTownParticle.cpp | 4 +- Minecraft.Client/TakeAnimationParticle.cpp | 6 +- Minecraft.Client/TeleportCommand.cpp | 8 +- Minecraft.Client/TeleportCommand.h | 2 +- Minecraft.Client/TerrainParticle.cpp | 6 +- Minecraft.Client/Tesselator.cpp | 8 +- Minecraft.Client/TextEditScreen.cpp | 10 +- Minecraft.Client/Texture.cpp | 4 +- Minecraft.Client/TextureHolder.cpp | 2 +- Minecraft.Client/TextureManager.cpp | 2 +- Minecraft.Client/TextureMap.cpp | 6 +- Minecraft.Client/TextureMap.h | 2 +- Minecraft.Client/TexturePack.h | 2 +- Minecraft.Client/TexturePackRepository.cpp | 4 +- Minecraft.Client/Textures.cpp | 16 +- Minecraft.Client/Textures.h | 2 +- Minecraft.Client/TheEndPortalRenderer.cpp | 6 +- .../TileEntityRenderDispatcher.cpp | 8 +- Minecraft.Client/TileEntityRenderDispatcher.h | 2 +- Minecraft.Client/TileRenderer.cpp | 10 +- Minecraft.Client/Timer.cpp | 2 +- Minecraft.Client/TitleScreen.cpp | 10 +- Minecraft.Client/TntMinecartRenderer.cpp | 4 +- Minecraft.Client/TntRenderer.cpp | 4 +- Minecraft.Client/TrackedEntity.cpp | 24 +- Minecraft.Client/TrapScreen.cpp | 6 +- Minecraft.Client/User.cpp | 2 +- Minecraft.Client/Vertex.h | 2 +- Minecraft.Client/VideoSettingsScreen.cpp | 2 +- Minecraft.Client/ViewportCuller.cpp | 2 +- Minecraft.Client/ViewportCuller.h | 2 +- Minecraft.Client/VillagerGolemModel.cpp | 2 +- Minecraft.Client/VillagerGolemRenderer.cpp | 4 +- Minecraft.Client/VillagerModel.cpp | 2 +- Minecraft.Client/VillagerRenderer.cpp | 2 +- Minecraft.Client/VillagerZombieModel.cpp | 2 +- Minecraft.Client/WaterDropParticle.cpp | 8 +- .../Windows64/Iggy/gdraw/gdraw_d3d11.cpp | 2 +- .../Windows64/Iggy/include/iggy.h | 2 +- .../Leaderboards/WindowsLeaderboardManager.h | 2 +- .../Windows64/Network/WinsockNetLayer.cpp | 4 +- .../Windows64/Network/WinsockNetLayer.h | 2 +- Minecraft.Client/Windows64/Windows64_App.cpp | 20 +- Minecraft.Client/Windows64/Windows64_App.h | 2 +- .../Windows64/Windows64_Minecraft.cpp | 64 ++-- .../Windows64/Windows64_UIController.cpp | 4 +- .../Windows64/Windows64_UIController.h | 2 +- Minecraft.Client/WitchModel.cpp | 2 +- Minecraft.Client/WitchRenderer.cpp | 2 +- Minecraft.Client/WitherBossModel.cpp | 2 +- Minecraft.Client/WitherBossRenderer.cpp | 4 +- Minecraft.Client/WitherSkullRenderer.cpp | 2 +- Minecraft.Client/WolfModel.cpp | 4 +- Minecraft.Client/WolfModel.h | 2 +- Minecraft.Client/WolfRenderer.cpp | 2 +- Minecraft.Client/Xbox/Audio/SoundEngine.cpp | 20 +- Minecraft.Client/Xbox/Audio/SoundEngine.h | 2 +- Minecraft.Client/Xbox/Font/XUI_Font.cpp | 2 +- Minecraft.Client/Xbox/Font/XUI_FontData.cpp | 8 +- Minecraft.Client/Xbox/Font/XUI_FontData.h | 2 +- .../Xbox/Font/XUI_FontRenderer.cpp | 2 +- .../Leaderboards/XboxLeaderboardManager.cpp | 2 +- .../Leaderboards/XboxLeaderboardManager.h | 2 +- .../Xbox/Network/NetworkPlayerXbox.h | 2 +- .../Network/PlatformNetworkManagerXbox.cpp | 6 +- .../Xbox/Network/PlatformNetworkManagerXbox.h | 8 +- .../Xbox/Sentient/DynamicConfigurations.cpp | 4 +- .../Xbox/Sentient/SentientManager.cpp | 18 +- .../Xbox/Social/SocialManager.cpp | 2 +- Minecraft.Client/Xbox/Xbox_App.cpp | 308 +++++++++--------- Minecraft.Client/Xbox/Xbox_Minecraft.cpp | 60 ++-- Minecraft.Client/Xbox/Xbox_UIController.cpp | 4 +- Minecraft.Client/Xbox/Xbox_UIController.h | 2 +- Minecraft.Client/ZombieModel.cpp | 2 +- Minecraft.Client/ZombieRenderer.cpp | 2 +- Minecraft.Client/glWrapper.cpp | 6 +- Minecraft.Client/stdafx.h | 290 ++++++++--------- Minecraft.Client/stubs.cpp | 2 +- Minecraft.World/ArmorItem.cpp | 2 +- Minecraft.World/Arrow.cpp | 4 +- Minecraft.World/Biome.cpp | 2 +- Minecraft.World/BiomeCache.h | 2 +- Minecraft.World/BiomeSource.cpp | 4 +- Minecraft.World/Blaze.cpp | 2 +- Minecraft.World/BucketItem.cpp | 8 +- Minecraft.World/C4JThread.cpp | 6 +- Minecraft.World/CauldronTile.cpp | 2 +- Minecraft.World/CaveSpider.cpp | 2 +- Minecraft.World/Chicken.cpp | 2 +- Minecraft.World/ClockItem.cpp | 4 +- Minecraft.World/Command.cpp | 6 +- Minecraft.World/CommandBlockEntity.cpp | 2 +- Minecraft.World/CompassItem.cpp | 4 +- Minecraft.World/CompressedTileStorage.cpp | 2 +- Minecraft.World/Connection.cpp | 2 +- Minecraft.World/ConsoleSaveFileOriginal.cpp | 14 +- Minecraft.World/ContainerMenu.cpp | 6 +- Minecraft.World/ControlledByPlayerGoal.h | 2 +- Minecraft.World/Cow.cpp | 2 +- Minecraft.World/Creeper.cpp | 2 +- Minecraft.World/Dimension.cpp | 4 +- Minecraft.World/DurangoStats.cpp | 8 +- Minecraft.World/EffectCommand.cpp | 2 +- Minecraft.World/EnchantItemCommand.cpp | 2 +- Minecraft.World/EnderDragon.cpp | 2 +- Minecraft.World/EnderMan.cpp | 2 +- Minecraft.World/Entity.cpp | 9 + Minecraft.World/EntityHorse.cpp | 4 +- Minecraft.World/ExperienceCommand.cpp | 4 +- Minecraft.World/FireTile.cpp | 6 +- Minecraft.World/FoliageColor.cpp | 2 +- Minecraft.World/GenericStats.h | 4 +- Minecraft.World/Ghast.cpp | 2 +- Minecraft.World/Giant.cpp | 2 +- Minecraft.World/GiveItemCommand.cpp | 2 +- Minecraft.World/GrassTile.cpp | 4 +- Minecraft.World/HellDimension.cpp | 4 +- Minecraft.World/LavaSlime.cpp | 2 +- Minecraft.World/Layer.cpp | 2 +- Minecraft.World/LeafTile.cpp | 2 +- Minecraft.World/Level.cpp | 16 +- Minecraft.World/Level.h | 2 +- Minecraft.World/LevelChunk.cpp | 8 +- Minecraft.World/LightningBolt.cpp | 4 +- Minecraft.World/LivingEntity.cpp | 6 +- Minecraft.World/MapItemSavedData.cpp | 8 +- Minecraft.World/Material.cpp | 2 +- Minecraft.World/Minecart.cpp | 4 +- Minecraft.World/Minecraft.World.cpp | 2 +- Minecraft.World/Mob.cpp | 6 +- Minecraft.World/MobSpawner.cpp | 2 +- Minecraft.World/MobSpawner.h | 2 +- Minecraft.World/Monster.cpp | 2 +- Minecraft.World/MonsterPlacerItem.cpp | 2 +- Minecraft.World/MushroomCow.cpp | 2 +- Minecraft.World/Ocelot.cpp | 6 +- Minecraft.World/Ozelot.cpp | 2 +- Minecraft.World/Packet.cpp | 4 +- Minecraft.World/Pig.cpp | 2 +- Minecraft.World/PigZombie.cpp | 2 +- Minecraft.World/PistonBaseTile.cpp | 4 +- Minecraft.World/Player.cpp | 6 +- Minecraft.World/PlayerInfoPacket.cpp | 4 +- Minecraft.World/PortalForcer.cpp | 2 +- Minecraft.World/PotionBrewing.cpp | 2 +- Minecraft.World/RandomLevelSource.cpp | 2 +- Minecraft.World/RedStoneDustTile.cpp | 4 +- Minecraft.World/Sheep.cpp | 2 +- Minecraft.World/SignTileEntity.cpp | 8 +- Minecraft.World/Silverfish.cpp | 2 +- Minecraft.World/Skeleton.cpp | 2 +- Minecraft.World/Slime.cpp | 2 +- Minecraft.World/SnowMan.cpp | 2 +- Minecraft.World/Socket.cpp | 4 +- Minecraft.World/SpawnEggItem.cpp | 2 +- Minecraft.World/Spider.cpp | 2 +- Minecraft.World/Squid.cpp | 2 +- Minecraft.World/Stats.cpp | 2 +- Minecraft.World/StemTile.cpp | 4 +- Minecraft.World/TallGrass.cpp | 2 +- Minecraft.World/TextureAndGeometryPacket.h | 4 +- Minecraft.World/TheEndDimension.cpp | 4 +- Minecraft.World/ThrownEnderpearl.cpp | 4 +- Minecraft.World/TileEntity.h | 2 +- Minecraft.World/TimeCommand.cpp | 4 +- Minecraft.World/ToggleDownfallCommand.cpp | 4 +- Minecraft.World/Villager.cpp | 2 +- Minecraft.World/VillagerGolem.cpp | 2 +- Minecraft.World/WaterLilyTile.cpp | 2 +- Minecraft.World/Wolf.cpp | 2 +- Minecraft.World/Zombie.cpp | 2 +- Minecraft.World/compression.cpp | 6 +- Minecraft.World/compression.h | 2 +- .../net.minecraft.world.entity.projectile.h | 2 +- Minecraft.World/net.minecraft.world.item.h | 4 +- ...net.minecraft.world.level.newbiome.layer.h | 2 +- .../net.minecraft.world.level.storage.h | 4 +- Minecraft.World/stdafx.h | 136 +++++--- Minecraft.World/x64headers/extraX64.h | 20 +- 864 files changed, 3579 insertions(+), 3135 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f179ef3f7..825cdbab3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,4 +229,4 @@ elseif(BACKEND STREQUAL "Cross64") set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT MinecraftClientCross64) else() message(FATAL_ERROR "Invalid Backend.") -endif() +endif() \ No newline at end of file diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp index 7789c52b7..048c76ae7 100644 --- a/Minecraft.Client/AbstractContainerScreen.cpp +++ b/Minecraft.Client/AbstractContainerScreen.cpp @@ -6,9 +6,9 @@ #include "GameMode.h" #include "KeyMapping.h" #include "Options.h" -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.world.inventory.h" +#include "..\Minecraft.World\net.minecraft.locale.h" +#include "..\Minecraft.World\net.minecraft.world.item.h" ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer(); diff --git a/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp index 930e1596c..5e4b888b1 100644 --- a/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp +++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" -#include -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.core.h" +#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\net.minecraft.world.level.h" #include "AbstractProjectileDispenseBehavior.h" shared_ptr AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr dispensed) diff --git a/Minecraft.Client/AbstractProjectileDispenseBehavior.h b/Minecraft.Client/AbstractProjectileDispenseBehavior.h index 93c6a6421..30705a8a0 100644 --- a/Minecraft.Client/AbstractProjectileDispenseBehavior.h +++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "..\Minecraft.World\DefaultDispenseItemBehavior.h" class Projectile; diff --git a/Minecraft.Client/AbstractTexturePack.cpp b/Minecraft.Client/AbstractTexturePack.cpp index 5ff2dda07..80799a4c5 100644 --- a/Minecraft.Client/AbstractTexturePack.cpp +++ b/Minecraft.Client/AbstractTexturePack.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "Textures.h" #include "AbstractTexturePack.h" -#include -#include +#include "..\Minecraft.World\InputOutputStream.h" +#include "..\Minecraft.World\StringHelpers.h" AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name) { diff --git a/Minecraft.Client/AchievementPopup.cpp b/Minecraft.Client/AchievementPopup.cpp index e0c0e4a9e..04f822aba 100644 --- a/Minecraft.Client/AchievementPopup.cpp +++ b/Minecraft.Client/AchievementPopup.cpp @@ -4,10 +4,10 @@ #include "Font.h" #include "Textures.h" #include "Lighting.h" -#include -#include -#include -#include +#include "..\Minecraft.World\System.h" +#include "..\Minecraft.World\net.minecraft.locale.h" +#include "..\Minecraft.World\net.minecraft.stats.h" +#include "..\Minecraft.World\SharedConstants.h" AchievementPopup::AchievementPopup(Minecraft *mc) { diff --git a/Minecraft.Client/AchievementScreen.cpp b/Minecraft.Client/AchievementScreen.cpp index e5dc8d725..26f203262 100644 --- a/Minecraft.Client/AchievementScreen.cpp +++ b/Minecraft.Client/AchievementScreen.cpp @@ -8,10 +8,10 @@ #include "Textures.h" #include "StatsCounter.h" #include "ItemRenderer.h" -#include -#include -#include -#include +#include "..\Minecraft.World\System.h" +#include "..\Minecraft.World\net.minecraft.locale.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\JavaMath.h" diff --git a/Minecraft.Client/AchievementScreen.h b/Minecraft.Client/AchievementScreen.h index a3fd00cba..3c4412e35 100644 --- a/Minecraft.Client/AchievementScreen.h +++ b/Minecraft.Client/AchievementScreen.h @@ -1,6 +1,6 @@ #pragma once #include "Screen.h" -#include +#include "..\Minecraft.World\net.minecraft.stats.h" class StatsCounter; class AchievementScreen : public Screen diff --git a/Minecraft.Client/ArchiveFile.cpp b/Minecraft.Client/ArchiveFile.cpp index 11dd25888..642471a47 100644 --- a/Minecraft.Client/ArchiveFile.cpp +++ b/Minecraft.Client/ArchiveFile.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include -#include +#include "..\Minecraft.World\StringHelpers.h" +#include "..\Minecraft.World\compression.h" #include "ArchiveFile.h" diff --git a/Minecraft.Client/ArchiveFile.h b/Minecraft.Client/ArchiveFile.h index 585374a46..722d570d8 100644 --- a/Minecraft.Client/ArchiveFile.h +++ b/Minecraft.Client/ArchiveFile.h @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "..\Minecraft.World\File.h" +#include "..\Minecraft.World\ArrayWithLength.h" using namespace std; diff --git a/Minecraft.Client/ArrowRenderer.cpp b/Minecraft.Client/ArrowRenderer.cpp index decb7f86c..4698cd6e3 100644 --- a/Minecraft.Client/ArrowRenderer.cpp +++ b/Minecraft.Client/ArrowRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "ArrowRenderer.h" -#include -#include +#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" +#include "..\Minecraft.World\Mth.h" ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS); diff --git a/Minecraft.Client/BatModel.cpp b/Minecraft.Client/BatModel.cpp index d474dae12..ec582fef3 100644 --- a/Minecraft.Client/BatModel.cpp +++ b/Minecraft.Client/BatModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h" #include "BatModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BatRenderer.cpp b/Minecraft.Client/BatRenderer.cpp index 850783d85..629fe014a 100644 --- a/Minecraft.Client/BatRenderer.cpp +++ b/Minecraft.Client/BatRenderer.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h" #include "BatRenderer.h" #include "BatModel.h" diff --git a/Minecraft.Client/BeaconRenderer.cpp b/Minecraft.Client/BeaconRenderer.cpp index 2739b597f..959df6a89 100644 --- a/Minecraft.Client/BeaconRenderer.cpp +++ b/Minecraft.Client/BeaconRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include -#include +#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "..\Minecraft.World\net.minecraft.world.level.h" #include "BeaconRenderer.h" #include "Tesselator.h" diff --git a/Minecraft.Client/BlazeModel.cpp b/Minecraft.Client/BlazeModel.cpp index 3d3623672..68d9ef467 100644 --- a/Minecraft.Client/BlazeModel.cpp +++ b/Minecraft.Client/BlazeModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\Mth.h" #include "BlazeModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BlazeRenderer.cpp b/Minecraft.Client/BlazeRenderer.cpp index 4ca0e2c21..8e0da036b 100644 --- a/Minecraft.Client/BlazeRenderer.cpp +++ b/Minecraft.Client/BlazeRenderer.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "BlazeModel.h" -#include +#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" #include "BlazeRenderer.h" ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE); diff --git a/Minecraft.Client/BoatRenderer.cpp b/Minecraft.Client/BoatRenderer.cpp index 0af9fe1f4..4c2e9baf9 100644 --- a/Minecraft.Client/BoatRenderer.cpp +++ b/Minecraft.Client/BoatRenderer.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "BoatRenderer.h" #include "BoatModel.h" -#include -#include +#include "..\Minecraft.World\net.minecraft.world.entity.item.h" +#include "..\Minecraft.World\Mth.h" ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT); diff --git a/Minecraft.Client/BookModel.cpp b/Minecraft.Client/BookModel.cpp index aa4cee8c2..d032a7f5f 100644 --- a/Minecraft.Client/BookModel.cpp +++ b/Minecraft.Client/BookModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\Mth.h" #include "BookModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/BossMobGuiInfo.cpp b/Minecraft.Client/BossMobGuiInfo.cpp index 9b9b700ef..1cc3cae86 100644 --- a/Minecraft.Client/BossMobGuiInfo.cpp +++ b/Minecraft.Client/BossMobGuiInfo.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "BossMobGuiInfo.h" -#include +#include "../Minecraft.World/BossMob.h" float BossMobGuiInfo::healthProgress = 0.0f; int BossMobGuiInfo::displayTicks = 0; diff --git a/Minecraft.Client/BreakingItemParticle.cpp b/Minecraft.Client/BreakingItemParticle.cpp index 27d962b36..51b721f51 100644 --- a/Minecraft.Client/BreakingItemParticle.cpp +++ b/Minecraft.Client/BreakingItemParticle.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "BreakingItemParticle.h" #include "Tesselator.h" -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "..\Minecraft.World\net.minecraft.world.h" void BreakingItemParticle::_init(Item *item, Textures *textures, int data) { diff --git a/Minecraft.Client/BubbleParticle.cpp b/Minecraft.Client/BubbleParticle.cpp index 68f199116..2d1380eb5 100644 --- a/Minecraft.Client/BubbleParticle.cpp +++ b/Minecraft.Client/BubbleParticle.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "BubbleParticle.h" -#include -#include -#include -#include -#include +#include "..\Minecraft.World\Random.h" +#include "..\Minecraft.World\Mth.h" +#include "..\Minecraft.World\JavaMath.h" +#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "..\Minecraft.World\net.minecraft.world.level.material.h" BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za) { diff --git a/Minecraft.Client/BufferedImage.cpp b/Minecraft.Client/BufferedImage.cpp index 34f1e981a..37662d8a1 100644 --- a/Minecraft.Client/BufferedImage.cpp +++ b/Minecraft.Client/BufferedImage.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\StringHelpers.h" #include "Textures.h" -#include +#include "..\Minecraft.World\ArrayWithLength.h" #include "BufferedImage.h" #ifdef _XBOX diff --git a/Minecraft.Client/Camera.cpp b/Minecraft.Client/Camera.cpp index bed88b121..4de963491 100644 --- a/Minecraft.Client/Camera.cpp +++ b/Minecraft.Client/Camera.cpp @@ -1,10 +1,10 @@ #include "stdafx.h" #include "Camera.h" #include "MemoryTracker.h" -#include -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\TilePos.h" float Camera::xPlayerOffs = 0.0f; float Camera::yPlayerOffs = 0.0f; diff --git a/Minecraft.Client/Camera.h b/Minecraft.Client/Camera.h index 4a40de20d..456c8858d 100644 --- a/Minecraft.Client/Camera.h +++ b/Minecraft.Client/Camera.h @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "..\Minecraft.World\FloatBuffer.h" +#include "..\Minecraft.World\IntBuffer.h" class TilePos; diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp index 34ebfdd4f..b68e6cac0 100644 --- a/Minecraft.Client/ChatScreen.cpp +++ b/Minecraft.Client/ChatScreen.cpp @@ -1,8 +1,8 @@ #include "stdafx.h" #include "ChatScreen.h" -#include "MultiPlayerLocalPlayer.h" -#include -#include +#include "MultiplayerLocalPlayer.h" +#include "..\Minecraft.World\SharedConstants.h" +#include "..\Minecraft.World\StringHelpers.h" const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters; diff --git a/Minecraft.Client/ChestRenderer.cpp b/Minecraft.Client/ChestRenderer.cpp index b99b7de35..97954b55a 100644 --- a/Minecraft.Client/ChestRenderer.cpp +++ b/Minecraft.Client/ChestRenderer.cpp @@ -3,9 +3,9 @@ #include "ChestModel.h" #include "LargeChestModel.h" #include "ModelPart.h" -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\Calendar.h" ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST); //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST); diff --git a/Minecraft.Client/ChickenModel.cpp b/Minecraft.Client/ChickenModel.cpp index 3ae7e4bf5..98ef93587 100644 --- a/Minecraft.Client/ChickenModel.cpp +++ b/Minecraft.Client/ChickenModel.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\Mth.h" #include "ChickenModel.h" #include "ModelPart.h" diff --git a/Minecraft.Client/ChickenRenderer.cpp b/Minecraft.Client/ChickenRenderer.cpp index f88483286..4f369df35 100644 --- a/Minecraft.Client/ChickenRenderer.cpp +++ b/Minecraft.Client/ChickenRenderer.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" -#include +#include "..\Minecraft.World\Mth.h" #include "ChickenRenderer.h" -#include +#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN); diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp index cd1a5d651..d039227bf 100644 --- a/Minecraft.Client/Chunk.cpp +++ b/Minecraft.Client/Chunk.cpp @@ -2,16 +2,16 @@ #include "Chunk.h" #include "TileRenderer.h" #include "TileEntityRenderDispatcher.h" -#include -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" #include "LevelRenderer.h" #ifdef __PS3__ -#include -#include -#include +#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h" +#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h" +#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h" #include "C4JThread_SPU.h" #include "C4JSpursJob.h" diff --git a/Minecraft.Client/Chunk.h b/Minecraft.Client/Chunk.h index 064fb6a34..f7947156f 100644 --- a/Minecraft.Client/Chunk.h +++ b/Minecraft.Client/Chunk.h @@ -1,7 +1,7 @@ #pragma once #include "AllowAllCuller.h" #include "Tesselator.h" -#include +#include "..\Minecraft.World\ArrayWithLength.h" #include "LevelRenderer.h" class Level; diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp index a3eabf9a4..f3510d336 100644 --- a/Minecraft.Client/ClientConnection.cpp +++ b/Minecraft.Client/ClientConnection.cpp @@ -9,55 +9,55 @@ #include "TakeAnimationParticle.h" #include "CritParticle.h" #include "User.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "..\Minecraft.World\net.minecraft.world.level.storage.h" +#include "..\Minecraft.World\net.minecraft.world.level.chunk.h" +#include "..\Minecraft.World\net.minecraft.stats.h" +#include "..\Minecraft.World\net.minecraft.world.entity.h" +#include "..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h" +#include "..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "..\Minecraft.World\net.minecraft.world.entity.animal.h" +#include "..\Minecraft.World\net.minecraft.world.entity.npc.h" +#include "..\Minecraft.World\net.minecraft.world.entity.item.h" +#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h" +#include "..\Minecraft.World\net.minecraft.world.entity.global.h" +#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h" +#include "..\Minecraft.World\net.minecraft.world.entity.monster.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "..\Minecraft.World\net.minecraft.world.item.h" +#include "..\Minecraft.World\net.minecraft.world.item.trading.h" +#include "..\Minecraft.World\net.minecraft.world.level.tile.h" +#include "..\Minecraft.World\net.minecraft.world.inventory.h" +#include "..\Minecraft.World\net.minecraft.world.h" +#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h" +#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "..\Minecraft.World\net.minecraft.world.effect.h" +#include "..\Minecraft.World\net.minecraft.world.food.h" +#include "..\Minecraft.World\SharedConstants.h" +#include "..\Minecraft.World\AABB.h" +#include "..\Minecraft.World\Pos.h" +#include "..\Minecraft.World\Socket.h" #include "Minecraft.h" #include "ProgressRenderer.h" #include "LevelRenderer.h" #include "Options.h" #include "MinecraftServer.h" #include "ClientConstants.h" -#include -#include +#include "..\Minecraft.World\SoundTypes.h" +#include "..\Minecraft.World\BasicTypeContainers.h" #include "TexturePackRepository.h" #ifdef _XBOX -#include +#include "Common\XUI\XUI_Scene_Trading.h" #else -#include +#include "Common\UI\UI.h" #endif #ifdef __PS3__ -#include +#include "PS3/Network/SonyVoiceChat.h" #endif #include "DLCTexturePack.h" #ifdef _DURANGO -#include -#include +#include "..\Minecraft.World\DurangoStats.h" +#include "..\Minecraft.World\GenericStats.h" #endif ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port) diff --git a/Minecraft.Client/ClientConnection.h b/Minecraft.Client/ClientConnection.h index 5c254b404..a80c10f78 100644 --- a/Minecraft.Client/ClientConnection.h +++ b/Minecraft.Client/ClientConnection.h @@ -1,5 +1,5 @@ #pragma once -#include +#include "..\Minecraft.World\net.minecraft.network.h" class Minecraft; class MultiPlayerLevel; class SavedDataStorage; diff --git a/Minecraft.Client/ClockTexture.cpp b/Minecraft.Client/ClockTexture.cpp index 947044b1d..837532fb7 100644 --- a/Minecraft.Client/ClockTexture.cpp +++ b/Minecraft.Client/ClockTexture.cpp @@ -1,9 +1,9 @@ #include "stdafx.h" #include "Minecraft.h" -#include -#include -#include "MultiPlayerLocalPlayer.h" -#include +#include "..\Minecraft.World\net.minecraft.world.level.h" +#include "..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "MultiplayerLocalPlayer.h" +#include "..\Minecraft.World\JavaMath.h" #include "Texture.h" #include "ClockTexture.h" diff --git a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h index 3c073674f..43d700d6d 100644 --- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h +++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h @@ -1,19 +1,19 @@ #pragma once -#include +#include "..\..\..\Minecraft.World\SoundTypes.h" #ifdef _XBOX #elif defined (__PS3__) #undef __in #undef __out -#include +#include "..\..\PS3\Miles\include\mss.h" #elif defined (__PSVITA__) -#include +#include "..\..\PSVITA\Miles\include\mss.h" #elif defined _DURANGO // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT -#include +#include "..\..\Durango\Miles\include\mss.h" #elif defined _WINDOWS64 #include #elif defined _CROSS64 @@ -21,7 +21,7 @@ #else // PS4 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles #define _SEKRIT2 -#include +#include "..\..\Orbis\Miles\include\mss.h" #endif typedef struct diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 9684d0862..486b102ae 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "SoundEngine.h" +<<<<<<< HEAD #include #include #include @@ -9,14 +10,24 @@ #include #include #include +======= +#include "..\Consoles_App.h" +#include "..\..\MultiplayerLocalPlayer.h" +#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "..\..\Minecraft.World\leveldata.h" +#include "..\..\Minecraft.World\mth.h" +#include "..\..\TexturePackRepository.h" +#include "..\..\DLCTexturePack.h" +#include "Common\DLC\DLCAudioFile.h" +>>>>>>> parent of fef5c7b0 (the reformatting, pt 1) #ifdef __PSVITA__ #include #endif #ifdef _WINDOWS64 -#include -#include +#include "..\..\Minecraft.Client\Windows64\Windows64_App.h" +#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h" #endif #ifdef __ORBIS__ diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h index 1dd8410a2..92c99d236 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.h +++ b/Minecraft.Client/Common/Audio/SoundEngine.h @@ -2,7 +2,7 @@ class Mob; class Options; using namespace std; -#include +#include "..\..\Minecraft.World\SoundTypes.h" enum eMUSICFILES { diff --git a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h index 36fe21f28..a46cc76db 100644 --- a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h +++ b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h @@ -1,7 +1,7 @@ #pragma once -#include +#include "..\Minecraft.Client\Common\C4JMemoryPool.h" // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations. diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp index 041e0c666..5c74d5ece 100644 --- a/Minecraft.Client/Common/Colours/ColourTable.cpp +++ b/Minecraft.Client/Common/Colours/ColourTable.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ColourTable.h" -#include +#include "..\..\..\Minecraft.World\StringHelpers.h" unordered_map ColourTable::s_colourNamesMap; diff --git a/Minecraft.Client/Common/ConsoleGameMode.cpp b/Minecraft.Client/Common/ConsoleGameMode.cpp index 1de00ae56..703d3f552 100644 --- a/Minecraft.Client/Common/ConsoleGameMode.cpp +++ b/Minecraft.Client/Common/ConsoleGameMode.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "ConsoleGameMode.h" -#include <./Tutorial/Tutorial.h> +#include ".\Tutorial\Tutorial.h" ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : TutorialMode(iPad, minecraft, connection) diff --git a/Minecraft.Client/Common/ConsoleGameMode.h b/Minecraft.Client/Common/ConsoleGameMode.h index a9f813dd4..983381b59 100644 --- a/Minecraft.Client/Common/ConsoleGameMode.h +++ b/Minecraft.Client/Common/ConsoleGameMode.h @@ -1,5 +1,5 @@ #pragma once -#include <./Tutorial/TutorialMode.h> +#include ".\Tutorial\TutorialMode.h" class ConsoleGameMode : public TutorialMode { diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 8b8efbde1..b476ca909 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -1,64 +1,64 @@  #include "stdafx.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "..\..\Minecraft.World\net.minecraft.world.entity.item.h" +#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h" +#include "..\..\Minecraft.World\net.minecraft.world.phys.h" +#include "..\..\Minecraft.World\InputOutputStream.h" +#include "..\..\Minecraft.World\compression.h" +#include "..\Options.h" +#include "..\MinecraftServer.h" +#include "..\MultiPlayerLevel.h" +#include "..\GameRenderer.h" +#include "..\ProgressRenderer.h" +#include "..\LevelRenderer.h" +#include "..\MobSkinMemTextureProcessor.h" +#include "..\Minecraft.h" +#include "..\ClientConnection.h" +#include "..\MultiPlayerLocalPlayer.h" +#include "..\LocalPlayer.h" +#include "..\..\Minecraft.World\Player.h" +#include "..\..\Minecraft.World\Inventory.h" +#include "..\..\Minecraft.World\Level.h" +#include "..\..\Minecraft.World\FurnaceTileEntity.h" +#include "..\..\Minecraft.World\Container.h" +#include "..\..\Minecraft.World\DispenserTileEntity.h" +#include "..\..\Minecraft.World\SignTileEntity.h" +#include "..\StatsCounter.h" +#include "..\GameMode.h" +#include "..\Xbox\Social\SocialManager.h" +#include "Tutorial\TutorialMode.h" #if defined _XBOX || defined _WINDOWS64 -#include -#include +#include "..\Xbox\XML\ATGXmlParser.h" +#include "..\Xbox\XML\xmlFilesCallback.h" #endif #include "Minecraft_Macros.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "..\PlayerList.h" +#include "..\ServerPlayer.h" +#include "GameRules\ConsoleGameRules.h" +#include "GameRules\ConsoleSchematicFile.h" +#include "..\User.h" +#include "..\..\Minecraft.World\LevelData.h" +#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h" +#include "..\EntityRenderDispatcher.h" +#include "..\..\Minecraft.World\compression.h" +#include "..\TexturePackRepository.h" +#include "..\DLCTexturePack.h" +#include "DLC\DLCPack.h" +#include "..\StringTable.h" #ifndef _XBOX -#include +#include "..\ArchiveFile.h" #endif -#include +#include "..\Minecraft.h" #ifdef _XBOX -#include -#include -#include -#include -#include +#include "..\Xbox\GameConfig\Minecraft.spa.h" +#include "..\Xbox\Network\NetworkPlayerXbox.h" +#include "XUI\XUI_TextEntry.h" +#include "XUI\XUI_XZP_Icons.h" +#include "XUI\XUI_PauseMenu.h" #else -#include -#include +#include "UI\UI.h" +#include "UI\UIScene_PauseMenu.h" #endif #ifdef __PS3__ #include @@ -67,7 +67,7 @@ #include #endif -#include +#include "..\Common\Leaderboards\LeaderboardManager.h" //CMinecraftApp app; unsigned int CMinecraftApp::m_uiLastSignInData = 0; diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h index 288984be8..ec36b7652 100644 --- a/Minecraft.Client/Common/Consoles_App.h +++ b/Minecraft.Client/Common/Consoles_App.h @@ -2,26 +2,26 @@ using namespace std; -#include