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

fixed a bunch of shit, might fix renderer ?

Browse source
This commit is contained in:
JuiceyDev 2026-03-06 19:53:03 +01:00
parent 58780ca7cd
commit 3f489a4202
6 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.Client/GameState/GameMode.cpp
View file

@ -49,6 +49,7 @@ void GameMode::render(float a)
bool GameMode::useItem(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, bool bTestUseOnly) bool GameMode::useItem(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, bool bTestUseOnly)
{ {
return false;
} }
void GameMode::initPlayer(shared_ptr<Player> player) void GameMode::initPlayer(shared_ptr<Player> player)

2
Minecraft.Client/MinecraftServer.cpp
View file

@ -262,7 +262,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
// 4J delete passed in save data now - this is only required for the tutorial which is loaded by passing data directly in rather than using the storage manager // 4J delete passed in save data now - this is only required for the tutorial which is loaded by passing data directly in rather than using the storage manager
if( initData->saveData ) if( initData->saveData )
{ {
delete initData->saveData->data; delete[] (unsigned char*)initData->saveData->data;
initData->saveData->data = 0; initData->saveData->data = 0;
initData->saveData->fileSize = 0; initData->saveData->fileSize = 0;
} }

30
Minecraft.Client/Rendering/LevelRenderer.cpp
View file

@ -2386,7 +2386,7 @@ void LevelRenderer::setDirty(int x0, int y0, int z0, int x1, int y1, int z1, Lev
dirtyChunksLockFreeStack.Push((int *)(index)); dirtyChunksLockFreeStack.Push((int *)(index));
#else #else
dirtyChunksLockFreeStack.Push((int *)(index + 2)); dirtyChunksLockFreeStack.Push((int *)(uintptr_t)(index + 2));
#endif #endif
#ifdef _XBOX #ifdef _XBOX
@ -3596,14 +3596,13 @@ void LevelRenderer::staticCtor()
{ {
s_rebuildCompleteEvents = new C4JThread::EventArray(MAX_CHUNK_REBUILD_THREADS); s_rebuildCompleteEvents = new C4JThread::EventArray(MAX_CHUNK_REBUILD_THREADS);
char threadName[256]; char threadName[256];
for(unsigned int i = 0; i < MAX_CHUNK_REBUILD_THREADS; ++i) for(unsigned int i = 0; i < MAX_CHUNK_REBUILD_THREADS; ++i)
{ {
sprintf(threadName,"Rebuild Chunk Thread %d\n",i); sprintf(threadName,"Rebuild Chunk Thread %d\n",i);
rebuildThreads[i] = new C4JThread(rebuildChunkThreadProc,(void *)i,threadName); rebuildThreads[i] = new C4JThread(rebuildChunkThreadProc,(void *)(uintptr_t)i,threadName);
s_activationEventA[i] = new C4JThread::Event(); s_activationEventA[i] = new C4JThread::Event();
// Threads 1,3 and 5 are generally idle so use them
// Threads 1,3 and 5 are generally idle so use them
if((i%3) == 0) rebuildThreads[i]->SetProcessor(CPU_CORE_CHUNK_REBUILD_A); if((i%3) == 0) rebuildThreads[i]->SetProcessor(CPU_CORE_CHUNK_REBUILD_A);
else if((i%3) == 1) else if((i%3) == 1)
{ {
@ -3626,12 +3625,13 @@ int LevelRenderer::rebuildChunkThreadProc(LPVOID lpParam)
IntCache::CreateNewThreadStorage(); IntCache::CreateNewThreadStorage();
Tesselator::CreateNewThreadStorage(1024*1024); Tesselator::CreateNewThreadStorage(1024*1024);
RenderManager.InitialiseContext(); RenderManager.InitialiseContext();
Chunk::CreateNewThreadStorage(); Chunk::CreateNewThreadStorage();
Tile::CreateNewThreadStorage(); Tile::CreateNewThreadStorage();
int index = (size_t)lpParam; int index = (int)(uintptr_t)lpParam;
while(true) while(true)
{ {
s_activationEventA[index]->WaitForSignal(INFINITE); s_activationEventA[index]->WaitForSignal(INFINITE);

2
Minecraft.Client/UI/Screens/ControlsScreen.cpp
View file

@ -7,7 +7,7 @@
ControlsScreen::ControlsScreen(Screen *lastScreen, Options *options) ControlsScreen::ControlsScreen(Screen *lastScreen, Options *options)
{ {
// 4J - added initialisers // 4J - added initialisers
title == L"Controls"; title = L"Controls";
selectedKey = -1; selectedKey = -1;
this->lastScreen = lastScreen; this->lastScreen = lastScreen;

2
Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
View file

@ -359,7 +359,7 @@ void ConsoleSaveFileSplit::RegionFileReference::ReleaseCompressed()
// app.DebugPrintf("Releasing compressed data for region file from 0x%.8x\n", fileEntry->data.regionIndex ); // app.DebugPrintf("Releasing compressed data for region file from 0x%.8x\n", fileEntry->data.regionIndex );
free(dataCompressed); free(dataCompressed);
dataCompressed = NULL; dataCompressed = NULL;
dataCompressedSize = NULL; dataCompressedSize = 0;
} }
FileEntry *ConsoleSaveFileSplit::GetRegionFileEntry(unsigned int regionIndex) FileEntry *ConsoleSaveFileSplit::GetRegionFileEntry(unsigned int regionIndex)

4
Minecraft.World/Network/Socket.cpp
View file

@ -344,7 +344,7 @@ void Socket::SocketInputStreamLocal::close()
{ {
m_streamOpen = false; m_streamOpen = false;
EnterCriticalSection(&s_hostQueueLock[m_queueIdx]); EnterCriticalSection(&s_hostQueueLock[m_queueIdx]);
s_hostQueue[m_queueIdx].empty(); s_hostQueue[m_queueIdx] = std::queue<unsigned char>();
LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]); LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]);
} }
@ -392,7 +392,7 @@ void Socket::SocketOutputStreamLocal::close()
{ {
m_streamOpen = false; m_streamOpen = false;
EnterCriticalSection(&s_hostQueueLock[m_queueIdx]); EnterCriticalSection(&s_hostQueueLock[m_queueIdx]);
s_hostQueue[m_queueIdx].empty(); s_hostQueue[m_queueIdx] = std::queue<unsigned char>();
LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]); LeaveCriticalSection(&s_hostQueueLock[m_queueIdx]);
} }