backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
NSDeathman 2026-03-15 23:09:11 +03:00
parent a9d27ad8f4
commit 4592e80b95
17 changed files with 68 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
BuildScripts/postbuild.ps1
View file

@ -18,12 +18,12 @@ foreach ($dir in $directories) {
}
$copies = @(
@{ Source = "Common\Media"; Dest = "MInecraft.Assets\Common\Media" },
@{ Source = "Common\res"; Dest = "MInecraft.Assets\Common\res" },
@{ Source = "Common\Trial"; Dest = "MInecraft.Assets\Common\Trial" },
@{ Source = "Common\Tutorial"; Dest = "MInecraft.Assets\Common\Tutorial" },
@{ Source = "Common\Media"; Dest = "Assets\Common\Media" },
@{ Source = "Common\res"; Dest = "Assets\Common\res" },
@{ Source = "Common\Trial"; Dest = "Assets\Common\Trial" },
@{ Source = "Common\Tutorial"; Dest = "Assets\Common\Tutorial" },
@{ Source = "Windows64\GameHDD"; Dest = "Windows64\GameHDD" },
@{ Source = "Windows64Media"; Dest = "MInecraft.Assets\Win64" }
@{ Source = "Windows64Media"; Dest = "Assets\Win64" }
)
foreach ($copy in $copies) {

16
Minecraft.Client/BufferedImage.cpp
View file

@ -92,11 +92,11 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive= wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= wstr + L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= wstr + L"/Minecraft.Assets/Common/";
wDrive= wstr + L"/Assets/Common/";
}
#elif __PSVITA__
@ -107,31 +107,31 @@ BufferedImage::BufferedImage(const wstring& File, bool filenameHasExtension /*=f
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive= wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= wstr + L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= wstr + L"/Minecraft.Assets/Common/";
wDrive= wstr + L"/Assets/Common/";
}*/
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive= L"Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= L"Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= L"Minecraft.Assets/Common/";
wDrive= L"Assets/Common/";
}
#else
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive= L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= L"Minecraft.Assets/Common/";
wDrive= L"Assets/Common/";
}
#endif

8
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -64,8 +64,8 @@ void SoundEngine::playMusicTick() {};
#else
#ifdef _WINDOWS64
char SoundEngine::m_szSoundPath[]={"Minecraft.Assets\\Win64\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"Minecraft.Assets\\Win64\\Sound\\music\\"};
char SoundEngine::m_szSoundPath[]={"Assets\\Win64\\Sound\\"};
char SoundEngine::m_szMusicPath[]={"Assets\\Win64\\Sound\\Minecraft\\music\\"};
char SoundEngine::m_szRedistName[]={"redist64"};
#elif defined _DURANGO
char SoundEngine::m_szSoundPath[]={"Sound\\"};
@ -477,7 +477,7 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
iSound, SoundName, szSoundName, x, y, z, volume, pitch);
char basePath[256];
sprintf_s(basePath, "Minecraft.Assets/Win64/Sound/%s", (char*)szSoundName);
sprintf_s(basePath, "Assets/Win64/Sound/%s", (char*)szSoundName);
char finalPath[256];
sprintf_s(finalPath, "%s.wav", basePath);
@ -608,7 +608,7 @@ void SoundEngine::playUI(int iSound, float volume, float pitch)
strcat((char*)szSoundName, SoundName);
char basePath[256];
sprintf_s(basePath, "Minecraft.Assets/Win64/Sound/Minecraft/UI/%s", ConvertSoundPathToName(name));
sprintf_s(basePath, "Assets/Win64/Sound/Minecraft/UI/%s", ConvertSoundPathToName(name));
char finalPath[256];
sprintf_s(finalPath, "%s.wav", basePath);

10
Minecraft.Client/Common/Consoles_App.cpp
View file

@ -4403,15 +4403,15 @@ void CMinecraftApp::loadMediaArchive()
wstring mediapath = L"";
#ifdef __PS3__
mediapath = L"Minecraft.Assets\\Common\\Media\\MediaPS3.arc";
mediapath = L"Assets\\Common\\Media\\MediaPS3.arc";
#elif _WINDOWS64
mediapath = L"Minecraft.Assets\\Common\\Media\\MediaWindows64.arc";
mediapath = L"Assets\\Common\\Media\\MediaWindows64.arc";
#elif __ORBIS__
mediapath = L"Minecraft.Assets\\Common\\Media\\MediaOrbis.arc";
mediapath = L"Assets\\Common\\Media\\MediaOrbis.arc";
#elif _DURANGO
mediapath = L"Minecraft.Assets\\Common\\Media\\MediaDurango.arc";
mediapath = L"Assets\\Common\\Media\\MediaDurango.arc";
#elif __PSVITA__
mediapath = L"Minecraft.Assets\\Common\\Media\\MediaPSVita.arc";
mediapath = L"Assets\\Common\\Media\\MediaPSVita.arc";
#endif
if (!mediapath.empty())

2
Minecraft.Client/Common/GameRules/GameRuleManager.cpp
View file

@ -662,7 +662,7 @@ void GameRuleManager::loadDefaultGameRules()
#else // _XBOX
#ifdef _WINDOWS64
File packedTutorialFile(L"Minecraft.Assets\\Win64\\Tutorial\\Tutorial.pck");
File packedTutorialFile(L"Assets\\Win64\\Tutorial\\Tutorial.pck");
if(!packedTutorialFile.exists()) packedTutorialFile = File(L"Windows64\\Tutorial\\Tutorial.pck");
#elif defined(__ORBIS__)
File packedTutorialFile(L"/app0/orbis/Tutorial/Tutorial.pck");

4
Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
View file

@ -468,7 +468,7 @@ void LevelGenerationOptions::loadBaseSaveData()
if (!dlcFile->getGrfPath().empty())
{
File grf(L"Minecraft.Assets\\Win64\\DLC\\" + packName + L"\\Data\\" + dlcFile->getGrfPath());
File grf(L"Assets\\Win64\\DLC\\" + packName + L"\\Data\\" + dlcFile->getGrfPath());
if (grf.exists())
{
@ -496,7 +496,7 @@ void LevelGenerationOptions::loadBaseSaveData()
if (requiresBaseSave() && !getBaseSavePath().empty())
{
File save(L"Minecraft.Assets\\Win64\\DLC\\" + packName + L"\\Data\\" + baseSave);
File save(L"Assets\\Win64\\DLC\\" + packName + L"\\Data\\" + baseSave);
if (save.exists())
{

2
Minecraft.Client/Common/Network/GameNetworkManager.cpp
View file

@ -230,7 +230,7 @@ bool CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, LPVOID lpParame
#endif
#else
#ifdef _WINDOWS64
wstring fileRoot = L"Minecraft.Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath();
wstring fileRoot = L"Assets\\Win64\\Tutorial\\" + param->levelGen->getBaseSavePath();
File root(fileRoot);
if(!root.exists()) fileRoot = L"Windows64\\Tutorial\\" + param->levelGen->getBaseSavePath();
#elif defined(__ORBIS__)

14
Minecraft.Client/Common/UI/UIController.cpp
View file

@ -359,17 +359,17 @@ UITTFFont *UIController::createFont(EFont fontLanguage)
switch(fontLanguage)
{
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Minecraft.Assets/Common/Media/font/JPN/DF-DotDotGothic16.ttf", 0x203B); // JPN
case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Assets/Common/Media/font/JPN/DF-DotDotGothic16.ttf", 0x203B); // JPN
// case eFont_SimpChinese: Simplified Chinese is unsupported.
case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", "Minecraft.Assets/Common/Media/font/CHT/DFTT_R5.TTC", 0x203B); // CHT
case eFont_Korean: return new UITTFFont("Mojangles_TTF_koKR", "Minecraft.Assets/Common/Media/font/KOR/candadite2.ttf", 0x203B); // KOR
case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", "Assets/Common/Media/font/CHT/DFTT_R5.TTC", 0x203B); // CHT
case eFont_Korean: return new UITTFFont("Mojangles_TTF_koKR", "Assets/Common/Media/font/KOR/candadite2.ttf", 0x203B); // KOR
#else
case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Minecraft.Assets/Common/Media/font/JPN/DFGMaruGothic-Md.ttf", 0x2022); // JPN
case eFont_Japanese: return new UITTFFont("Mojangles_TTF_jaJP", "Assets/Common/Media/font/JPN/DFGMaruGothic-Md.ttf", 0x2022); // JPN
#ifdef _DURANGO
case eFont_SimpChinese: return new UITTFFont("Mojangled_TTF_cnCN", "Minecraft.Assets/Common/Media/font/CHS/MSYH.ttf", 0x2022); // CHS
case eFont_SimpChinese: return new UITTFFont("Mojangled_TTF_cnCN", "Assets/Common/Media/font/CHS/MSYH.ttf", 0x2022); // CHS
#endif
case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", "Minecraft.Assets/Common/Media/font/CHT/DFHeiMedium-B5.ttf", 0x2022); // CHT
case eFont_Korean: return new UITTFFont("Mojangles_TTF_koKR", "Minecraft.Assets/Common/Media/font/KOR/BOKMSD.ttf", 0x2022); // KOR
case eFont_TradChinese: return new UITTFFont("Mojangles_TTF_cnTD", "Assets/Common/Media/font/CHT/DFHeiMedium-B5.ttf", 0x2022); // CHT
case eFont_Korean: return new UITTFFont("Mojangles_TTF_koKR", "Assets/Common/Media/font/KOR/BOKMSD.ttf", 0x2022); // KOR
#endif
// 4J-JEV, Cyrillic characters have been added to this font now, (4/July/14)
// XC_LANGUAGE_RUSSIAN and XC_LANGUAGE_GREEK:

8
Minecraft.Client/DefaultTexturePack.cpp
View file

@ -86,18 +86,18 @@ InputStream *DefaultTexturePack::getResourceImplementation(const wstring &name)/
wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
wDrive = wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\res";
wDrive = wstr + L"\\Assets\\Common\\res\\TitleUpdate\\res";
#elif __PSVITA__
/*
char *pchUsrDir=getUsrDirPath();
wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
wDrive = wstr + L"Minecraft.Assets\\Common\\res\\TitleUpdate\\res";
wDrive = wstr + L"Assets\\Common\\res\\TitleUpdate\\res";
*/
wDrive = L"Minecraft.Assets\\Common\\res\\TitleUpdate\\res";
wDrive = L"Assets\\Common\\res\\TitleUpdate\\res";
#else
wDrive = L"Minecraft.Assets\\Common\\res\\TitleUpdate\\res";
wDrive = L"Assets\\Common\\res\\TitleUpdate\\res";
#endif
InputStream *resource = InputStream::getResourceAsStream(wDrive + name);

4
Minecraft.Client/FolderTexturePack.cpp
View file

@ -27,7 +27,7 @@ InputStream *FolderTexturePack::getResourceImplementation(const wstring &name) /
#ifdef _XBOX
wDrive=L"GAME:\\DummyTexturePack\\res";
#else
wDrive = L"Minecraft.Assets\\Common\\DummyTexturePack\\res";
wDrive = L"Assets\\Common\\DummyTexturePack\\res";
#endif
InputStream *resource = InputStream::getResourceAsStream(wDrive + name);
//InputStream *stream = DefaultTexturePack::class->getResourceAsStream(name);
@ -64,7 +64,7 @@ wstring FolderTexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const ch
#ifdef _XBOX
wDrive=L"GAME:\\" + file->getPath() + L"\\";
#else
wDrive=L"Minecraft.Assets\\Common\\" + file->getPath() + L"\\";
wDrive=L"Assets\\Common\\" + file->getPath() + L"\\";
#endif
return wDrive;
}

16
Minecraft.Client/Minecraft.Client.vcxproj
View file

@ -753,6 +753,7 @@
<EnableClangTidyCodeAnalysis>false</EnableClangTidyCodeAnalysis>
<OutDir>$(SolutionDir)Game/$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\</IntDir>
<TargetName>Minecraft</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
<LinkIncremental>true</LinkIncremental>
@ -790,6 +791,7 @@
<PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
<OutDir>$(SolutionDir)Game/$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\</IntDir>
<TargetName>Minecraft</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
<LinkIncremental>true</LinkIncremental>
@ -1573,7 +1575,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
<Optimization>Disabled</Optimization>
<ExceptionHandling>Sync</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderOutputFile>$(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CallAttributedProfiling>Disabled</CallAttributedProfiling>
@ -1587,7 +1589,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata"</Command>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)Minecraft.pdb</ProgramDatabaseFile>
<AdditionalDependencies>legacy_stdio_definitions.lib;d3d11.lib;d3dcompiler.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;wsock32.lib</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<SuppressStartupBanner>false</SuppressStartupBanner>
@ -1805,7 +1807,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU</C
<Optimization>MaxSpeed</Optimization>
<ExceptionHandling>Sync</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderOutputFile>$(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>_LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CallAttributedProfiling>Disabled</CallAttributedProfiling>
@ -1820,11 +1822,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CU</C
<StringPooling>true</StringPooling>
<AdditionalOptions>/FS /Ob3 %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
<MinimalRebuild>true</MinimalRebuild>
<MinimalRebuild>false</MinimalRebuild>
<StructMemberAlignment>16Bytes</StructMemberAlignment>
<FloatingPointModel>Fast</FloatingPointModel>
<EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
<FunctionLevelLinking>true</FunctionLevelLinking>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>$(OutDir)Minecraft.pdb</ProgramDatabaseFile>
<AdditionalDependencies>legacy_stdio_definitions.lib;d3d11.lib;d3dcompiler.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<SuppressStartupBanner>false</SuppressStartupBanner>

2
Minecraft.Client/TextureManager.cpp
View file

@ -107,7 +107,7 @@ vector<Texture *> *TextureManager::createTextures(const wstring &filename, bool
const char *pchTextureName=wstringtofilename(filename);
char *pchUsrDir = app.GetBDUsrDirPath(pchTextureName);
wstring wstr (pchUsrDir, pchUsrDir+strlen(pchUsrDir));
drive= wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
drive= wstr + L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
#endif

16
Minecraft.Client/TexturePack.cpp
View file

@ -32,12 +32,12 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pc
if(bTitleUpdateTexture)
{
wDrive= wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= wstr + L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= wstr + L"/Minecraft.Assets/Common/";
wDrive= wstr + L"/Assets/Common/";
}
}
else
@ -49,11 +49,11 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pc
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive= wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= wstr + L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= wstr + L"/Minecraft.Assets/Common/";
wDrive= wstr + L"/Assets/Common/";
}
}
@ -64,21 +64,21 @@ wstring TexturePack::getPath(bool bTitleUpdateTexture /*= false*/,const char *pc
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive= wstr + L"Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive= wstr + L"Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive= wstr + L"Minecraft.Assets\\Common\\";
wDrive= wstr + L"Assets\\Common\\";
}
#else
if(bTitleUpdateTexture)
{
// Make the content package point to to the UPDATE: drive is needed
wDrive=L"Minecraft.Assets\\Common\\res\\TitleUpdate\\";
wDrive=L"Assets\\Common\\res\\TitleUpdate\\";
}
else
{
wDrive=L"Minecraft.Assets/Common/";
wDrive=L"Assets/Common/";
}
#endif
#endif

4
Minecraft.Client/Textures.cpp
View file

@ -1409,12 +1409,12 @@ BufferedImage *Textures::readImage(TEXTURE_NAME texId, const wstring& name) // 4
if(isTu)
{
drive= wstr + L"\\Minecraft.Assets\\Common\\res\\TitleUpdate\\";
drive= wstr + L"\\Assets\\Common\\res\\TitleUpdate\\";
}
else
{
drive= wstr + L"\\Minecraft.Assets\\Common\\";
drive= wstr + L"\\Assets\\Common\\";
}
}
else

3
Minecraft.Client/Windows64/4JLibs/inc/Render/Render.vcxproj
View file

@ -157,6 +157,9 @@
<ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>libpng\;zlib\;microprofile\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<StructMemberAlignment>16Bytes</StructMemberAlignment>
<FloatingPointModel>Fast</FloatingPointModel>
<EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
</ClCompile>
<Link>
<SubSystem>

BIN
Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib
View file

Binary file not shown.

4
Minecraft.World/Minecraft.World.vcxproj
View file

@ -1381,6 +1381,10 @@
<StringPooling>true</StringPooling>
<AdditionalOptions>/FS /Ob3 %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp17</LanguageStandard>
<StructMemberAlignment>16Bytes</StructMemberAlignment>
<FloatingPointModel>Fast</FloatingPointModel>
<EnableParallelCodeGeneration>false</EnableParallelCodeGeneration>
<FunctionLevelLinking>true</FunctionLevelLinking>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>