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

Merge remote-tracking branch 'origin/main' into networking

Browse Source
This commit is contained in:
str1k3r committed 2026-09-06 09:33:19 -04:00
2 parents 5065c28b5c 7b4821d329
commit 83e11bdf9b
1476 files changed
+260663 -269030
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.World/ConsoleSaveFileOriginal.cpp
+1 -1
View File
@@ -749,7 +749,7 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
PBYTE pbDataSaveImage=NULL;
DWORD dwDataSizeSaveImage=0;
#if ( defined _XBOX || defined _DURANGO )
#if ( defined _XBOX || defined _DURANGO || defined _WINDOWS64 )
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);
#elif ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ )
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage);
Minecraft.World/ConsoleSaveFileSplit.cpp
+1 -1
View File
@@ -1412,7 +1412,7 @@ void ConsoleSaveFileSplit::Flush(bool autosave, bool updateThumbnail)
PBYTE pbDataSaveImage=NULL;
DWORD dwDataSizeSaveImage=0;
#if ( defined _XBOX || defined _DURANGO )
#if ( defined _XBOX || defined _DURANGO || defined _WINDOWS64 )
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);
#elif ( defined __PS3__ || defined __ORBIS__ )
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage);
Minecraft.World/File.cpp
+1 -6
View File
@@ -36,12 +36,7 @@ File::File( const wstring& pathname ) //: parent( NULL )
else
m_abstractPathName = pathname;
#ifdef _WINDOWS64
string path = wstringtochararray(m_abstractPathName);
string finalPath = StorageManager.GetMountedPath(path.c_str());
if(finalPath.size() == 0) finalPath = path;
m_abstractPathName = convStringToWstring(finalPath);
#elif defined(_DURANGO)
#if (defined _DURANGO || _WINDOWS64)
wstring finalPath = StorageManager.GetMountedPath(m_abstractPathName.c_str());
if(finalPath.size() == 0) finalPath = m_abstractPathName;
m_abstractPathName = finalPath;
Minecraft.World/Minecraft.World.vcxproj
+33 -1
View File
@@ -877,6 +877,11 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">
<ClCompile>
@@ -928,6 +933,13 @@
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">
<ClCompile>
@@ -970,7 +982,7 @@
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>_TU_BUILD;_FINAL_BUILD;NDEBUG;_XBOX;_LIB;_CONTENT_PACKAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_FINAL_BUILD;_ITERATOR_DEBUG_LEVEL=0;NDEBUG;_XBOX;_CONTENT_PACKAGE;%(PreprocessorDefinitions);</PreprocessorDefinitions>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -1306,6 +1318,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='CONTENTPACKAGE_SYMBOLS|x64'">
<ClCompile>
@@ -1329,6 +1346,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseForArt|x64'">
<ClCompile>
@@ -1352,6 +1374,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage_NO_TU|x64'">
<ClCompile>
@@ -1375,6 +1402,11 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Minecraft.Client/Common/Buildsteps/4JLibs.ps1" -Platform "$(Platform)" -Configuration "$(Configuration)" -ProjectDir "$(ProjectDir)/"</Command>
<Message>
</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ContentPackage|Durango'">
<ClCompile>
Minecraft.World/RegionFileCache.cpp
+1
View File
@@ -9,6 +9,7 @@ bool RegionFileCache::useSplitSaves(ESavePlatform platform)
{
switch(platform)
{
case SAVE_FILE_PLATFORM_WIN64:
case SAVE_FILE_PLATFORM_XBONE:
case SAVE_FILE_PLATFORM_PS4:
return true;
Minecraft.World/SignTileEntity.cpp
+5 -1
View File
@@ -167,8 +167,12 @@ void SignTileEntity::setChanged()
void SignTileEntity::SetMessage(int iIndex,wstring &wsText)
{
//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);
}
m_wsmessages[iIndex]=wsText;
}
// 4J-PB - added for string verification
Minecraft.World/stdafx.h
+8 -6
View File
@@ -20,13 +20,14 @@ 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 "..\Minecraft.Client\Windows64\Windows64Extras\Windows64Stubs.h"
#endif
#ifdef _DURANGO
@@ -145,8 +146,8 @@ typedef XUID GameSessionUID;
#include "compression.h"
#include "PerformanceTimer.h"
#if defined(_FINAL_BUILD) && !defined(_WINDOWS64)
#if !defined(_WINDOWS64)
#if defined(_FINAL_BUILD)
#define printf BREAKTHECOMPILE
#define wprintf BREAKTHECOMPILE
#undef OutputDebugString
@@ -154,6 +155,7 @@ typedef XUID GameSessionUID;
#define OutputDebugStringA BREAKTHECOMPILE
#define OutputDebugStringW BREAKTHECOMPILE
#endif
#endif
void MemSect(int sect);
Minecraft.World/x64headers/extraX64.h
+2 -2
View File
@@ -657,8 +657,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