refactor: move Common to Platform/Common

4J.Input/4J_Input.cpp

@@ -4,7 +4,7 @@
 // avoiding a coupling dependency on 4J_Render.h.
 
 #include "4J_Input.h"
-#include "../Common/App_enums.h"
+#include "../Minecraft.Client/Platform/Common/App_enums.h"
 #include <GLFW/glfw3.h>
 #include <math.h>
 #include <string.h>

Minecraft.Client/Build/stdafx.h

@@ -215,25 +215,25 @@ typedef XUID GameSessionUID;
 #include "stubs.h"
 #include "../Textures/BufferedImage.h"
 
-#include "../../Common/Network/GameNetworkManager.h"
+#include "../Platform/Common/Network/GameNetworkManager.h"
 
 #ifdef _XBOX
-#include "../../Common/XUI/XUI_Helper.h"
-#include "../../Common/XUI/XUI_Scene_Base.h"
+#include "../Platform/Common/XUI/XUI_Helper.h"
+#include "../Platform/Common/XUI/XUI_Scene_Base.h"
 #endif
 
-#include "../../Common/UI/UIEnums.h"
-#include "../../Common/UI/UIStructs.h"
+#include "../Platform/Common/UI/UIEnums.h"
+#include "../Platform/Common/UI/UIStructs.h"
 // #ifdef _XBOX
-#include "../../Common/App_Defines.h"
-#include "../../Common/App_enums.h"
-#include "../../Common/Tutorial/TutorialEnum.h"
-#include "../../Common/App_structs.h"
+#include "../Platform/Common/App_Defines.h"
+#include "../Platform/Common/App_enums.h"
+#include "../Platform/Common/Tutorial/TutorialEnum.h"
+#include "../Platform/Common/App_structs.h"
 //#endif
 
-#include "../../Common/Consoles_App.h"
-#include "../../Common/Minecraft_Macros.h"
-#include "../../Common/BuildVer.h"
+#include "../Platform/Common/Consoles_App.h"
+#include "../Platform/Common/Minecraft_Macros.h"
+#include "../Platform/Common/BuildVer.h"
 
 // This is generated at build time via scripts/pack_loc.py
 #include "strings.h"
@@ -265,7 +265,7 @@ typedef XUID GameSessionUID;
 	#include "../../Minecraft.Assets/PS3Media/4J_strings.h"
 	#include "../Platform/PS3/XML/ATGXmlParser.h"
 	#include "../Platform/PS3/Social/SocialManager.h"
-	#include "../../Common/Audio/SoundEngine.h"
+	#include "../Platform/Common/Audio/SoundEngine.h"
 	#include "../Platform/PS3/Iggy/include/iggy.h"
 	#include "../Platform/PS3/Iggy/gdraw/gdraw_ps3gcm.h"
 	#include "../Platform/PS3/PS3_UIController.h"
@@ -279,7 +279,7 @@ typedef XUID GameSessionUID;
 	#include "../../Minecraft.Assets/DurangoMedia/4J_strings.h"
 	#include "../Platform/Durango/XML/ATGXmlParser.h"
 	#include "../Platform/Durango/Social/SocialManager.h"
-	#include "../../Common/Audio/SoundEngine.h"
+	#include "../Platform/Common/Audio/SoundEngine.h"
 	#include "../Platform/Durango/Iggy/include/iggy.h"
 	#include "../Platform/Durango/Iggy/gdraw/gdraw_d3d11.h"
 	#include "../Platform/Durango/Durango_UIController.h"
@@ -291,7 +291,7 @@ typedef XUID GameSessionUID;
 	#include "../Platform/Windows64/GameConfig/Minecraft.spa.h"
 	#include "../Platform/Windows64/XML/ATGXmlParser.h"	
 	#include "../Platform/Windows64/Social/SocialManager.h"
-	#include "../../Common/Audio/SoundEngine.h"
+	#include "../Platform/Common/Audio/SoundEngine.h"
 	#include "../Platform/Windows64/Iggy/include/iggy.h"
 	#include "../Platform/Windows64/Iggy/gdraw/gdraw_d3d11.h"
 	#include "../Platform/Windows64/Windows64_UIController.h"
@@ -302,7 +302,7 @@ typedef XUID GameSessionUID;
 	#include "../Platform/Orbis/Sentient/SentientTelemetryCommon.h"
 	#include "../Platform/Orbis/Sentient/DynamicConfigurations.h"
 	#include "../Platform/Orbis/GameConfig/Minecraft.spa.h"
-	#include "../../Common/Audio/SoundEngine.h"
+	#include "../Platform/Common/Audio/SoundEngine.h"
 	#include "../Platform/Linux/Linux_UIController.h"
 	#include "../Platform/Linux/Social/SocialManager.h"
 #elif defined __PSVITA__
@@ -313,7 +313,7 @@ typedef XUID GameSessionUID;
 	#include "../Platform/PSVita/GameConfig/Minecraft.spa.h"
 	#include "../Platform/PSVita/XML/ATGXmlParser.h"
 	#include "../Platform/PSVita/Social/SocialManager.h"
-	#include "../../Common/Audio/SoundEngine.h"
+	#include "../Platform/Common/Audio/SoundEngine.h"
 	#include "../Platform/PSVita/Iggy/include/iggy.h"
 	#include "../Platform/PSVita/Iggy/gdraw/gdraw_psp2.h"
 	#include "../Platform/PSVita/PSVita_UIController.h"
@@ -326,35 +326,35 @@ typedef XUID GameSessionUID;
 	#include "../../Minecraft.Assets/OrbisMedia/4J_strings.h"
 	#include "../Platform/Orbis/XML/ATGXmlParser.h"	
 	#include "../Platform/Windows64/Social/SocialManager.h"
-	#include "../../Common/Audio/SoundEngine.h"
+	#include "../Platform/Common/Audio/SoundEngine.h"
 	#include "../Platform/Orbis/Iggy/include/iggy.h"
 	#include "../Platform/Orbis/Iggy/gdraw/gdraw_orbis.h"
 	#include "../Platform/Orbis/Orbis_UIController.h"
 #endif
 
 #ifdef _XBOX
-#include "../../Common/XUI/XUI_CustomMessages.h"
-#include "../../Common/XUI/XUI_Scene_Inventory_Creative.h"
-#include "../../Common/XUI/XUI_FullscreenProgress.h"
-#include "../../Common/XUI/XUI_ConnectingProgress.h"
-#include "../../Common/XUI/XUI_Scene_CraftingPanel.h"
-#include "../../Common/XUI/XUI_TutorialPopup.h"
-#include "../../Common/XUI/XUI_PauseMenu.h"
+#include "../Platform/Common/XUI/XUI_CustomMessages.h"
+#include "../Platform/Common/XUI/XUI_Scene_Inventory_Creative.h"
+#include "../Platform/Common/XUI/XUI_FullscreenProgress.h"
+#include "../Platform/Common/XUI/XUI_ConnectingProgress.h"
+#include "../Platform/Common/XUI/XUI_Scene_CraftingPanel.h"
+#include "../Platform/Common/XUI/XUI_TutorialPopup.h"
+#include "../Platform/Common/XUI/XUI_PauseMenu.h"
 #endif
-#include "../../Common/ConsoleGameMode.h"
-#include "../../Common/Console_Debug_enum.h"
-#include "../../Common/Console_Awards_enum.h"
-#include "../../Common/Tutorial/TutorialMode.h"
-#include "../../Common/Tutorial/Tutorial.h"
-#include "../../Common/Tutorial/FullTutorialMode.h"
-#include "../../Common/Trial/TrialMode.h"
-#include "../../Common/GameRules/ConsoleGameRules.h"
-#include "../../Common/GameRules/ConsoleSchematicFile.h"
-#include "../../Common/Colours/ColourTable.h"
-#include "../../Common/DLC/DLCSkinFile.h"
-#include "../../Common/DLC/DLCManager.h"
-#include "../../Common/DLC/DLCPack.h"
-#include "../../Common/Telemetry/TelemetryManager.h"
+#include "../Platform/Common/ConsoleGameMode.h"
+#include "../Platform/Common/Console_Debug_enum.h"
+#include "../Platform/Common/Console_Awards_enum.h"
+#include "../Platform/Common/Tutorial/TutorialMode.h"
+#include "../Platform/Common/Tutorial/Tutorial.h"
+#include "../Platform/Common/Tutorial/FullTutorialMode.h"
+#include "../Platform/Common/Trial/TrialMode.h"
+#include "../Platform/Common/GameRules/ConsoleGameRules.h"
+#include "../Platform/Common/GameRules/ConsoleSchematicFile.h"
+#include "../Platform/Common/Colours/ColourTable.h"
+#include "../Platform/Common/DLC/DLCSkinFile.h"
+#include "../Platform/Common/DLC/DLCManager.h"
+#include "../Platform/Common/DLC/DLCPack.h"
+#include "../Platform/Common/Telemetry/TelemetryManager.h"
 
 #ifdef _XBOX
 //#include "../Platform/Xbox/Xbox_App.h"

Minecraft.Client/GameState/StatsCounter.cpp

@@ -9,7 +9,7 @@
 #include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
 #include "../../Minecraft.World/Headers/net.minecraft.world.item.h"
 
-#include "../../Common/Leaderboards/LeaderboardManager.h"
+#include "../Platform/Common/Leaderboards/LeaderboardManager.h"
 
 Stat** StatsCounter::LARGE_STATS[] = {
 	&Stats::walkOneM,

Minecraft.Client/Minecraft.cpp

@@ -65,8 +65,8 @@
 #ifdef _XBOX
 #include "Platform/Xbox/Network/NetworkPlayerXbox.h"
 #endif
-#include "../Common/UI/IUIScene_CreativeMenu.h"
-#include "../Common/UI/UIFontData.h"
+#include "Platform/UI/IUIScene_CreativeMenu.h"
+#include "Platform/UI/UIFontData.h"
 #include "Textures/Packs/DLCTexturePack.h"
 
 #ifdef __ORBIS__

Minecraft.Client/MinecraftServer.cpp

@@ -41,13 +41,13 @@
 #include "../Minecraft.World/Level/Storage/SparseDataStorage.h"
 #include "../Minecraft.World/IO/Streams/Compression.h"
 #ifdef _XBOX
-#include "../Common/XUI/XUI_DebugSetCamera.h"
+#include "Platform/Common/XUI/XUI_DebugSetCamera.h"
 #endif
 #include "Platform/PS3/PS3Extras/ShutdownManager.h"
 #include "Network/ServerCommandDispatcher.h"
 #include "../Minecraft.World/WorldGen/Biomes/BiomeSource.h"
 #include "Network/PlayerChunkMap.h"
-#include "../Common/Telemetry/TelemetryManager.h"
+#include "Platform/Telemetry/TelemetryManager.h"
 
 #define DEBUG_SERVER_DONT_SPAWN_MOBS 0
 

Minecraft.Client/Network/ClientConnection.cpp

@@ -43,9 +43,9 @@
 #include "../../Minecraft.World/Util/SoundTypes.h"
 #include "../Textures/Packs/TexturePackRepository.h"
 #ifdef _XBOX
-#include "../../Common/XUI/XUI_Scene_Trading.h"
+#include "../Platform/Common/XUI/XUI_Scene_Trading.h"
 #else
-#include "../../Common/UI/UI.h"
+#include "../Platform/Common/UI/UI.h"
 #endif
 #ifdef __PS3__
 #include "../Platform/PS3/Network/SonyVoiceChat.h"

Minecraft.Client/Network/PlayerList.cpp

@@ -27,7 +27,7 @@
 #ifdef _XBOX
 #include "../Platform/Xbox/Network/NetworkPlayerXbox.h"
 #elif defined(__PS3__) || defined(__ORBIS__)
-#include "../../Common/Network/Sony/NetworkPlayerSony.h"
+#include "../Platform/Common/Network/Sony/NetworkPlayerSony.h"
 #endif
 
 // 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc.