mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-08-20 09:57:09 +00:00
4f2352361a
The old Windows64 port had no real player identity — it used hardcoded fake XUIDs, so anyone could impersonate anyone. This replaces that with proper auth supporting Mojang, Ely.by, and offline accounts. MCAuth library (new, MCAuth/): Mojang auth via MSA device code flow (XBL, SISU, MC services), Ely.by via Yggdrasil with 2FA, offline UUID generation matching Java Edition (MD5 v3 from "OfflinePlayer:<name>"). Multi-account manager with background token refresh, per-slot sessions, and on-disk token persistence. Server-side session verification via Mojang/Ely.by hasJoined API. Skin fetching and PNG validation from texture servers. Network protocol (version bumped to 80): Three new packets (AuthScheme, AuthResponse, AuthResult) implement a server-driven auth handshake before login completes. Player identity migrated from 64-bit XUID to 128-bit GameUUID backed by two uint64 fields (hi/lo). readPlayerUID/writePlayerUID now serialize 16 bytes on the wire. Old and new clients cannot connect to each other — version mismatch is rejected at PreLogin. Save migration: Map data mappings auto-migrate from old format: the old 64-bit XUID is placed in hi, lo is set to 0 as a sentinel. On first access by the real player, the sentinel entry is upgraded in-place to the full 128-bit UUID. Format detection is by file size (2080, 2112, or 4160 bytes). Player .dat filenames inside saveData.ms change from decimal XUID to dashed UUID — old saves need manual entry renaming in the archive. UI: NativeUIRenderer: immediate-mode drawing system (quads, text, 9-slice panels, scrollbars, focus lists) for rendering auth screens without Flash/Scaleform. UIScene_MSAuth handles device code display, Ely.by credential input with 2FA, per-account skin head preview, and multi-account add/remove/switch. Server: online-mode and auth-provider (mojang/elyby) in server.properties. Whitelist and ban checks validate against the server-verified UUID. Incompatible auth scheme logs which provider the server expects vs what the client is using. Also fixes a pre-existing exploit where any client could send a DebugOptionsPacket to grant themselves CraftAnything and other debug privileges on any server — now requires OP status server-side.
159 lines
4.4 KiB
C++
159 lines
4.4 KiB
C++
#pragma once
|
|
using namespace std;
|
|
|
|
#include "GameRules.h"
|
|
|
|
class Player;
|
|
class CompoundTag;
|
|
class LevelSettings;
|
|
class LevelType;
|
|
class GameType;
|
|
|
|
class LevelData
|
|
{
|
|
friend class DerivedLevelData;
|
|
private:
|
|
int64_t seed;
|
|
LevelType *m_pGenerator;// = LevelType.normal;
|
|
wstring generatorOptions;
|
|
int xSpawn;
|
|
int ySpawn;
|
|
int zSpawn;
|
|
int64_t gameTime;
|
|
int64_t dayTime;
|
|
int64_t lastPlayed;
|
|
int64_t sizeOnDisk;
|
|
// CompoundTag *loadedPlayerTag; // 4J removed
|
|
int dimension;
|
|
wstring levelName;
|
|
int version;
|
|
|
|
bool raining;
|
|
int rainTime;
|
|
|
|
bool thundering;
|
|
int thunderTime;
|
|
GameType *gameType;
|
|
bool generateMapFeatures;
|
|
bool hardcore;
|
|
bool allowCommands;
|
|
bool initialized;
|
|
bool newSeaLevel; // 4J added
|
|
bool hasBeenInCreative; // 4J added
|
|
bool spawnBonusChest; // 4J added
|
|
int m_xzSize; // 4J Added
|
|
#ifdef _LARGE_WORLDS
|
|
int m_xzSizeOld; // 4J MGH Added, for expanding worlds
|
|
int m_hellScaleOld;
|
|
bool m_classicEdgeMoat;
|
|
bool m_smallEdgeMoat;
|
|
bool m_mediumEdgeMoat;
|
|
#endif
|
|
int m_hellScale; // 4J Added
|
|
|
|
// 4J added
|
|
int xStronghold;
|
|
int yStronghold;
|
|
int zStronghold;
|
|
bool bStronghold;
|
|
|
|
int xStrongholdEndPortal;
|
|
int zStrongholdEndPortal;
|
|
bool bStrongholdEndPortal;
|
|
|
|
GameRules gameRules;
|
|
|
|
protected:
|
|
LevelData();
|
|
|
|
public:
|
|
LevelData(CompoundTag *tag);
|
|
LevelData(LevelSettings *levelSettings, const wstring& levelName);
|
|
LevelData(LevelData *copy);
|
|
CompoundTag *createTag();
|
|
CompoundTag *createTag(vector<shared_ptr<Player> > *players);
|
|
|
|
enum
|
|
{
|
|
DIMENSION_NETHER=-1,
|
|
DIMENSION_OVERWORLD=0,
|
|
DIMENSION_END=1,
|
|
};
|
|
static const int DIMENSION_COUNT = 3;
|
|
|
|
protected:
|
|
virtual void setTagData(CompoundTag *tag); // 4J - removed CompoundTag *playerTag
|
|
|
|
public:
|
|
virtual int64_t getSeed();
|
|
virtual int getXSpawn();
|
|
virtual int getYSpawn();
|
|
virtual int getZSpawn();
|
|
virtual int getXStronghold();
|
|
virtual int getZStronghold();
|
|
virtual int getXStrongholdEndPortal();
|
|
virtual int getZStrongholdEndPortal();
|
|
virtual int64_t getGameTime();
|
|
virtual int64_t getDayTime();
|
|
virtual int64_t getSizeOnDisk();
|
|
virtual CompoundTag *getLoadedPlayerTag();
|
|
//int getDimension(); // 4J Removed TU 9 as it's never accurate
|
|
virtual void setSeed(int64_t seed);
|
|
virtual void setXSpawn(int xSpawn);
|
|
virtual void setYSpawn(int ySpawn);
|
|
virtual void setZSpawn(int zSpawn);
|
|
virtual void setHasStronghold();
|
|
virtual bool getHasStronghold();
|
|
virtual void setXStronghold(int xStronghold);
|
|
virtual void setZStronghold(int zStronghold);
|
|
virtual void setHasStrongholdEndPortal();
|
|
virtual bool getHasStrongholdEndPortal();
|
|
virtual void setXStrongholdEndPortal(int xStrongholdEndPortal);
|
|
virtual void setZStrongholdEndPortal(int zStrongholdEndPortal);
|
|
|
|
virtual void setGameTime(int64_t time);
|
|
virtual void setDayTime(int64_t time);
|
|
virtual void setSizeOnDisk(int64_t sizeOnDisk);
|
|
virtual void setLoadedPlayerTag(CompoundTag *loadedPlayerTag);
|
|
//void setDimension(int dimension); // 4J Removed TU 9 as it's never used
|
|
virtual void setSpawn(int xSpawn, int ySpawn, int zSpawn);
|
|
virtual wstring getLevelName();
|
|
virtual void setLevelName(const wstring& levelName);
|
|
virtual int getVersion();
|
|
virtual void setVersion(int version);
|
|
virtual int64_t getLastPlayed();
|
|
virtual bool isThundering();
|
|
virtual void setThundering(bool thundering);
|
|
virtual int getThunderTime();
|
|
virtual void setThunderTime(int thunderTime);
|
|
virtual bool isRaining();
|
|
virtual void setRaining(bool raining);
|
|
virtual int getRainTime();
|
|
virtual void setRainTime(int rainTime);
|
|
virtual GameType *getGameType();
|
|
virtual bool isGenerateMapFeatures();
|
|
virtual bool getSpawnBonusChest();
|
|
virtual void setGameType(GameType *gameType);
|
|
virtual bool useNewSeaLevel();
|
|
virtual bool getHasBeenInCreative(); // 4J Added
|
|
virtual void setHasBeenInCreative(bool value); // 4J Added
|
|
virtual LevelType *getGenerator();
|
|
virtual void setGenerator(LevelType *generator);
|
|
virtual wstring getGeneratorOptions();
|
|
virtual void setGeneratorOptions(const wstring &options);
|
|
virtual bool isHardcore();
|
|
virtual bool getAllowCommands();
|
|
virtual void setAllowCommands(bool allowCommands);
|
|
virtual bool isInitialized();
|
|
virtual void setInitialized(bool initialized);
|
|
virtual GameRules *getGameRules();
|
|
virtual int getXZSize(); // 4J Added
|
|
#ifdef _LARGE_WORLDS
|
|
virtual int getXZSizeOld(); // 4J Added
|
|
virtual void getMoatFlags(bool* bClassicEdgeMoat, bool* bSmallEdgeMoat, bool* bMediumEdgeMoat); //4J MGH - added
|
|
virtual int getXZHellSizeOld(); // 4J Added
|
|
|
|
#endif
|
|
virtual int getHellScale(); // 4J Addded
|
|
};
|