diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp index 3aa7c55e4..419d18169 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/GameRuleManager.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/File.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp index 6a7b71fa3..8c3e9260f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include #include diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp index c35d4af25..aa94d4973 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp @@ -1,9 +1,10 @@ +#include "Minecraft.Client/Header Files/stdafx.h" + #include #include #include #include -#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp index 66a7f0249..81cc5c460 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/FullTutorial.cpp @@ -1,4 +1,7 @@ #include "Minecraft.Client/Header Files/stdafx.h" + +#include "4J.Common/4J_InputActions.h" + #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.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.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp index 7b42d5a5c..c1e0492cc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/Tutorial/Hints/DiggerItemHint.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/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" #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h index dc57734a4..83f138a20 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIController.h @@ -1,6 +1,8 @@ #pragma once #include "UIEnums.h" +#include "UIStructs.h" +#include "4J_Storage.h" #include "Minecraft.World/Header Files/SoundTypes.h" // 4J Stu - An interface class that defines all the public functions that we use diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp index 7c2e40bf3..43394a049 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "IUIScene_AbstractContainerMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp index 9c5bc5108..43e8bf6a6 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "IUIScene_AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h" #include "java/InputOutputStream/InputOutputStream.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp index 04a83f9d0..12e205d37 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.cpp @@ -1,4 +1,6 @@ #include "Minecraft.Client/Header Files/stdafx.h" +#include "4J.Common/4J_InputActions.h" + #include "Minecraft.World/net/minecraft/world/item/crafting/net.minecraft.world.item.crafting.h" #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp index 4a95ec405..c2b5c7e5d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "IUIScene_CreativeMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp index 63e87a3ca..2757ac1bb 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/Header Files/stdafx.h" + #include "IUIScene_PauseMenu.h" #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp index 6add8b167..3747dc4b8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.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/Components/UIComponent_PressStartToPlay.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp index 7b77da448..b2a1db795 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_PressStartToPlay.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_TutorialPopup.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp index 8e3b61cb9..5381c4979 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIComponent_TutorialPopup.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIComponent_TutorialPopup.h" #include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp index b3d644f8a..f5f2555b7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_HUD.h" #include "Minecraft.Client/net/minecraft/client/renderer/BossMobGuiInfo.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp index 473067674..893ab56e4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_CreateWorldMenu.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h index 87312680d..61e174345 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.h @@ -1,6 +1,7 @@ #pragma once #include "IUIScene_StartGame.h" +#include "Minecraft.Client/Common/Source Files/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/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp index 82f5bd741..993c3bb2e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCMainMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_DLCMainMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp index c787e1fc8..2668cdd1e 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_EULA.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp index aaaae244d..b1c36a210 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_JoinMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp index 4c681cad6..b7d827191 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_JoinMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_JoinMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp index 24e3fdab1..b515f87ca 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_LaunchMoreOptionsMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp index 40c7f8cad..7f910e1d7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LeaderboardsMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LeaderboardsMenu.h" #include "Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp index d85e64a2e..8a7ab08a2 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LoadMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h index 248ecd396..e4e9a6868 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.h @@ -3,6 +3,7 @@ #include #include "IUIScene_StartGame.h" +#include "Minecraft.Client/Common/Source Files/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/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp index b6b8edfa5..776cfb24d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp @@ -1,7 +1,7 @@ #include #include -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LoadOrJoinMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h index 0c7b41409..1f752a824 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.h @@ -1,5 +1,6 @@ #pragma once +#include "java/File.h" #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" class LevelGenerationOptions; diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp index d94a1b70c..86426c15a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "java/Random.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp index 907c503bf..f849d42ae 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_SaveMessage.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp index a93717e38..285271e7c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_SaveMessage.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SaveMessage.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp index ece1302a6..8da69afef 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_TrialExitUpsell.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_TrialExitUpsell.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp index dc362814a..dd90d5240 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_ControlsMenu.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp index 7eeae4e8a..63c52c1ea 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_Credits.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_HelpAndOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp index dde2f4675..afbadbc0c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HelpAndOptionsMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_HowToPlay.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp index eb92a5cd7..383087c5b 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_HowToPlayMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp index 3a40359d4..6fae03a21 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_HowToPlayMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_HowToPlayMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp index 23c0491f6..2cab43278 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp @@ -1,32 +1,35 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include "Minecraft.World/x64headers/extraX64.h" #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_LanguageSelector.h" // strings for buttons in the list -const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[] = { - HAS_LANGUAGE_SYSTEM(IDS_LANG_SYSTEM) HAS_LANGUAGE_EN_US( - IDS_LANG_ENGLISH) HAS_LANGUAGE_DE_DE(IDS_LANG_GERMAN) - HAS_LANGUAGE_ES_ES(IDS_LANG_SPANISH_SPAIN) HAS_LANGUAGE_ES_MX( - IDS_LANG_SPANISH_LATIN_AMERICA) HAS_LANGUAGE_FR_FR(IDS_LANG_FRENCH) - HAS_LANGUAGE_IT_IT(IDS_LANG_ITALIAN) HAS_LANGUAGE_PT_PT( - IDS_LANG_PORTUGUESE_PORTUGAL) - HAS_LANGUAGE_PT_BR(IDS_LANG_PORTUGUESE_BRAZIL) HAS_LANGUAGE_JA_JP( - IDS_LANG_JAPANESE) HAS_LANGUAGE_KO_KR(IDS_LANG_KOREAN) - HAS_LANGUAGE_CN_TW(IDS_LANG_CHINESE_TRADITIONAL) HAS_LANGUAGE_CN_CN( - IDS_LANG_CHINESE_SIMPLIFIED) - HAS_LANGUAGE_DA_DK(IDS_LANG_DANISH) HAS_LANGUAGE_FI_FI( - IDS_LANG_FINISH) HAS_LANGUAGE_NL_NL(IDS_LANG_DUTCH) - HAS_LANGUAGE_PL_PL(IDS_LANG_POLISH) - HAS_LANGUAGE_RU_RU(IDS_LANG_RUSSIAN) - HAS_LANGUAGE_SV_SE(IDS_LANG_SWEDISH) - HAS_LANGUAGE_NB_NO(IDS_LANG_NORWEGIAN) - HAS_LANGUAGE_SK_SK(IDS_LANG_SLOVAK) - HAS_LANGUAGE_CZ_CZ( - IDS_LANG_CZECH) - HAS_LANGUAGE_EL_GR( - IDS_LANG_GREEK) - HAS_LANGUAGE_TR_TR( - IDS_LANG_TURKISH)}; +const unsigned int UIScene_LanguageSelector::m_uiHTPButtonNameA[]= +{ + IDS_LANG_SYSTEM, + IDS_LANG_ENGLISH, + IDS_LANG_GERMAN, + IDS_LANG_SPANISH_SPAIN, + IDS_LANG_SPANISH_LATIN_AMERICA, + IDS_LANG_FRENCH, + IDS_LANG_ITALIAN, + IDS_LANG_PORTUGUESE_PORTUGAL, + IDS_LANG_PORTUGUESE_BRAZIL, + IDS_LANG_JAPANESE, + IDS_LANG_KOREAN, + IDS_LANG_CHINESE_TRADITIONAL, + IDS_LANG_CHINESE_SIMPLIFIED, + IDS_LANG_DANISH, + IDS_LANG_FINISH, + IDS_LANG_DUTCH, + IDS_LANG_POLISH, + IDS_LANG_RUSSIAN, + IDS_LANG_SWEDISH, + IDS_LANG_NORWEGIAN, + // IDS_LANG_SLOVAK, + // IDS_LANG_CZECH, + IDS_LANG_GREEK, + IDS_LANG_TURKISH, +}; UIScene_LanguageSelector::UIScene_LanguageSelector(int iPad, void* initData, UILayer* parentLayer) diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h index 1347c06a6..fb3542a80 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h @@ -1,68 +1,40 @@ #pragma once #include "Minecraft.Client/Common/Source Files/UI/UIScene.h" - -#define HAS_LANGUAGE_SYSTEM(exp) exp, - -#define HAS_LANGUAGE_EN_US(exp) exp, -#define HAS_LANGUAGE_DE_DE(exp) exp, -#define HAS_LANGUAGE_ES_ES(exp) exp, -#define HAS_LANGUAGE_ES_MX(exp) exp, -#define HAS_LANGUAGE_FR_FR(exp) exp, -#define HAS_LANGUAGE_IT_IT(exp) exp, -#define HAS_LANGUAGE_PT_PT(exp) exp, -#define HAS_LANGUAGE_PT_BR(exp) exp, -#define HAS_LANGUAGE_JA_JP(exp) exp, -#define HAS_LANGUAGE_KO_KR(exp) exp, -#define HAS_LANGUAGE_CN_TW(exp) exp, - -#define HAS_LANGUAGE_CN_CN(exp) -#define HAS_LANGUAGE_SK_SK(exp) -#define HAS_LANGUAGE_CZ_CZ(exp) - -#define HAS_LANGUAGE_DA_DK(exp) exp, -#define HAS_LANGUAGE_FI_FI(exp) exp, -#define HAS_LANGUAGE_NL_NL(exp) exp, -#define HAS_LANGUAGE_PL_PL(exp) exp, -#define HAS_LANGUAGE_RU_RU(exp) exp, -#define HAS_LANGUAGE_SV_SE(exp) exp, -#define HAS_LANGUAGE_NB_NO(exp) exp, -#define HAS_LANGUAGE_EL_GR(exp) exp, - -#define HAS_LANGUAGE_TR_TR(exp) +#include "Minecraft.Client/Common/App_Defines.h" +#include "Minecraft.World/x64headers/extraX64.h" class UIScene_LanguageSelector : public UIScene { public: - enum ELangButtons { - eLanguageSelector_LabelNone = -1, - HAS_LANGUAGE_SYSTEM(eLanguageSelector_system) HAS_LANGUAGE_EN_US( - eLanguageSelector_EN_US) HAS_LANGUAGE_DE_DE(eLanguageSelector_DE_DE) - HAS_LANGUAGE_ES_ES(eLanguageSelector_ES_ES) HAS_LANGUAGE_ES_MX( - eLanguageSelector_ES_MX) HAS_LANGUAGE_FR_FR(eLanguageSelector_FR_FR) - HAS_LANGUAGE_IT_IT(eLanguageSelector_IT_IT) HAS_LANGUAGE_PT_PT( - eLanguageSelector_PT_PT) HAS_LANGUAGE_PT_BR(eLanguageSelector_PT_BR) - HAS_LANGUAGE_JA_JP(eLanguageSelector_JA_JP) HAS_LANGUAGE_KO_KR( - eLanguageSelector_KO_KR) HAS_LANGUAGE_CN_TW(eLanguageSelector_CN_TW) - HAS_LANGUAGE_CN_CN(eLanguageSelector_CN_CN) HAS_LANGUAGE_DA_DK( - eLanguageSelector_DA_DK) - HAS_LANGUAGE_FI_FI(eLanguageSelector_FI_FI) HAS_LANGUAGE_NL_NL( - eLanguageSelector_NL_NL) - HAS_LANGUAGE_PL_PL(eLanguageSelector_PL_PL) - HAS_LANGUAGE_RU_RU(eLanguageSelector_RU_RU) - HAS_LANGUAGE_SV_SE( - eLanguageSelector_SV_SE) - HAS_LANGUAGE_NB_NO( - eLanguageSelector_NB_NO) - HAS_LANGUAGE_SK_SK( - eLanguageSelector_SK_SK) - HAS_LANGUAGE_CZ_CZ( - eLanguageSelector_CZ_CZ) - HAS_LANGUAGE_EL_GR( - eLanguageSelector_EL_GR) - HAS_LANGUAGE_TR_TR( - eLanguageSelector_TR_TR) - eLanguageSelector_MAX - }; + enum ELangButtons + { + eLanguageSelector_LabelNone = -1, + eLanguageSelector_system, + eLanguageSelector_EN_US, + eLanguageSelector_DE_DE, + eLanguageSelector_ES_ES, + eLanguageSelector_ES_MX, + eLanguageSelector_FR_FR, + eLanguageSelector_IT_IT, + eLanguageSelector_PT_PT, + eLanguageSelector_PT_BR, + eLanguageSelector_JA_JP, + eLanguageSelector_KO_KR, + eLanguageSelector_CN_TW, + eLanguageSelector_CN_CN, + eLanguageSelector_DA_DK, + eLanguageSelector_FI_FI, + eLanguageSelector_NL_NL, + eLanguageSelector_PL_PL, + eLanguageSelector_RU_RU, + eLanguageSelector_SV_SE, + eLanguageSelector_NB_NO, + eLanguageSelector_SK_SK, + eLanguageSelector_CZ_CZ, + eLanguageSelector_EL_GR, + eLanguageSelector_TR_TR, + eLanguageSelector_MAX + }; private: enum EControls { @@ -99,54 +71,58 @@ protected: void handlePress(F64 controlId, F64 childId); }; -const int uiLangMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = { - HAS_LANGUAGE_SYSTEM(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EN_US( - XC_LANGUAGE_ENGLISH) HAS_LANGUAGE_DE_DE(XC_LANGUAGE_GERMAN) - HAS_LANGUAGE_ES_ES(XC_LANGUAGE_SPANISH) HAS_LANGUAGE_ES_MX( - XC_LANGUAGE_SPANISH) HAS_LANGUAGE_FR_FR(XC_LANGUAGE_FRENCH) - HAS_LANGUAGE_IT_IT(XC_LANGUAGE_ITALIAN) HAS_LANGUAGE_PT_PT( - XC_LANGUAGE_PORTUGUESE) HAS_LANGUAGE_PT_BR(XC_LANGUAGE_PORTUGUESE) - HAS_LANGUAGE_JA_JP(XC_LANGUAGE_JAPANESE) HAS_LANGUAGE_KO_KR( - XC_LANGUAGE_KOREAN) HAS_LANGUAGE_CN_TW(XC_LANGUAGE_TCHINESE) - HAS_LANGUAGE_CN_CN(XC_LANGUAGE_SCHINESE) HAS_LANGUAGE_DA_DK( - XC_LANGUAGE_DANISH) HAS_LANGUAGE_FI_FI(XC_LANGUAGE_FINISH) - HAS_LANGUAGE_NL_NL(XC_LANGUAGE_DUTCH) HAS_LANGUAGE_PL_PL( - XC_LANGUAGE_POLISH) - HAS_LANGUAGE_RU_RU(XC_LANGUAGE_RUSSIAN) - HAS_LANGUAGE_SV_SE(XC_LANGUAGE_SWEDISH) - HAS_LANGUAGE_NB_NO(XC_LANGUAGE_BNORWEGIAN) - HAS_LANGUAGE_SK_SK(XC_LANGUAGE_SLOVAK) - HAS_LANGUAGE_CZ_CZ( - XC_LANGUAGE_CZECH) - HAS_LANGUAGE_EL_GR( - XC_LANGUAGE_GREEK) - HAS_LANGUAGE_TR_TR( - XC_LANGUAGE_TURKISH)}; +const int uiLangMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = +{ + MINECRAFT_LANGUAGE_DEFAULT, + XC_LANGUAGE_ENGLISH, + XC_LANGUAGE_GERMAN, + XC_LANGUAGE_SPANISH, + XC_LANGUAGE_SPANISH, + XC_LANGUAGE_FRENCH, + XC_LANGUAGE_ITALIAN, + XC_LANGUAGE_PORTUGUESE, + XC_LANGUAGE_PORTUGUESE, + XC_LANGUAGE_JAPANESE, + XC_LANGUAGE_KOREAN, + XC_LANGUAGE_TCHINESE, + XC_LANGUAGE_SCHINESE, + XC_LANGUAGE_DANISH, + XC_LANGUAGE_FINISH, + XC_LANGUAGE_DUTCH, + XC_LANGUAGE_POLISH, + XC_LANGUAGE_RUSSIAN, + XC_LANGUAGE_SWEDISH, + XC_LANGUAGE_BNORWEGIAN, + XC_LANGUAGE_SLOVAK, + XC_LANGUAGE_CZECH, + XC_LANGUAGE_GREEK, + XC_LANGUAGE_TURKISH, +}; -const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = { - HAS_LANGUAGE_SYSTEM(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_EN_US( - MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_DE_DE(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_ES_ES(XC_LOCALE_SPAIN) HAS_LANGUAGE_ES_MX( - XC_LOCALE_LATIN_AMERICA) HAS_LANGUAGE_FR_FR(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_IT_IT(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_PT_PT( - XC_LOCALE_PORTUGAL) HAS_LANGUAGE_PT_BR(XC_LOCALE_BRAZIL) - HAS_LANGUAGE_JA_JP(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_KO_KR( - MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_CN_TW(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_CN_CN(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_DA_DK( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_FI_FI(MINECRAFT_LANGUAGE_DEFAULT) HAS_LANGUAGE_NL_NL( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_PL_PL(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_RU_RU(MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_SV_SE( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_NB_NO( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_SK_SK( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_CZ_CZ( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_EL_GR( - MINECRAFT_LANGUAGE_DEFAULT) - HAS_LANGUAGE_TR_TR( - MINECRAFT_LANGUAGE_DEFAULT)}; \ No newline at end of file +const int uiLocaleMap[UIScene_LanguageSelector::eLanguageSelector_MAX] = +{ + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + XC_LOCALE_SPAIN, + XC_LOCALE_LATIN_AMERICA, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + XC_LOCALE_PORTUGAL, + XC_LOCALE_BRAZIL, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, + MINECRAFT_LANGUAGE_DEFAULT, +}; \ No newline at end of file diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp index 785c4900e..e9809a98a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ReinstallMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_ReinstallMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp index f831ca339..8411767b5 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsAudioMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsAudioMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp index f6f165810..e26b59ddc 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_SettingsGraphicsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp index bab27235f..4ef128335 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsGraphicsMenu.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsGraphicsMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp index 937fa6bdc..f8841f81c 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_SettingsOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp index 783d50207..b4bf42147 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsOptionsMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp index 645cf56dc..e310717f7 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsUIMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SettingsUIMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp index b03b529f9..4fdc47b00 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_SkinSelectMenu.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp index b2b1404cb..88c89d9a8 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_AbstractContainerMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp index 78e4322ce..a834b96bf 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp index 9f0a41c21..98825e0d9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp index f44f9f511..95fc9c5ca 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp index d59ab3b25..5d45339ce 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FireworksMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp index 6c0266a64..fc8ea6037 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_FurnaceMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp index c2853e6d0..622ed1dae 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InventoryMenu.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/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp index 5dca3dd2b..c33a46467 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/net/minecraft/util/HtmlString.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.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp index 566faf283..2404cba6a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_CraftingMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.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.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp index b46d7006b..dbc1bcf8f 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_DeathMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_DeathMenu.h" #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp index 4abcb6633..17b72ac2a 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_EndPoem.h" #include "Minecraft.Client/Common/Source Files/UI/UIBitmapFont.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp index 63d5cba8b..5e602954d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameHostOptionsMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGameHostOptionsMenu.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_InGameInfoMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp index 3836d4551..ecd9deaa3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGameInfoMenu.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.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp index 2831e4f60..4dc7c2ee3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGamePlayerOptionsMenu.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_InGameSaveManagementMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp index 884ae312d..14bcb9453 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameSaveManagementMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_InGameSaveManagementMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp index c8d10a1b4..013cad1e0 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_PauseMenu.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp index d37f65597..646f6e597 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" #include "UIScene_SignEntryMenu.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp index 6fbb7ccdd..56d595d53 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_TeleportMenu.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp index 61e64bce6..d40cc8f00 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_ConnectingProgress.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/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_FullscreenProgress.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp index 1ba88c095..30d64b482 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_FullscreenProgress.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_FullscreenProgress.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp index e9ee306d3..7468645ef 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_Keyboard.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_Keyboard.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp index e9e11539d..ee97bf1b3 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_MessageBox.cpp @@ -1,4 +1,8 @@ + #include "Minecraft.Client/Header Files/stdafx.h" + +#include "4J_Profile.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_MessageBox.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp index bf03f2c72..244913c9d 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/Common/Source Files/UI/UI.h" #include "UIScene_QuadrantSignin.h" #include "Minecraft.Client/net/minecraft/client/Minecraft.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h index 55261b4b7..4ee7dade4 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.h @@ -10,10 +10,12 @@ #include "Minecraft.Client/Windows64/Iggy/include/iggy.h" #endif +#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 "UIGroup.h" class UIAbstractBitmapFont; diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp index 720c809bd..9f2cdc457 100644 --- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp @@ -1,8 +1,6 @@ // Minecraft.cpp : Defines the entry point for the application. // - #include "Minecraft.Client/Header Files/stdafx.h" - #include #include // #include @@ -66,7 +64,12 @@ static void sigsegv_handler(int sig) { #include "Minecraft.World/Header Files/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" + #include "4J_Input.h" +#include "4J_Profile.h" +#include "4J.Common/4J_InputActions.h" + // #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h" // #include "../Orbis/Network/Orbis_NPToolkit.h" diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp index 0dec5d869..fed315b0e 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Leaderboards/WindowsLeaderboardManager.cpp @@ -1,5 +1,3 @@ -#include "Minecraft.Client/Header Files/stdafx.h" - #include "WindowsLeaderboardManager.h" LeaderboardManager* LeaderboardManager::m_instance = diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp index 59853aca4..b444262d3 100644 --- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp +++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp @@ -1,7 +1,7 @@ // Minecraft.cpp : Defines the entry point for the application. // -#include "Minecraft.Client/Header Files/stdafx.h" + #include #include diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp index 17b0a6ad4..124a7957c 100644 --- a/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp +++ b/minecraft/Minecraft.Client/Windows64/Windows64_UIController.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Windows64_UIController.h" // Temp diff --git a/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp b/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp index 4e9c3d652..d7756462f 100644 --- a/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp +++ b/minecraft/Minecraft.Client/Windows64/XML/ATGXmlParser.cpp @@ -16,7 +16,6 @@ // Copyright (C) Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------------- -#include "Minecraft.Client/Header Files/stdafx.h" #include "ATGXmlParser.h" #include diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp index cbc83ab3e..a1ed1cb92 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp @@ -3,6 +3,7 @@ #include #include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.h" #include "Minecraft.Client/net/minecraft/server/level/GameMode.h" #include "Minecraft.Client/net/minecraft/client/gui/PauseScreen.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp index 64fdbd3e3..52d60cd37 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp @@ -1,4 +1,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "Gui.h" #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h" #include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h" @@ -35,6 +36,7 @@ #include "Minecraft.Client/net/minecraft/client/ClientConstants.h" #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h" #include "Minecraft.World/net/minecraft/util/Mth.h" +#include "4J.Common/4J_Compat.h" ResourceLocation Gui::PUMPKIN_BLUR_LOCATION = ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR); diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h index 5ad377493..550018b07 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RepairScreen.h @@ -2,7 +2,7 @@ #include -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/net/minecraft/client/gui/inventory/AbstractContainerScreen.h" #include "Minecraft.World/net/minecraft/world/inventory/AnvilMenu.h" #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.ContainerListener.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp index bc2445561..ffc81ed36 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/WitherBossModel.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "WitherBossModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h" #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h" 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 3b46f09bc..2ada35cc0 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,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "DragonModel.h" #include "Minecraft.World/net/minecraft/util/Mth.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/EnderDragon.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp index 60f801435..15742c070 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.World/Header Files/stdafx.h" +#include "Minecraft.Client/Header Files/stdafx.h" #include "Minecraft.World/ConsoleHelpers/PlatformTime.h" #include "ClientConnection.h" #include diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp index 424235c64..a88a47af2 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp @@ -456,9 +456,9 @@ void GameRenderer::bobView(float a) { float bob = player->oBob + (player->bob - player->oBob) * a; float tilt = player->oTilt + (player->tilt - player->oTilt) * a; glTranslatef((float)sinf(b * std::numbers::pi) * bob * 0.5f, - -(float)abs(cosf(b * std::numbers::pi) * bob), 0); + -(float)std::abs(cosf(b * std::numbers::pi) * bob), 0); glRotatef((float)sinf(b * std::numbers::pi) * bob * 3, 0, 0, 1); - glRotatef((float)abs(cosf(b * std::numbers::pi - 0.2f) * bob) * 5, 1, 0, 0); + glRotatef((float)std::abs(cosf(b * std::numbers::pi - 0.2f) * bob) * 5, 1, 0, 0); glRotatef((float)tilt, 1, 0, 0); } diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h index 1f842adb4..c1b3352e7 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/culling/FrustumCuller.h @@ -1,5 +1,5 @@ #pragma once -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Culler.h" #include "Frustum.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp index f935b4e3a..8a352b8de 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderCrystalRenderer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/net/minecraft/client/model/dragon/EnderCrystalModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "EnderCrystalRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp index db83e0d18..363e8656a 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "Minecraft.Client/net/minecraft/client/model/dragon/DragonModel.h" #include "Minecraft.World/net/minecraft/world/entity/boss/enderdragon/net.minecraft.world.entity.boss.enderdragon.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp index f75916e80..961fe625e 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.cpp @@ -1,4 +1,5 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include + #include "EntityRenderDispatcher.h" #include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h" #include "Minecraft.World/net/minecraft/world/entity/animal/net.minecraft.world.entity.animal.h" @@ -194,7 +195,8 @@ EntityRenderer* EntityRenderDispatcher::getRenderer(eINSTANCEOF e) { if (it == renderers.end()) { app.DebugPrintf("Couldn't find renderer for entity of type %d\n", e); // New renderer mapping required in above table - __debugbreak(); + // __debugbreak(); + assert(0); } /* 4J - not doing this hierarchical search anymore. We need to explicitly add renderers for any eINSTANCEOF type that we want to be able to render if diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp index 0105c46e3..01ee94dae 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/WitherBossRenderer.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "WitherBossRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/WitherBossModel.h" #include "MobRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h index 8c7d64b89..dc8cfcae6 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/SimpleIcon.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Minecraft.Client/Header Files/stdafx.h" + #include "StitchedTexture.h" // 4J Added this class to store the uv data that we have pre-calculated and 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 c02661309..14c48eb3d 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,5 @@ #include "Minecraft.Client/Header Files/stdafx.h" + #include "SignRenderer.h" #include "Minecraft.Client/net/minecraft/client/model/SignModel.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp index 0be022ba6..a260fd4db 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "DefaultTexturePack.h" #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h" #include "Minecraft.World/ConsoleHelpers/StringHelpers.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp index f814eb169..83147a9c6 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 "TexturePackRepository.h" #include "DefaultTexturePack.h" #include "FileTexturePack.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInputSource.h b/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInputSource.h index 82b66214a..03dd059c8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInputSource.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/ConsoleInputSource.h @@ -1,5 +1,7 @@ #pragma once +#include + class ConsoleInputSource { public: virtual ~ConsoleInputSource() {} diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp index 5872feac7..dc4737759 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/net/minecraft/client/Minecraft.h" #include diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp index 26a3a3f23..86a21d220 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include #include "PlayerList.h" #include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h index 83ff30167..4f1bb4473 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h @@ -3,6 +3,8 @@ #include #include +#include "4J.Common/4J_Compat.h" + class ServerPlayer; class PlayerChunkMap; class MinecraftServer; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp index 1105d8e51..8fb9b7db8 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/CreativeMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "CreativeMode.h" #include "Minecraft.Client/net/minecraft/client/User.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp index 5e078643d..7f234b670 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/DemoMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "DemoMode.h" #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp index d4555a8c9..fc28a21a1 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.cpp @@ -1,4 +1,5 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include + #include "EntityTracker.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "Minecraft.Client/net/minecraft/server/PlayerList.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h index 268bb475c..98d191ebb 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h @@ -3,9 +3,14 @@ #include "Minecraft.World/ConsoleHelpers/HashExtension.h" #include "java/JavaIntHash.h" +#include +#include +#include + class Entity; class ServerLevel; class ServerPlayer; +class LevelChunk; class TrackedEntity; class MinecraftServer; class Packet; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp index aea33b70e..4b0c13227 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/GameMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "GameMode.h" #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp index 9f79b9c26..2aff6b6fc 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 "ServerLevel.h" #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h" #include "ServerChunkCache.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp index f47b82723..02b4080c5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerPlayer.cpp @@ -1,4 +1,5 @@ -#include "Minecraft.Client/Header Files/stdafx.h" +#include + #include "ServerPlayer.h" #include "ServerPlayerGameMode.h" #include "ServerLevel.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp index 0d5a02378..d35b53c24 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/SurvivalMode.cpp @@ -1,4 +1,4 @@ -#include "Minecraft.Client/Header Files/stdafx.h" + #include "SurvivalMode.h" #include "DemoMode.h" #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h" diff --git a/minecraft/java/include/java/JavaIntHash.h b/minecraft/java/include/java/JavaIntHash.h index c76ef55d2..bc4fa0e33 100644 --- a/minecraft/java/include/java/JavaIntHash.h +++ b/minecraft/java/include/java/JavaIntHash.h @@ -2,6 +2,8 @@ #include "java/Class.h" +#include + // Java doesn't have a default hash value for ints, however, the hashmap itself // does some "supplemental" hashing, so our ints actually get hashed by code as // implemented below. std templates *do* have a standard hash for ints, but it