diff --git a/BuildScripts/postbuild.ps1 b/BuildScripts/postbuild.ps1 index be5fe0adb..0171f822d 100644 --- a/BuildScripts/postbuild.ps1 +++ b/BuildScripts/postbuild.ps1 @@ -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) { diff --git a/Minecraft.Client/BufferedImage.cpp b/Minecraft.Client/BufferedImage.cpp index 1c95dc2d8..7786cfe90 100644 --- a/Minecraft.Client/BufferedImage.cpp +++ b/Minecraft.Client/BufferedImage.cpp @@ -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 diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp index 5afb56135..63a55a52d 100644 --- a/Minecraft.Client/Common/Audio/SoundEngine.cpp +++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp @@ -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); diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp index 1d0f7312a..d9b240de7 100644 --- a/Minecraft.Client/Common/Consoles_App.cpp +++ b/Minecraft.Client/Common/Consoles_App.cpp @@ -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()) diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp index 26b6a90db..82f33c90f 100644 --- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp +++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp @@ -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"); diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp index 3774a79b6..fc3d2e786 100644 --- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp +++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp @@ -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()) { diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp index 8f9107105..030affd7f 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp +++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp @@ -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__) diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp index c0fc9b6f9..a22d951f7 100644 --- a/Minecraft.Client/Common/UI/UIController.cpp +++ b/Minecraft.Client/Common/UI/UIController.cpp @@ -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: diff --git a/Minecraft.Client/DefaultTexturePack.cpp b/Minecraft.Client/DefaultTexturePack.cpp index 1e361a26a..3d7cbee9a 100644 --- a/Minecraft.Client/DefaultTexturePack.cpp +++ b/Minecraft.Client/DefaultTexturePack.cpp @@ -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); diff --git a/Minecraft.Client/FolderTexturePack.cpp b/Minecraft.Client/FolderTexturePack.cpp index 4022b0d91..02329e877 100644 --- a/Minecraft.Client/FolderTexturePack.cpp +++ b/Minecraft.Client/FolderTexturePack.cpp @@ -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; } diff --git a/Minecraft.Client/Minecraft.Client.vcxproj b/Minecraft.Client/Minecraft.Client.vcxproj index ec31d1c9c..9071d0899 100644 --- a/Minecraft.Client/Minecraft.Client.vcxproj +++ b/Minecraft.Client/Minecraft.Client.vcxproj @@ -753,6 +753,7 @@ false $(SolutionDir)Game/$(Platform)\$(Configuration)\ $(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\ + Minecraft true @@ -790,6 +791,7 @@ false $(SolutionDir)Game/$(Platform)\$(Configuration)\ $(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\ + Minecraft true @@ -1573,7 +1575,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata" Disabled Sync false - $(OutDir)$(ProjectName).pch + $(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\$(OutDir)$(ProjectName).pch MultiThreadedDebug _LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_DEBUG;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions) Disabled @@ -1587,7 +1589,7 @@ if not exist "$(TargetDir)\savedata" mkdir "$(TargetDir)\savedata" true - $(OutDir)$(ProjectName).pdb + $(OutDir)Minecraft.pdb legacy_stdio_definitions.lib;d3d11.lib;d3dcompiler.lib;..\Minecraft.World\x64_Debug\Minecraft.World.lib;%(AdditionalDependencies);XInput9_1_0.lib;wsock32.lib NotSet false @@ -1805,7 +1807,7 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUMaxSpeed Sync false - $(OutDir)$(ProjectName).pch + $(SolutionDir)Build\$(ProjectName)\Intermediate\$(Platform)\$(Configuration)\$(ProjectName).pch MultiThreaded _LARGE_WORLDS;_DEBUG_MENUS_ENABLED;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_SECURE_NO_WARNINGS;_WINDOWS64;%(PreprocessorDefinitions) Disabled @@ -1820,11 +1822,15 @@ xcopy /q /y /i /s /e $(ProjectDir)DurangoMedia\CU $(LayoutDir)Image\Loose\CUtrue /FS /Ob3 %(AdditionalOptions) stdcpp17 - true + false + 16Bytes + Fast + false + true true - $(OutDir)$(ProjectName).pdb + $(OutDir)Minecraft.pdb legacy_stdio_definitions.lib;d3d11.lib;d3dcompiler.lib;XInput9_1_0.lib;Windows64\Iggy\lib\iggy_w64.lib;%(AdditionalDependencies) NotSet false diff --git a/Minecraft.Client/TextureManager.cpp b/Minecraft.Client/TextureManager.cpp index d0eff20d1..cc6c295f6 100644 --- a/Minecraft.Client/TextureManager.cpp +++ b/Minecraft.Client/TextureManager.cpp @@ -107,7 +107,7 @@ vector *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 diff --git a/Minecraft.Client/TexturePack.cpp b/Minecraft.Client/TexturePack.cpp index 4fc13fd3f..423b35d70 100644 --- a/Minecraft.Client/TexturePack.cpp +++ b/Minecraft.Client/TexturePack.cpp @@ -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 diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp index e49235a3b..63e192458 100644 --- a/Minecraft.Client/Textures.cpp +++ b/Minecraft.Client/Textures.cpp @@ -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 diff --git a/Minecraft.Client/Windows64/4JLibs/inc/Render/Render.vcxproj b/Minecraft.Client/Windows64/4JLibs/inc/Render/Render.vcxproj index dc15379b2..a7aa82adf 100644 --- a/Minecraft.Client/Windows64/4JLibs/inc/Render/Render.vcxproj +++ b/Minecraft.Client/Windows64/4JLibs/inc/Render/Render.vcxproj @@ -157,6 +157,9 @@ stdafx.h MultiThreaded libpng\;zlib\;microprofile\;%(AdditionalIncludeDirectories) + 16Bytes + Fast + false diff --git a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib index 070bf91f1..554620cb0 100644 Binary files a/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib and b/Minecraft.Client/Windows64/4JLibs/libs/4J_Render_PC.lib differ diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj index 7034d195f..ae9ca8a32 100644 --- a/Minecraft.World/Minecraft.World.vcxproj +++ b/Minecraft.World/Minecraft.World.vcxproj @@ -1381,6 +1381,10 @@ true /FS /Ob3 %(AdditionalOptions) stdcpp17 + 16Bytes + Fast + false + true true