backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-03 01:22:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from create-juicey-app/reapply/dev-on-upstream-202603082259

Browse source 
Reapply/dev on upstream 202603082259
This commit is contained in:
JuiceyDev 2026-03-08 23:28:46 +01:00 committed by GitHub
parent 31821399ac f12cd2e1f2
commit 2eea503835
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Minecraft.Client/Build/stdafx.h
View file

@ -238,6 +238,9 @@ typedef XUID GameSessionUID;
// This is generated at build time via scripts/pack_loc.py
#include "strings.h"
// This is generated at build time via scripts/pack_loc.py
#include "strings.h"
#ifdef _XBOX
#include "../Platform/Xbox/Xbox_App.h"
#include "../Platform/Xbox/Sentient/MinecraftTelemetry.h"

1
Minecraft.Client/Platform/Linux/Social/SocialManager.h
View file

@ -1,5 +1,6 @@
// ts just stink, social manager is a stupid stub rn
#pragma once
#include <winapi_stubs.h>
#ifndef _SOCIAL_MANAGER_H
#define _SOCIAL_MANAGER_H

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

@ -3606,7 +3606,7 @@ void LevelRenderer::staticCtor()
for(unsigned int i = 0; i < MAX_CHUNK_REBUILD_THREADS; ++i)
{
sprintf(threadName,"Rebuild Chunk Thread %d\n",i);
rebuildThreads[i] = new C4JThread(rebuildChunkThreadProc,(void *)i,threadName);
rebuildThreads[i] = new C4JThread(rebuildChunkThreadProc,(void *)(intptr_t)i,threadName);
s_activationEventA[i] = new C4JThread::Event();

3
Minecraft.World/Build/stdafx.h
View file

@ -210,6 +210,9 @@ void MemSect(int sect);
// This is generated at build time via scripts/pack_loc.py
#include "strings.h"
// This is generated at build time via scripts/pack_loc.py
#include "strings.h"
#ifdef _XBOX
#include "../../Minecraft.Client/Platform/Xbox/Xbox_App.h"
#include "../../Minecraft.Client/Platform/Xbox/Sentient/SentientTelemetryCommon.h"