fix: miles not shutting down, copying extra stuff to output folder, typo, durango output paths & stray pixel on logos

Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1

@@ -24,7 +24,7 @@ foreach ($dir in $directories) {
 }
 
 $folderCopies = @(
-    @{ Source = "Common\Media";    		 Dest = "Common\Media" },
+    @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
     @{ Source = "Common\res";      		 Dest = "Common\res" },
 	@{ Source = "DurangoMedia\Sound";    Dest = "Sound" },
 	@{ Source = "DurangoMedia\DLC";      Dest = "DLC" },
@@ -46,6 +46,7 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
+	@{ Source = "Common\Media\MediaDurango.arc";	Dest = "Common\Media\MediaDurango.arc" },
     @{ Source = "Durango\DurangoExtras\xcompress.dll"; Dest = "xcompress.dll" },
 	@{ Source = "Durango\DLCXbox1.cmp"; Dest = "DLCXbox1.cmp" }
 )
@@ -61,18 +62,7 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\Graphics",
-    "Common\Media\font\RU",
-    "Common\Media\Sound",
-	"Common\Media\de-DE",
-	"Common\Media\es-ES",
-	"Common\Media\fr-FR",
-	"Common\Media\it-IT",
-	"Common\Media\ja-JP",
-	"Common\Media\ko-KR",
-	"Common\Media\pt-BR",
-	"Common\Media\pt-PT",
-	"Common\Media\zh-CHT"
+    "Common\Media\font\RU"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -83,15 +73,14 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "Common\Media",
-    "Common\Media\font",
+	"Common\Media\font",
 	"Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1

@@ -23,7 +23,7 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";		    Dest = "PS4_GAME\music" },
-    @{ Source = "Common\Media";     Dest = "PS4_GAME\Common\Media" },
+    @{ Source = "Common\Media\Font";Dest = "PS4_GAME\Common\Media\Font" },
     @{ Source = "Common\res";       Dest = "PS4_GAME\Common\res" },
 	@{ Source = "OrbisMedia\Sound"; Dest = "PS4_GAME\Orbis\Sound" },
     @{ Source = "OrbisMedia\DLC";   Dest = "PS4_GAME\Orbis\DLC" },
@@ -50,6 +50,7 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
+	@{ Source = "Common\Media\MediaOrbis.arc"; Dest = "PS4_GAME\Common\Media\MediaOrbis.arc" },
     @{ Source = "Orbis\PS4ProductCodes.bin"; Dest = "PS4_GAME\Orbis\PS4ProductCodes.bin" },
 	@{ Source = "Orbis\session_image.jpg"; Dest = "PS4_GAME\Orbis\session_image.jpg" }
 )
@@ -75,18 +76,7 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS4_GAME\Common\Media\Graphics",
-    "PS4_GAME\Common\Media\font\RU",
-    "PS4_GAME\Common\Media\Sound",
-	"PS4_GAME\Common\Media\de-DE",
-	"PS4_GAME\Common\Media\es-ES",
-	"PS4_GAME\Common\Media\fr-FR",
-	"PS4_GAME\Common\Media\it-IT",
-	"PS4_GAME\Common\Media\ja-JP",
-	"PS4_GAME\Common\Media\ko-KR",
-	"PS4_GAME\Common\Media\pt-BR",
-	"PS4_GAME\Common\Media\pt-PT",
-	"PS4_GAME\Common\Media\zh-CHT"
+    "PS4_GAME\Common\Media\font\RU"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -97,15 +87,14 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "PS4_GAME\Common\Media",
-    "PS4_GAME\Common\Media\font",
+	"PS4_GAME\Common\Media\font",
 	"PS4_GAME\Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1

@@ -21,11 +21,11 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";            Dest = "PS3_GAME\USRDIR\music" },
-    @{ Source = "Common\Media";     Dest = "PS3_GAME\USRDIR\Common\Media" },
+    @{ Source = "Common\Media\Font";Dest = "PS3_GAME\USRDIR\Common\Media\Font" },
     @{ Source = "Common\res";       Dest = "PS3_GAME\USRDIR\Common\res" },
 	@{ Source = "PS3Media\DLC";		Dest = "PS3_GAME\USRDIR\DLC" },
     @{ Source = "PS3Media\Sound";   Dest = "PS3_GAME\USRDIR\PS3\Sound" },
-	#@{ Source = "PSVita\Tutorial";  Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
+	#@{ Source = "PSVita\Tutorial"; Dest = "PS3_GAME\USRDIR\PS3\Tutorial" }, # str1k3r - softlocks game
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\LICDIR";  Dest = "PS3_GAME\LICDIR" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\TROPDIR"; Dest = "PS3_GAME\TROPDIR" }
 )
@@ -47,6 +47,7 @@ foreach ($copy in $folderCopies) {
 
 $fileCopies = @(
     @{ Source = "PS3\PS3ProductCodes.bin"; Dest = "PS3_GAME\USRDIR\PS3\PS3ProductCodes.bin" },
+	@{ Source = "Common\Media\MediaPS3.arc"; Dest = "PS3_GAME\USRDIR\Common\Media\MediaPS3.arc" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_DISC.SFB";         Dest = "PS3_DISC.SFB" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\ICON0.PNG";   Dest = "PS3_GAME\ICON0.PNG" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\PS3\PS3_GAME\PARAM.SFO";   Dest = "PS3_GAME\PARAM.SFO" },
@@ -84,18 +85,7 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PS3_GAME\USRDIR\Common\Media\Graphics",
-    "PS3_GAME\USRDIR\Common\Media\font\RU",
-    "PS3_GAME\USRDIR\Common\Media\Sound",
-	"PS3_GAME\USRDIR\Common\Media\de-DE",
-	"PS3_GAME\USRDIR\Common\Media\es-ES",
-	"PS3_GAME\USRDIR\Common\Media\fr-FR",
-	"PS3_GAME\USRDIR\Common\Media\it-IT",
-	"PS3_GAME\USRDIR\Common\Media\ja-JP",
-	"PS3_GAME\USRDIR\Common\Media\ko-KR",
-	"PS3_GAME\USRDIR\Common\Media\pt-BR",
-	"PS3_GAME\USRDIR\Common\Media\pt-PT",
-	"PS3_GAME\USRDIR\Common\Media\zh-CHT"
+    "PS3_GAME\USRDIR\Common\Media\font\RU"
 )
 
 foreach ($dir in $deleteDirs) {
@@ -106,7 +96,6 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "PS3_GAME\USRDIR\Common\Media",
     "PS3_GAME\USRDIR\Common\Media\font",
     "PS3_GAME\USRDIR\Common\Media\font\*"
 )
@@ -114,7 +103,7 @@ $delDirs = @(
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1

@@ -9,8 +9,8 @@ $directories = @(
     "PSVITA_GAME\music",
 	"PSVITA_GAME\PSVita",
 	"PSVITA_GAME\Common",
+	"PSVITA_GAME\Common\res",
     "PSVITA_GAME\Common\Media",
-    "PSVITA_GAME\Common\res",
     "PSVITA_GAME\PSVita\Sound",
     "PSVITA_GAME\PSVita\Tutorial"
 )
@@ -21,7 +21,7 @@ foreach ($dir in $directories) {
 
 $folderCopies = @(
     @{ Source = "music";		     Dest = "PSVITA_GAME\music" },
-    @{ Source = "Common\Media";      Dest = "PSVITA_GAME\Common\Media" },
+    @{ Source = "Common\Media\Font"; Dest = "PSVITA_GAME\Common\Media\Font" },
     @{ Source = "Common\res";        Dest = "PSVITA_GAME\Common\res" },
 	@{ Source = "PSVitaMedia\Sound"; Dest = "PSVITA_GAME\PSVita\Sound" },
 	@{ Source = "PSVitaMedia\DLC";   Dest = "PSVITA_GAME\PSVita\DLC" },
@@ -46,6 +46,7 @@ foreach ($copy in $folderCopies) {
 }
 
 $fileCopies = @(
+	@{ Source = "Common\Media\MediaPSVita.arc";	 Dest = "PSVITA_GAME\Common\Media\MediaPSVita.arc" },
     @{ Source = "PSVita\PSVitaProductCodes.bin"; Dest = "PSVITA_GAME\PSVita\PSVitaProductCodes.bin" },
 	@{ Source = "PSVita\session_image.png";      Dest = "PSVITA_GAME\PSVita\session_image.png" }
 )
@@ -72,18 +73,7 @@ if (Test-Path $builtFile) {
 }
 
 $deleteDirs = @(
-    "PSVITA_GAME\Common\Media\Graphics",
-    "PSVITA_GAME\Common\Media\font\RU",
-    "PSVITA_GAME\Common\Media\Sound",
-	"PSVITA_GAME\Common\Media\de-DE",
-	"PSVITA_GAME\Common\Media\es-ES",
-	"PSVITA_GAME\Common\Media\fr-FR",
-	"PSVITA_GAME\Common\Media\it-IT",
-	"PSVITA_GAME\Common\Media\ja-JP",
-	"PSVITA_GAME\Common\Media\ko-KR",
-	"PSVITA_GAME\Common\Media\pt-BR",
-	"PSVITA_GAME\Common\Media\pt-PT",
-	"PSVITA_GAME\Common\Media\zh-CHT"
+    "PSVITA_GAME\Common\Media\font\RU" 
 )
 
 foreach ($dir in $deleteDirs) {
@@ -94,15 +84,14 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "PSVITA_GAME\Common\Media",
-    "PSVITA_GAME\Common\Media\font",
+	"PSVITA_GAME\Common\Media\font",
 	"PSVITA_GAME\Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.h, *.xui, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaOrbis.arc -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "MSYH.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1

@@ -7,11 +7,10 @@ Write-Host "Windows64 Postbuild: script started. Output Directory: $OutDir, Proj
 
 $directories = @(
     "music",
-    "Windows64\GameHDD",
     "Common\Media",
-    "Common\res",
     "Windows64Media",
-	"redist64"
+    "Windows64\GameHDD",
+	"Windows64\redist64"
 )
 
 foreach ($dir in $directories) {
@@ -21,7 +20,7 @@ foreach ($dir in $directories) {
 $folderCopies = @(
     @{ Source = "music";                Dest = "music" },
     @{ Source = "Common\res";      		Dest = "Common\res" },
-    @{ Source = "Common\Media";    		Dest = "Common\Media" },
+    @{ Source = "Common\Media\Font";	Dest = "Common\Media\Font" },
     @{ Source = "Windows64Media\DLC";  	Dest = "Windows64Media\DLC" },
 	@{ Source = "Windows64Media\Sound";	Dest = "Windows64Media\Sound" },
 	#@{ Source = "PSVita\Tutorial"; 	Dest = "Windows64Media\Tutorial" }, # str1k3r - doesnt even work bru
@@ -45,6 +44,7 @@ foreach ($copy in $folderCopies) {
 
 $fileCopies = @(
     @{ Source = Join-Path $ProjectDir   "Windows64\4JLibs\4J_Input\Windows64\vendor\SDL\lib\x64\SDL3.dll"; Dest = "SDL3.dll" },
+	@{ Source = "Common\Media\MediaWindows64.arc";	Dest = "Common\Media\MediaWindows64.arc" },
 	@{ Source = Join-Path $PSScriptRoot "Contents\Windows64\mss64.dll"; Dest = "mss64.dll" },
 	@{ Source = "Windows64\Iggy\lib\redist64\iggy_w64.dll"; Dest = "iggy_w64.dll" }
 )
@@ -60,18 +60,7 @@ foreach ($copy in $fileCopies) {
 }
 
 $deleteDirs = @(
-    "Common\Media\Graphics",
-    "Common\Media\font\RU", #str1k3r - russian font?
-    "Common\Media\Sound",
-	"Common\Media\de-DE",
-	"Common\Media\es-ES",
-	"Common\Media\fr-FR",
-	"Common\Media\it-IT",
-	"Common\Media\ja-JP",
-	"Common\Media\ko-KR",
-	"Common\Media\pt-BR",
-	"Common\Media\pt-PT",
-	"Common\Media\zh-CHT"
+    "Common\Media\font\RU" #str1k3r - russian font?
 )
 
 foreach ($dir in $deleteDirs) {
@@ -82,15 +71,14 @@ foreach ($dir in $deleteDirs) {
 }
 
 $delDirs = @(
-    "Common\Media",
-    "Common\Media\font",
+	"Common\Media\font",
 	"Common\Media\font\*"
 )
 
 foreach ($dir in $delDirs) {
     $path = Join-Path $OutDir $dir
     if (Test-Path $path) {
-        Get-ChildItem -Path $path -Recurse -Include *.swf, *.txt, *.resx, *.xml, *.loc, *.lang, *.col, *.xui, *.abc, *.h, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
+        Get-ChildItem -Path $path -Recurse -Include *.txt, *.abc, "Mojang Font_7.ttf", "Mojang Font_11.ttf", "DF-DotDotGothic16.ttf", "DFTT_R5.TTC", "candadite2.ttf" -File |
             Remove-Item -Force -ErrorAction SilentlyContinue
     }
 }

Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp

@@ -152,11 +152,18 @@ void UIComponent_PressStartToPlay::showSaveIcon(bool show)
 void UIComponent_PressStartToPlay::showPlayerDisplayName(bool show)
 {
 #if defined _XBOX_ONE || _WINDOWS64
-	if(show)
+	if(RenderManager.IsHiDef())
 	{
-		m_playerDisplayName.setLabel(ProfileManager.GetDisplayName(ProfileManager.GetPrimaryPad()));
+		if(show)
+		{
+			m_playerDisplayName.setLabel(ProfileManager.GetDisplayName(ProfileManager.GetPrimaryPad()));
+		}
+		m_playerDisplayName.setVisible(show);
+	}
+	else
+	{
+		m_playerDisplayName.setVisible(false);
 	}
-	m_playerDisplayName.setVisible(show);
 #else
 	m_playerDisplayName.setVisible(false);
 #endif

Minecraft.Client/Common/UI/UIScene.cpp

@@ -298,7 +298,7 @@ void UIScene::loadMovie()
 	else if(ui.getScreenWidth() >= 960)
 	{
 		moviePath.append(L"Vita.swf");
-		m_loadedResolution = eSceneResolution_Vita;
+		m_loadedResolution = eSceneResolution_544;
 	}
 	else
 	{
@@ -342,7 +342,7 @@ void UIScene::loadMovie()
 
 				moviePath = getMoviePath();
 				moviePath.append(L"Vita.swf");
-				m_loadedResolution = eSceneResolution_Vita;
+				m_loadedResolution = eSceneResolution_544;
 
 				if(!app.hasArchiveFile(moviePath))
 				{

Minecraft.Client/Common/UI/UIScene.h

@@ -74,8 +74,13 @@ public:
 	{
 		eSceneResolution_1080,
 		eSceneResolution_720,
-		eSceneResolution_480,
+		//str1k3r - the Vita name on other platforms didnt seem right to me so renamed it to 544 on non Vita platforms
+#ifdef __PSVITA__
 		eSceneResolution_Vita,
+#else
+		eSceneResolution_544,
+#endif
+		eSceneResolution_480,
 	};
 
 protected:

Minecraft.Client/Minecraft.Client.vcxproj

@@ -638,6 +638,8 @@
     <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath>
     <LibraryPath>$(Console_SdkLibPath)</LibraryPath>
     <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)_$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">
     <LinkIncremental>false</LinkIncremental>
@@ -647,6 +649,8 @@
     <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath>
     <LibraryPath>$(Console_SdkLibPath)</LibraryPath>
     <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)_$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">
     <LinkIncremental>false</LinkIncremental>
@@ -656,6 +660,8 @@
     <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath>
     <LibraryPath>$(Console_SdkLibPath)</LibraryPath>
     <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath>
+    <IntDir>$(Platform)_$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)_$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugContentPackage|Durango'">
     <LinkIncremental>false</LinkIncremental>

Minecraft.Client/Windows64/Windows64_Minecraft.cpp

@@ -63,7 +63,6 @@ extern "C"
 char g_Username[32];
 
 BOOL g_isFullscreen = FALSE;
-BOOL g_bWidescreen = TRUE;
 BOOL g_bResolutionSetByCMD = FALSE;
 
 int g_iScreenWidth = 1920;
@@ -487,8 +486,6 @@ HRESULT InitDevice()
 			g_iScreenHeight = GetSystemMetrics(SM_CYSCREEN);
 		}
 	}
-
-	g_bWidescreen = (g_iScreenHeight > 0 && ((double)g_iScreenWidth / g_iScreenHeight) >= 1.59) ? TRUE : FALSE;
 	
 	//str1k3r - stop hardcoding size and just use the screens actual size
 	UINT width = g_iScreenWidth;
@@ -496,7 +493,7 @@ HRESULT InitDevice()
 
 	UINT createDeviceFlags = 0;
 #ifdef _DEBUG
-	app.DebugPrintf("Screen Width: %d, Screen Height: %d, Widescreen: %s\n", width, height, g_bWidescreen ? "TRUE" : "FALSE");
+	app.DebugPrintf("Screen Width: %d, Screen Height: %d\n", width, height);
 	createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
 #endif
 
@@ -941,6 +938,9 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	ui.shutdown();
 	IggyShutdown();
 
+	//str1k3r - shutdown mss :3
+	AIL_shutdown();
+
 	//str1k3r - cleanup DirectX stuff
 	CleanupDevice();
 

Minecraft.Client/Windows64/Windows64_Minecraft.h

@@ -5,8 +5,6 @@
 static bool isF11Pressed = false;
 static bool wasF11Pressed = false;
 
-extern BOOL g_bWidescreen;
-
 extern int g_iScreenWidth;
 extern int g_iScreenHeight;
 

Minecraft.Client/stdafx.h

@@ -63,19 +63,15 @@ typedef unsigned __int64 __uint64;
 #endif
 
 #ifdef  _WINDOWS64
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#include <d3d11.h>
+#include <DirectXMath.h>
+using namespace DirectX; 
 #include <windows.h>
 #include <malloc.h>
 #include <tchar.h>
-// TODO: reference additional headers your program requires here
-#include <d3d11.h>
-#include <DirectXMath.h>
 #include "Windows64Stubs.h"
-using namespace DirectX; 
-
 #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
-
 #endif
 
 
@@ -164,7 +160,6 @@ typedef XUID GameSessionUID;
 	#include "xbox\4JLibs\inc\4J_XTMS.h"
 	#include "xbox\4JLibs\inc\4J_Storage.h"
 #elif defined (__PS3__)
-
 	#include "PS3\4JLibs\inc\4J_Input.h"
 	#include "PS3\4JLibs\inc\4J_Profile.h"
 	#include "PS3\4JLibs\inc\4J_Render.h"
@@ -236,7 +231,6 @@ typedef XUID GameSessionUID;
 	#include "Xbox\Social\SocialManager.h"
 	#include "Xbox\Audio\SoundEngine.h"
 	#include "Xbox\Xbox_UIController.h"
-
 #elif defined (__PS3__)
 	#include "extraX64client.h"
 	#include "PS3\Sentient\MinecraftTelemetry.h"
@@ -263,7 +257,7 @@ typedef XUID GameSessionUID;
 	#include "DurangoMedia\4J_strings.h"
 	#include "Durango\XML\ATGXmlParser.h"
 	#include "Durango\Social\SocialManager.h"
-#include "Common\Audio\SoundEngine.h"
+	#include "Common\Audio\SoundEngine.h"
 	#include "Durango\Iggy\include\iggy.h"
 	#include "Durango\Iggy\gdraw\gdraw_d3d11.h"
 	#include "Durango\Durango_UIController.h"
@@ -333,9 +327,7 @@ typedef XUID GameSessionUID;
 #include "Common\DLC\DLCPack.h"
 #include "Common\Telemetry\TelemetryManager.h"
 
-#ifdef _XBOX
-//#include "Xbox\Xbox_App.h"
-#elif !defined(__PS3__)
+#if !(defined __PS3__ || _XBOX)
 #include "extraX64client.h"
 #endif
 

Minecraft.World/SignTileEntity.cpp

@@ -167,7 +167,7 @@ void SignTileEntity::setChanged()
 
 void SignTileEntity::SetMessage(int iIndex,wstring &wsText) 
 { 
-	//str1kk3r - if we go over 15 chars, then cut it down to just 15
+	//str1k3r - if we go over 15 chars, then cut it down to just 15
 	if (wsText.length() > MAX_LINE_LENGTH)
 	{
 		 wsText = wsText.substr(0, MAX_LINE_LENGTH);

Minecraft.World/stdafx.h

@@ -15,12 +15,12 @@ typedef unsigned __int64 __uint64;
 
 #ifdef _WINDOWS64
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
+#include <d3d11.h>
+#include <DirectXMath.h>
+using namespace DirectX;
 #include <windows.h>
 #include <malloc.h>
 #include <tchar.h>
-// TODO: reference additional headers your program requires here
-#include <d3d11.h>
 #include "..\Minecraft.Client\Windows64\Windows64Extras\Windows64Stubs.h"
 #endif