NaN/cafeberry
0
0 Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

feat: better FatalLoadError, clean up build outputs & fix some def's

Browse Source
This commit is contained in:
str1k3r committed 2026-08-19 01:03:39 -04:00
1 parent 6512a32798
commit fe90a6c640
17 files changed
+309 -63
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.Client/Common/Buildsteps/Durango-postbuild.ps1
+8 -8
View File
@@ -61,8 +61,9 @@ foreach ($copy in $fileCopies) {
}
$deleteDirs = @(
"Common\Media\Sound",
"Common\Media\Graphics",
"Common\Media\font\RU",
"Common\Media\Sound",
"Common\Media\de-DE",
"Common\Media\es-ES",
"Common\Media\fr-FR",
@@ -83,15 +84,14 @@ foreach ($dir in $deleteDirs) {
$delDirs = @(
"Common\Media",
"Common\Media\font"
"Common\Media\font",
"Common\Media\font\*"
)
foreach ($dir in $delDirs) {
if ($delDirs -contains $dir) {
$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", MediaWindows64.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
$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 |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/Orbis-postbuild.ps1
+8 -8
View File
@@ -75,8 +75,9 @@ if (Test-Path $builtFile) {
}
$deleteDirs = @(
"PS4_GAME\Common\Media\Sound",
"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",
@@ -97,16 +98,15 @@ 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) {
if ($delDirs -contains $dir) {
$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", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaPSVita.arc -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
$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 |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1
+8 -8
View File
@@ -84,8 +84,9 @@ if (Test-Path $builtFile) {
}
$deleteDirs = @(
"PS3_GAME\USRDIR\Common\Media\Sound",
"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",
@@ -106,15 +107,14 @@ foreach ($dir in $deleteDirs) {
$delDirs = @(
"PS3_GAME\USRDIR\Common\Media",
"PS3_GAME\USRDIR\Common\Media\font"
"PS3_GAME\USRDIR\Common\Media\font",
"PS3_GAME\USRDIR\Common\Media\font\*"
)
foreach ($dir in $delDirs) {
if ($delDirs -contains $dir) {
$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", MediaDurango.arc, MediaWindows64.arc, MediaOrbis.arc, MediaPSVita.arc -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
$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 |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/PSVita-postbuild.ps1
+8 -8
View File
@@ -72,8 +72,9 @@ if (Test-Path $builtFile) {
}
$deleteDirs = @(
"PSVITA_GAME\Common\Media\Sound",
"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",
@@ -94,16 +95,15 @@ 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) {
if ($delDirs -contains $dir) {
$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", MediaDurango.arc, MediaWindows64.arc, MediaPS3.arc, MediaOrbis.arc -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
$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 |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Buildsteps/Windows64-postbuild.ps1
+8 -8
View File
@@ -60,8 +60,9 @@ foreach ($copy in $fileCopies) {
}
$deleteDirs = @(
"Common\Media\Sound",
"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",
@@ -82,15 +83,14 @@ foreach ($dir in $deleteDirs) {
$delDirs = @(
"Common\Media",
"Common\Media\font"
"Common\Media\font",
"Common\Media\font\*"
)
foreach ($dir in $delDirs) {
if ($delDirs -contains $dir) {
$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", MediaDurango.arc, MediaOrbis.arc, MediaPS3.arc, MediaPSVita.arc -File |
Remove-Item -Force -ErrorAction SilentlyContinue
}
$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 |
Remove-Item -Force -ErrorAction SilentlyContinue
}
}
Minecraft.Client/Common/Consoles_App.cpp
+1 -3
View File
@@ -6453,7 +6453,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN ) );
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT ) );
text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}", GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT ) );
#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
#if !(defined __ORBIS__ || __PS3__)
text = replaceAll(text, L"{*CONTROLLER_VK_START*}", GetVKReplacement(VK_PAD_START ) );
text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}", GetVKReplacement(VK_PAD_BACK ) );
#endif
@@ -9739,7 +9739,6 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
locales.push_back(eMCLang_zhCN);
break;
#if defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined _DURANGO
case XC_LANGUAGE_DANISH:
locales.push_back(eMCLang_daDA);
locales.push_back(eMCLang_daDK);
@@ -9765,7 +9764,6 @@ void CMinecraftApp::getLocale(vector<wstring> &vecWstrLocales)
locales.push_back(eMCLang_enGR);
locales.push_back(eMCLang_enGB);
break;
#endif
}
#endif
Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
+1 -3
View File
@@ -23,9 +23,7 @@ UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initD
// 4J-JEV: This object is persistent, so this string needs to be able to handle language changes.
#ifdef __ORBIS__
m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_X_TO_JOIN), L"{*CONTROLLER_VK_A*}", app.GetVKReplacement(VK_PAD_A) ); });
#elif defined _XBOX_ONE
m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", app.GetVKReplacement(VK_PAD_START) ); });
#elif defined _WINDOWS64
#elif defined _XBOX_ONE || defined _WINDOWS64
m_labelPressStart.init( (UIString) [] { return replaceAll(app.GetString(IDS_PRESS_START_TO_JOIN), L"{*CONTROLLER_VK_START*}", app.GetVKReplacement(VK_PAD_START) ); });
#else
m_labelPressStart.init(IDS_PRESS_START_TO_JOIN);
Minecraft.Client/Durango/DurangoExtras/DurangoStubs.cpp
+1 -2
View File
@@ -61,7 +61,6 @@ DWORD XGetLanguage()
case eMCLang_zhTW:
case eMCLang_zhCHT:
return XC_LANGUAGE_TCHINESE;
case eMCLang_zhCHS:
case eMCLang_zhCN:
return XC_LANGUAGE_SCHINESE;
case eMCLang_ptPT:
@@ -89,7 +88,7 @@ DWORD XGetLanguage()
case eMCLang_trTR:
return XC_LANGUAGE_TURKISH;
case eMCLang_laLAS:
return XC_LANGUAGE_LATINAMERICANSPANISH;
return XC_LOCALE_LATIN_AMERICA;
case eMCLang_elEL:
case eMCLang_elGR:
case eMCLang_enGR: // Hack redirect
Minecraft.Client/Extrax64Stubs.cpp
+2 -2
View File
@@ -369,8 +369,8 @@ void XMemDestroyDecompressionContext(XMEMDECOMPRESSION_CONTEXT Context)
//#ifndef __PS3__
#if !(defined _DURANGO || defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
DWORD XGetLanguage() { return 1; }
DWORD XGetLocale() { return 0; }
//DWORD XGetLanguage() { return 1; }
//DWORD XGetLocale() { return 0; }
DWORD XEnableGuestSignin(BOOL fEnable) { return 0; }
#endif
Minecraft.Client/Minecraft.Client.vcxproj
+70 -6
View File
@@ -484,7 +484,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)Windows64\Windows64Extras;$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
<LinkIncremental>true</LinkIncremental>
@@ -504,7 +504,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)Windows64\Windows64Extras;$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
<LinkIncremental>true</LinkIncremental>
@@ -597,25 +597,25 @@
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<LinkIncremental>false</LinkIncremental>
<OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
<IncludePath>$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)Windows64\Windows64Extras;$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<LinkIncremental>false</LinkIncremental>
<OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
<IncludePath>$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)Windows64\Windows64Extras;$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<LinkIncremental>false</LinkIncremental>
<OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
<IncludePath>$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)Windows64\Windows64Extras;$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">
<LocalDebuggerWorkingDirectory>$(OutDir)</LocalDebuggerWorkingDirectory>
<LinkIncremental>false</LinkIncremental>
<OutputFile>$(OutDir)default$(TargetExt)</OutputFile>
<IncludePath>$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
<IncludePath>$(ProjectDir)Windows64\Windows64Extras;$(ProjectDir)\..\Minecraft.World\x64headers;$(ProjectDir)\Windows64\Sentient\Include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">
<LinkIncremental>false</LinkIncremental>
@@ -16138,6 +16138,38 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_Vita|ORBIS'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="Windows64\Windows64Extras\Windows64Stubs.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="Windows64\Windows64_App.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
@@ -28682,6 +28714,38 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Windows64\Windows64Extras\Windows64Stubs.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|ORBIS'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PS3'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|PSVita'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Xbox 360'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Windows64\Windows64_App.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|Durango'">true</ExcludedFromBuild>
Minecraft.Client/Minecraft.Client.vcxproj.filters
+9
View File
@@ -729,6 +729,9 @@
<Filter Include="Buildsteps">
<UniqueIdentifier>{e5d64ee9-2601-46fd-9b18-254dae9cd85e}</UniqueIdentifier>
</Filter>
<Filter Include="Windows64\Windows64Extras">
<UniqueIdentifier>{7a457cb8-28b7-4bbc-8209-e2ed3adeb8fd}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
@@ -3796,6 +3799,9 @@
<ClInclude Include="Xbox\Xbox_App.h">
<Filter>Xbox</Filter>
</ClInclude>
<ClInclude Include="Windows64\Windows64Extras\Windows64Stubs.h">
<Filter>Windows64\Windows64Extras</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@@ -5940,6 +5946,9 @@
<ClCompile Include="Xbox\Xbox_App.cpp">
<Filter>Xbox</Filter>
</ClCompile>
<ClCompile Include="Windows64\Windows64Extras\Windows64Stubs.cpp">
<Filter>Windows64\Windows64Extras</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Library Include="Xbox\4JLibs\libs\4J_Render_d.lib">
Minecraft.Client/Windows64/Windows64Extras/Windows64Stubs.cpp
+91
View File
@@ -0,0 +1,91 @@
#include "stdafx.h"
//str1k3r - both XGetLanguage & XGetLocale were able to be stolen from Durango as its the exact same as windows
DWORD XGetLanguage()
{
WCHAR wchLocaleName[LOCALE_NAME_MAX_LENGTH];
GetUserDefaultLocaleName(wchLocaleName,LOCALE_NAME_MAX_LENGTH);
eMCLang eLang=(eMCLang)app.get_eMCLang(wchLocaleName);
#ifdef _DEBUG
app.DebugPrintf("XGetLanguage() ==> '%ls'\n", wchLocaleName);
#endif
switch(eLang)
{
case eMCLang_jaJP:
return XC_LANGUAGE_JAPANESE;
case eMCLang_deDE:
case eMCLang_deAT:
return XC_LANGUAGE_GERMAN;
case eMCLang_frFR:
case eMCLang_frCA:
return XC_LANGUAGE_FRENCH;
case eMCLang_esES:
case eMCLang_esMX:
return XC_LANGUAGE_SPANISH;
case eMCLang_itIT:
return XC_LANGUAGE_ITALIAN;
case eMCLang_koKR:
return XC_LANGUAGE_KOREAN;
case eMCLang_zhHK:
case eMCLang_zhSG:
case eMCLang_zhTW:
case eMCLang_zhCHT:
return XC_LANGUAGE_TCHINESE;
case eMCLang_zhCN:
return XC_LANGUAGE_SCHINESE;
case eMCLang_ptPT:
case eMCLang_ptBR:
return XC_LANGUAGE_PORTUGUESE;
case eMCLang_ruRU:
return XC_LANGUAGE_RUSSIAN;
case eMCLang_nlNL:
case eMCLang_nlBE:
return XC_LANGUAGE_DUTCH;
case eMCLang_fiFI:
return XC_LANGUAGE_FINISH;
case eMCLang_svSV:
case eMCLang_svSE:
return XC_LANGUAGE_SWEDISH;
case eMCLang_daDA:
case eMCLang_daDK:
return XC_LANGUAGE_DANISH;
case eMCLang_noNO:
case eMCLang_nnNO:
case eMCLang_nbNO:
return XC_LANGUAGE_BNORWEGIAN;
case eMCLang_plPL:
return XC_LANGUAGE_POLISH;
case eMCLang_trTR:
return XC_LANGUAGE_TURKISH;
case eMCLang_laLAS:
return XC_LOCALE_LATIN_AMERICA;
case eMCLang_elEL:
case eMCLang_elGR:
case eMCLang_enGR:
return XC_LANGUAGE_GREEK;
case eMCLang_csCZ:
case eMCLang_enCZ:
return XC_LANGUAGE_CZECH;
case eMCLang_skSK:
case eMCLang_enSK:
return XC_LANGUAGE_SLOVAK;
case eMCLang_enUS:
case eMCLang_enGB:
case eMCLang_enIE:
case eMCLang_enAU:
case eMCLang_enNZ:
case eMCLang_enCA:
default:
return XC_LANGUAGE_ENGLISH;
}
}
DWORD XGetLocale()
{
WCHAR wchLocaleName[LOCALE_NAME_MAX_LENGTH];
GetUserDefaultLocaleName(wchLocaleName,LOCALE_NAME_MAX_LENGTH);
return app.get_xcLang(wchLocaleName);
}
Minecraft.Client/Windows64/Windows64Extras/Windows64Stubs.h
+4
View File
@@ -0,0 +1,4 @@
#pragma once
DWORD XGetLanguage();
DWORD XGetLocale();
Minecraft.Client/Windows64/Windows64_App.cpp
+85 -4
View File
@@ -41,12 +41,93 @@ void CConsoleMinecraftApp::ExitGame()
void CConsoleMinecraftApp::FatalLoadError()
{
//str1k3r very much inspired by the PS3 FatalLoadError :3
//str1k3r - very much inspired by the PS3 FatalLoadError :3
wchar_t *aStrings[2];
app.DebugPrintf("CConsoleMinecraftApp::FatalLoadError\n");
switch (XGetLanguage())
{
case XC_LANGUAGE_GERMAN:
aStrings[0] = L"Ladefehler";
aStrings[1] = L"Minecraft: Cafeberry Edition konnte nicht geladen werden und kann daher nicht fortgesetzt werden.";
break;
case XC_LANGUAGE_SPANISH:
aStrings[0] = L"Error al cargar";
aStrings[1] = L"Se ha producido un error al cargar Minecraft: Cafeberry Edition y no es posible continuar.";
break;
case XC_LANGUAGE_FRENCH:
aStrings[0] = L"Échec du chargement";
aStrings[1] = L"Le chargement de Minecraft: Cafeberry Edition a échoué : impossible de continuer.";
break;
case XC_LANGUAGE_ITALIAN:
aStrings[0] = L"Errore caricamento";
aStrings[1] = L"Caricamento Minecraft: Cafeberry Edition non riuscito, impossibile continuare.";
break;
case XC_LANGUAGE_JAPANESE:
aStrings[0] = L"ロード エラー";
aStrings[1] = L"Minecraft Cafeberry 版のロードに失敗しました。続行できません";
break;
case XC_LANGUAGE_KOREAN:
aStrings[0] = L"불러오기 오류";
aStrings[1] = L"Minecraft: Cafeberry Edition 을 불러오는 중에 오류가 발생하여 계속할 수 없습니다.";
break;
case XC_LANGUAGE_PORTUGUESE:
aStrings[0] = L"Erro de Carregamento";
aStrings[1] = L"Não foi possível carregar Minecraft: Cafeberry Edition e não é possível continuar.";
break;
case XC_LANGUAGE_RUSSIAN:
aStrings[0] = L"Ошибка при загрузке";
aStrings[1] = L"Не удалось загрузить игру Minecraft: Cafeberry Edition. Продолжить загрузку невозможно.";
break;
case XC_LANGUAGE_TCHINESE:
aStrings[0] = L"載入錯誤";
aStrings[1] = L"無法載入「Minecraft: Cafeberry Edition」，因此無法繼續。";
break;
case XC_LANGUAGE_DUTCH:
aStrings[0] = L"Fout tijdens het laden";
aStrings[1] = L"Minecraft: Cafeberry Edition kan niet worden geladen.";
break;
case XC_LANGUAGE_FINISH:
aStrings[0] = L"Latausvirhe";
aStrings[1] = L"Minecraft: Cafeberry Edition -pelin lataaminen ei onnistunut, eikä sitä voi jatkaa.";
break;
case XC_LANGUAGE_SWEDISH:
aStrings[0] = L"Laddningsfel";
aStrings[1] = L"Minecraft: Cafeberry Edition kunde inte laddas och kan inte fortsätta.";
break;
case XC_LANGUAGE_DANISH:
aStrings[0] = L"Indlæsningsfejl";
aStrings[1] = L"Minecraft: Cafeberry Edition kunne ikke blive indlæst og kan derfor ikke fortsætte.";
break;
case XC_LANGUAGE_BNORWEGIAN:
aStrings[0] = L"Innlastingsfeil";
aStrings[1] = L"Feil under innlasting av Minecraft: Cafeberry Edition. Kan ikke fortsette.";
break;
case XC_LANGUAGE_POLISH:
aStrings[0] = L"Błąd wczytywania";
aStrings[1] = L"Wystąpił błąd podczas wczytywania Minecraft: Edycja Cafeberry. Dalsze działanie jest niemożliwe.";
break;
case XC_LANGUAGE_TURKISH:
aStrings[0] = L"Yükleme Hatası";
aStrings[1] = L"Minecraft: Cafeberry Edition yüklenemedi ve devam edemiyor.";
break;
case XC_LOCALE_LATIN_AMERICA:
aStrings[0] = L"Error al cargar";
aStrings[1] = L"Se produjo un error al cargar Minecraft: Cafeberry Edition y no es posible continuar.";
break;
default:
aStrings[0] = L"Loading Error";
aStrings[1] = L"Minecraft: Cafeberry Edition has failed to load, and cannot continue.";
break;
}
//str1k3r - yes, i made them all say femboy edition (piebot said no :c)
int result = MessageBoxW(
NULL,
L"Minecraft: Femboy Edition has failed to load, and cannot continue.",
L"Loading Error",
MB_OK | MB_ICONERROR
aStrings[1],
aStrings[0],
MB_OK
);
if (result == IDOK) {
Minecraft.Client/stdafx.h
+1
View File
@@ -71,6 +71,7 @@ typedef unsigned __int64 __uint64;
// 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)
Minecraft.World/stdafx.h
+2 -1
View File
@@ -14,13 +14,14 @@ typedef unsigned __int64 __uint64;
#endif
#ifdef _WINDOWS64
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
#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
#ifdef _DURANGO
Minecraft.World/x64headers/extraX64.h
+2 -2
View File
@@ -620,8 +620,8 @@ const int XC_LOCALE_LATIN_AMERICA =240;
#if !(defined _DURANGO || defined __PS3__ || defined __ORBIS__ || defined __PSVITA__)
DWORD XGetLanguage();
DWORD XGetLocale();
//DWORD XGetLanguage();
//DWORD XGetLocale();
DWORD XEnableGuestSignin(BOOL fEnable);
#endif