Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Minecraft.Client/Minecraft.h
View File

@@ -41,6 +41,7 @@ class PsPlusUpsellWrapper;
#include "..\Minecraft.World\File.h"
#include "..\Minecraft.World\DisconnectPacket.h"
#include "..\Minecraft.World\C4JThread.h"
#include "ResourceLocation.h"
using namespace std;
@@ -51,6 +52,9 @@ private:
linux, solaris, windows, macos, unknown, xbox
};
static ResourceLocation DEFAULT_FONT_LOCATION;
static ResourceLocation ALT_FONT_LOCATION;
public:
static const wstring VERSION_STRING;
Minecraft(Component *mouseComponent, Canvas *parent, MinecraftApplet *minecraftApplet, int width, int height, bool fullscreen);
@@ -119,7 +123,8 @@ public:
void updatePlayerViewportAssignments();
int unoccupiedQuadrant; // 4J - added
shared_ptr<Mob> cameraTargetPlayer;
shared_ptr<LivingEntity> cameraTargetPlayer;
shared_ptr<LivingEntity> crosshairPickMob;
ParticleEngine *particleEngine;
User *user;
wstring serverDomain;
@@ -193,11 +198,6 @@ public:
private:
static File workDir;
public:
static File getWorkingDirectory();
static File getWorkingDirectory(const wstring& applicationName);
private:
static OS getPlatform();
public:
LevelStorageSource *getLevelSource();
void setScreen(Screen *screen);
@@ -280,7 +280,6 @@ public:
// 4J-PB - added to force in the 'other' level when the main player creates the level at game load time
void forceaddLevel(MultiPlayerLevel *level);
void prepareLevel(int title); // 4J - changed to public
void fileDownloaded(const wstring& name, File *file);
// OpenGLCapabilities getOpenGLCapabilities(); // 4J - removed
wstring gatherStats1();
@@ -305,8 +304,10 @@ public:
#ifdef _DURANGO
static void inGameSignInCheckAllPrivilegesCallback(LPVOID lpParam, bool hasPrivileges, int iPad);
#endif
static int InGame_SignInReturned(void *pParam,bool bContinue, int iPad, int iController);
#else
static int InGame_SignInReturned(void *pParam,bool bContinue, int iPad);
#endif
// 4J-PB
Screen * getScreen();