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

fix(Minecraft.World) major fixes, now i need to fix byte bullshit

Browse source
This commit is contained in:
Mohamed Ashraf 2026-03-02 12:18:09 +04:00
parent 84f61b0131
commit 115da74e1e
9 changed files with 102 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Minecraft.Client/CMakeLists.txt
View file

@ -1239,11 +1239,11 @@ set(Windows
source_group("Windows" FILES ${Windows}) source_group("Windows" FILES ${Windows})
set(Windows64 set(Windows64
# "Windows64/Resource.h" "Windows64/Resource.h"
# "Windows64/Windows64_App.cpp" "Windows64/Windows64_App.cpp"
# "Windows64/Windows64_App.h" "Windows64/Windows64_App.h"
# "Windows64/Windows64_UIController.cpp" "Windows64/Windows64_UIController.cpp"
# "Windows64/Windows64_UIController.h" "Windows64/Windows64_UIController.h"
) )
source_group("Windows64" FILES ${Windows64}) source_group("Windows64" FILES ${Windows64})

2
Minecraft.Client/PlayerList.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <deque> #include <deque>
#include "..\Minecraft.World\ArrayWithLength.h" #include "../Minecraft.World/ArrayWithLength.h"
class ServerPlayer; class ServerPlayer;
class PlayerChunkMap; class PlayerChunkMap;

6
Minecraft.Client/ServerPlayer.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "..\Minecraft.World\net.minecraft.world.entity.player.h" #include "../Minecraft.World/net.minecraft.world.entity.player.h"
#include "..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h" #include "../Minecraft.World/net.minecraft.world.inventory.ContainerListener.h"
#include "..\Minecraft.World\ChunkPos.h" #include "../Minecraft.World/ChunkPos.h"
class PlayerConnection; class PlayerConnection;
class MinecraftServer; class MinecraftServer;
class ServerPlayerGameMode; class ServerPlayerGameMode;

25
Minecraft.Client/Windows64/Windows64_App.cpp
View file

@ -1,17 +1,20 @@
#include "stdafx.h" #include "../../Minecraft.World/stdafx.h"
#include "..\Common\Consoles_App.h" #include "../Common/Consoles_App.h"
#include "..\User.h" #include "../User.h"
#include "..\..\Minecraft.Client\Minecraft.h" #include "../../Minecraft.Client/Minecraft.h"
#include "..\..\Minecraft.Client\MinecraftServer.h" #include "../../Minecraft.Client/MinecraftServer.h"
#include "..\..\Minecraft.Client\PlayerList.h" #include "../../Minecraft.Client/PlayerList.h"
#include "..\..\Minecraft.Client\ServerPlayer.h" #include "../../Minecraft.Client/ServerPlayer.h"
#include "..\..\Minecraft.World\Level.h" #include "../../Minecraft.World/Level.h"
#include "..\..\Minecraft.World\LevelSettings.h" #include "../../Minecraft.World/LevelSettings.h"
#include "..\..\Minecraft.World\BiomeSource.h" #include "../../Minecraft.World/BiomeSource.h"
#include "..\..\Minecraft.World\LevelType.h" #include "../../Minecraft.World/LevelType.h"
#include "Windows64_App.h"
CConsoleMinecraftApp app; CConsoleMinecraftApp app;
#define CONTEXT_GAME_STATE 0
CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp() CConsoleMinecraftApp::CConsoleMinecraftApp() : CMinecraftApp()
{ {
} }

5
Minecraft.World/BasicTypeContainers.h
View file

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <climits>
#include <cfloat>
class Byte class Byte
{ {
@ -72,4 +75,4 @@ public:
// As such I have renamed it so that we don't confuse it with places where we should use std::string // As such I have renamed it so that we don't confuse it with places where we should use std::string
class _String class _String
{ {
}; };

4
Minecraft.World/BiomeCache.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
#include "..\Minecraft.World\JavaIntHash.h" #include "../Minecraft.World/JavaIntHash.h"
class BiomeCache class BiomeCache
{ {
@ -49,4 +49,4 @@ public:
private: private:
CRITICAL_SECTION m_CS; CRITICAL_SECTION m_CS;
}; };

2
Minecraft.World/ByteBuffer.cpp
View file

@ -475,4 +475,4 @@ ByteBuffer_IO::~ByteBuffer_IO()
// delete buffer; // delete buffer;
RenderManager.freeIOMem(buffer); RenderManager.freeIOMem(buffer);
} }
#endif // __PS3__ #endif // __PS3__

81
Minecraft.World/ConsoleSaveFileOriginal.cpp
View file

@ -20,20 +20,30 @@
#define RESERVE_ALLOCATION MEM_RESERVE #define RESERVE_ALLOCATION MEM_RESERVE
#define COMMIT_ALLOCATION MEM_COMMIT #define COMMIT_ALLOCATION MEM_COMMIT
#else #else
#include "../Minecraft.Client/Windows64/Windows64_App.h"
#include <unistd.h>
#include <sys/types.h>
#include <locale>
#include <fcntl.h>
#include <linux/mman.h> #include <linux/mman.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <fcntl.h> #include <fcntl.h>
#define RESERVE_ALLOCATION 0 #define RESERVE_ALLOCATION 0
#define COMMIT_ALLOCATION MAP_PRIVATE | MAP_ANONYMOUS #define COMMIT_ALLOCATION MAP_PRIVATE | MAP_ANONYMOUS
#define PAGE_READWRITE O_RDWR #define PAGE_READWRITE O_RDWR
#include <codecvt>
#endif #endif
extern CConsoleMinecraftApp app;
unsigned int ConsoleSaveFileOriginal::pagesCommitted = 0; unsigned int ConsoleSaveFileOriginal::pagesCommitted = 0;
void *ConsoleSaveFileOriginal::pvHeap = NULL; void *ConsoleSaveFileOriginal::pvHeap = NULL;
ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID pvSaveData /*= NULL*/, DWORD dFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/) ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID pvSaveData /*= NULL*/, DWORD dFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/)
{ {
#ifndef __linux__
InitializeCriticalSectionAndSpinCount(&m_lock,5120); InitializeCriticalSectionAndSpinCount(&m_lock,5120);
#endif // __linux__
// One time initialise of static stuff required for our storage // One time initialise of static stuff required for our storage
if( pvHeap == NULL ) if( pvHeap == NULL )
@ -187,7 +197,7 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
if( desiredSize > currentHeapSize ) if( desiredSize > currentHeapSize )
{ {
unsigned int pagesRequired = ( desiredSize + (CSF_PAGE_SIZE - 1 ) ) / CSF_PAGE_SIZE; unsigned int pagesRequired = ( desiredSize + (CSF_PAGE_SIZE - 1 ) ) / CSF_PAGE_SIZE;
void *pvRet = mmap(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE, NULL); void *pvRet = mmap(NULL, pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE, NULL);
if( pvRet == NULL ) if( pvRet == NULL )
{ {
// Out of physical memory // Out of physical memory
@ -217,7 +227,9 @@ ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID
ConsoleSaveFileOriginal::~ConsoleSaveFileOriginal() ConsoleSaveFileOriginal::~ConsoleSaveFileOriginal()
{ {
#ifndef __linux__
VirtualFree( pvHeap, MAX_PAGE_COUNT * CSF_PAGE_SIZE, MEM_DECOMMIT ); VirtualFree( pvHeap, MAX_PAGE_COUNT * CSF_PAGE_SIZE, MEM_DECOMMIT );
#endif
pagesCommitted = 0; pagesCommitted = 0;
// Make sure we don't have any thumbnail data still waiting round - we can't need it now we've destroyed the save file anyway // Make sure we don't have any thumbnail data still waiting round - we can't need it now we've destroyed the save file anyway
#if defined _XBOX #if defined _XBOX
@ -306,13 +318,25 @@ void ConsoleSaveFileOriginal::deleteFile( FileEntry *file )
ReleaseSaveAccess(); ReleaseSaveAccess();
} }
#if defined(__linux__)
bool moveToEnd(int fd)
{
off_t fileSize = lseek(fd, 0, SEEK_END);
if (fileSize == (off_t)-1) {
perror("lseek failed");
return false;
}
return true;
}
#endif
void ConsoleSaveFileOriginal::setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod) void ConsoleSaveFileOriginal::setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod)
{ {
LockSaveAccess(); LockSaveAccess();
file->currentFilePointer = file->data.startOffset + lDistanceToMove; file->currentFilePointer = file->data.startOffset + lDistanceToMove;
if( dwMoveMethod == FILE_END) if( moveToEnd(dwMoveMethod))
{ {
file->currentFilePointer += file->getFileSize(); file->currentFilePointer += file->getFileSize();
} }
@ -649,7 +673,9 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
// Get the frequency of the timer // Get the frequency of the timer
LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime; LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
float fElapsedTime = 0.0f; float fElapsedTime = 0.0f;
#ifndef __linux__
QueryPerformanceFrequency( &qwTicksPerSec ); QueryPerformanceFrequency( &qwTicksPerSec );
#endif // __linux__
float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart; float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
unsigned int fileSize = header.GetFileSize(); unsigned int fileSize = header.GetFileSize();
@ -687,14 +713,18 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
// Pre-calculate the buffer size required for the compressed data // Pre-calculate the buffer size required for the compressed data
PIXBeginNamedEvent(0,"Pre-calc save compression"); PIXBeginNamedEvent(0,"Pre-calc save compression");
// Save the start time // Save the start time
#if !defined(__linux__)
QueryPerformanceCounter( &qwTime ); QueryPerformanceCounter( &qwTime );
#endif // __linux__
#ifdef __PSVITA__ #ifdef __PSVITA__
// AP - get the compressed size via the access function. This uses a special RLE format // AP - get the compressed size via the access function. This uses a special RLE format
VirtualCompress(NULL,&compLength,pvSaveMem,fileSize); VirtualCompress(NULL,&compLength,pvSaveMem,fileSize);
#else #else
Compression::getCompression()->Compress(NULL,&compLength,pvSaveMem,fileSize); Compression::getCompression()->Compress(NULL,&compLength,pvSaveMem,fileSize);
#endif #endif
#if !defined(__linux__)
QueryPerformanceCounter( &qwNewTime ); QueryPerformanceCounter( &qwNewTime );
#endif // __linux__
qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart; qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart)); fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
@ -718,15 +748,18 @@ void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
// Re-compress all save data before we save it to disk // Re-compress all save data before we save it to disk
PIXBeginNamedEvent(0,"Actual save compression"); PIXBeginNamedEvent(0,"Actual save compression");
// Save the start time // Save the start time
#if !defined(__linux__)
QueryPerformanceCounter( &qwTime ); QueryPerformanceCounter( &qwTime );
#endif // __LINUX__
#ifdef __PSVITA__ #ifdef __PSVITA__
// AP - compress via the access function. This uses a special RLE format // AP - compress via the access function. This uses a special RLE format
VirtualCompress(compData+8,&compLength,pvSaveMem,fileSize); VirtualCompress(compData+8,&compLength,pvSaveMem,fileSize);
#else #else
Compression::getCompression()->Compress(compData+8,&compLength,pvSaveMem,fileSize); Compression::getCompression()->Compress(compData+8,&compLength,pvSaveMem,fileSize);
#endif #endif
#if !defined(__linux__)
QueryPerformanceCounter( &qwNewTime ); QueryPerformanceCounter( &qwNewTime );
#endif // __linux__
qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart; qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart)); fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
@ -843,8 +876,12 @@ void ConsoleSaveFileOriginal::DebugFlushToFile(void *compressedData /*= NULL*/,
if(!targetFileDir.exists()) if(!targetFileDir.exists())
targetFileDir.mkdir(); targetFileDir.mkdir();
#if defined(_WIN32)
wchar_t *fileName = new wchar_t[XCONTENT_MAX_FILENAME_LENGTH+1]; wchar_t *fileName = new wchar_t[XCONTENT_MAX_FILENAME_LENGTH+1];
#else
// DecalOverdose(FIXME):
const char* fileName = new char[XCONTENT_MAX_FILENAME_LENGTH + 1];
#endif // _wIN32
#if defined(_WIN32) #if defined(_WIN32)
SYSTEMTIME t; SYSTEMTIME t;
GetSystemTime( &t ); GetSystemTime( &t );
@ -857,24 +894,36 @@ void ConsoleSaveFileOriginal::DebugFlushToFile(void *compressedData /*= NULL*/,
//14 chars for the digits //14 chars for the digits
//11 chars for the separators + suffix //11 chars for the separators + suffix
//25 chars total //25 chars total
wstring cutFileName = m_fileName; std::wstring cutFileName = m_fileName;
if(m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25) if(m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25)
{ {
cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25); cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25);
} }
#ifndef __linux__ #ifndef __linux__
swprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH+1, L"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs",VER_PRODUCTBUILD,cutFileName.c_str(), t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond); swprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH+1, L"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs",VER_PRODUCTBUILD,cutFileName.c_str(), t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
#else #else
snprintf(static_cast<char*>(fileName), XCONTENT_MAX_FILENAME_LENGTH + 1, char fileNameBuffer[XCONTENT_MAX_FILENAME_LENGTH + 1];
std::memset(fileNameBuffer, 0, sizeof(fileNameBuffer));
wcstombs(fileNameBuffer, cutFileName.c_str(), XCONTENT_MAX_FILENAME_LENGTH);
snprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH + 1,
"\\v%04d-%s%02d.%02d.%02d.%02d.%02d.mcs", "\\v%04d-%s%02d.%02d.%02d.%02d.%02d.mcs",
VER_PRODUCTBUILD, cutFileName.c_str(), VER_PRODUCTBUILD, fileNameBuffer,
localTime->tm_mon + 1, localTime->tm_mday, localTime->tm_mon + 1, localTime->tm_mday,
localTime->tm_hour, localTime->tm_min, localTime->tm_sec); localTime->tm_hour, localTime->tm_min, localTime->tm_sec);
#endif // __linux__ #endif // __linux__
#ifdef _UNICODE #if defined (_UNICODE)
wstring wtemp = targetFileDir.getPath() + wstring(fileName); wstring wtemp = targetFileDir.getPath() + wstring(fileName);
LPCWSTR lpFileName = wtemp.c_str(); LPCWSTR lpFileName = wtemp.c_str();
#elif defined(__linux__)
std::wstring wtemp = targetFileDir.getPath();
std::wstring wfileName(fileName, fileName + strlen(fileName));
wtemp += wfileName;
std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
std::string tempStr = converter.to_bytes(wtemp);
const char* lpFileName = tempStr.c_str();
#else #else
LPCSTR lpFileName = wstringtofilename( targetFileDir.getPath() + wstring(fileName) ); LPCSTR lpFileName = wstringtofilename( targetFileDir.getPath() + wstring(fileName) );
#endif #endif
@ -888,25 +937,29 @@ void ConsoleSaveFileOriginal::DebugFlushToFile(void *compressedData /*= NULL*/,
if(compressedData != NULL && compressedDataSize > 0) if(compressedData != NULL && compressedDataSize > 0)
{ {
#ifdef __PSVITA__ #if defined __PSVITA__
// AP - Use the access function to save // AP - Use the access function to save
VirtualWriteFile( lpFileName, compressedData, compressedDataSize, &numberOfBytesWritten, NULL); VirtualWriteFile( lpFileName, compressedData, compressedDataSize, &numberOfBytesWritten, NULL);
#else #elif !defined(__linux__)
WriteFile( hSaveFile,compressedData,compressedDataSize,&numberOfBytesWritten,NULL); WriteFile( hSaveFile,compressedData,compressedDataSize,&numberOfBytesWritten,NULL);
#else
write(hSaveFile,compressedData,compressedDataSize);
#endif #endif
assert(numberOfBytesWritten == compressedDataSize); assert(numberOfBytesWritten == compressedDataSize);
} }
else else
{ {
#ifdef __PSVITA__ #if defined(__PSVITA__)
// AP - Use the access function to save // AP - Use the access function to save
VirtualWriteFile( lpFileName, compressedData, compressedDataSize, &numberOfBytesWritten, NULL); VirtualWriteFile( lpFileName, compressedData, compressedDataSize, &numberOfBytesWritten, NULL);
#else #elif !defined(__linux__)
WriteFile(hSaveFile,pvSaveMem,fileSize,&numberOfBytesWritten,NULL); WriteFile(hSaveFile,pvSaveMem,fileSize,&numberOfBytesWritten,NULL);
#else
write(hSaveFile,compressedData,compressedDataSize);
#endif #endif
assert(numberOfBytesWritten == fileSize); assert(numberOfBytesWritten == fileSize);
} }
#ifndef __PSVITA__ #if !defined(__PSVITA__) && !defined(__linux__)
CloseHandle( hSaveFile ); CloseHandle( hSaveFile );
#endif #endif

8
Minecraft.World/FileHeader.cpp
View file

@ -1,8 +1,10 @@
#include "stdafx.h" #include "stdafx.h"
#include "FileHeader.h" #include "FileHeader.h"
#include "../Minecraft.Client/Windows64/Windows64_App.cpp"
//#define _DEBUG_FILE_HEADER //#define _DEBUG_FILE_HEADER
extern CConsoleMinecraftApp app;
FileHeader::FileHeader() FileHeader::FileHeader()
{ {
lastFile = NULL; lastFile = NULL;
@ -245,7 +247,7 @@ void FileHeader::ReadHeader( LPVOID saveMem, ESavePlatform plat /*= SAVE_FILE_PL
if(isSaveEndianDifferent()) if(isSaveEndianDifferent())
{ {
// Reverse bytes // Reverse bytes
System::ReverseWCHARA(entry->data.filename,64); // System::ReverseWCHARA(entry->data.filename,64);
System::ReverseULONG(&entry->data.length); System::ReverseULONG(&entry->data.length);
System::ReverseULONG(&entry->data.startOffset); System::ReverseULONG(&entry->data.startOffset);
System::ReverseULONGLONG(&entry->data.lastModifiedTime); System::ReverseULONGLONG(&entry->data.lastModifiedTime);
@ -678,4 +680,4 @@ ByteOrder FileHeader::getEndian( ESavePlatform plat )
break; break;
} }
return LITTLEENDIAN; return LITTLEENDIAN;
} }