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

Use standard byte types in game rule manager

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 03:13:24 +11:00
parent bfa2fd6715
commit 025d8184d8
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Minecraft.Client/Platform/Common/GameRules/GameRuleManager.cpp
View file

@ -103,7 +103,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
for(int i = 0; i < gameRulesCount; ++i) for(int i = 0; i < gameRulesCount; ++i)
{ {
DLCGameRulesHeader *dlcHeader = (DLCGameRulesHeader *)pack->getFile(DLCManager::e_DLCType_GameRulesHeader, i); DLCGameRulesHeader *dlcHeader = (DLCGameRulesHeader *)pack->getFile(DLCManager::e_DLCType_GameRulesHeader, i);
DWORD dSize; std::uint32_t dSize;
uint8_t *dData = dlcHeader->getData(dSize); uint8_t *dData = dlcHeader->getData(dSize);
LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions(); LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions();
@ -125,7 +125,7 @@ void GameRuleManager::loadGameRules(DLCPack *pack)
{ {
DLCGameRulesFile *dlcFile = (DLCGameRulesFile *)pack->getFile(DLCManager::e_DLCType_GameRules, i); DLCGameRulesFile *dlcFile = (DLCGameRulesFile *)pack->getFile(DLCManager::e_DLCType_GameRules, i);
DWORD dSize; std::uint32_t dSize;
uint8_t *dData = dlcFile->getData(dSize); uint8_t *dData = dlcFile->getData(dSize);
LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions(); LevelGenerationOptions *createdLevelGenerationOptions = new LevelGenerationOptions();
@ -170,7 +170,7 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, u
for (int i = 0; i < 8; i++) dis.readByte(); for (int i = 0; i < 8; i++) dis.readByte();
BYTE compression_type = dis.readByte(); std::uint8_t compression_type = dis.readByte();
app.DebugPrintf("\tcompressionType=%d.\n", compression_type); app.DebugPrintf("\tcompressionType=%d.\n", compression_type);
@ -183,8 +183,8 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, u
// Decompress File Body // Decompress File Body
byteArray content(new BYTE[decomp_len], decomp_len), byteArray content(new std::uint8_t[decomp_len], decomp_len),
compr_content(new BYTE[compr_len], compr_len); compr_content(new std::uint8_t[compr_len], compr_len);
dis.read(compr_content); dis.read(compr_content);
Compression::getCompression()->SetDecompressionType( (Compression::ECompressionTypes)compression_type ); Compression::getCompression()->SetDecompressionType( (Compression::ECompressionTypes)compression_type );
@ -203,14 +203,14 @@ void GameRuleManager::loadGameRules(LevelGenerationOptions *lgo, uint8_t *dIn, u
// Read StringTable. // Read StringTable.
byteArray bStringTable; byteArray bStringTable;
bStringTable.length = dis2.readInt(); bStringTable.length = dis2.readInt();
bStringTable.data = new BYTE[ bStringTable.length ]; bStringTable.data = new std::uint8_t[ bStringTable.length ];
dis2.read(bStringTable); dis2.read(bStringTable);
StringTable *strings = new StringTable(bStringTable.data, bStringTable.length); StringTable *strings = new StringTable(bStringTable.data, bStringTable.length);
// Read RuleFile. // Read RuleFile.
byteArray bRuleFile; byteArray bRuleFile;
bRuleFile.length = content.length - bStringTable.length; bRuleFile.length = content.length - bStringTable.length;
bRuleFile.data = new BYTE[ bRuleFile.length ]; bRuleFile.data = new std::uint8_t[ bRuleFile.length ];
dis2.read(bRuleFile); dis2.read(bRuleFile);
// 4J-JEV: I don't believe that the path-name is ever used. // 4J-JEV: I don't believe that the path-name is ever used.
@ -306,7 +306,7 @@ void GameRuleManager::saveGameRules(uint8_t **dOut, unsigned int *dSize)
} }
// Compress compr_dos and write to dos. // Compress compr_dos and write to dos.
byteArray compr_ba(new BYTE[ compr_baos.buf.length ], compr_baos.buf.length); byteArray compr_ba(new std::uint8_t[ compr_baos.buf.length ], compr_baos.buf.length);
Compression::getCompression()->CompressLZXRLE( compr_ba.data, &compr_ba.length, Compression::getCompression()->CompressLZXRLE( compr_ba.data, &compr_ba.length,
compr_baos.buf.data, compr_baos.buf.length ); compr_baos.buf.data, compr_baos.buf.length );
@ -380,8 +380,8 @@ bool GameRuleManager::readRuleFile(LevelGenerationOptions *lgo, uint8_t *dIn, un
LevelGenerationOptions *levelGenerator = lgo;//new LevelGenerationOptions(); LevelGenerationOptions *levelGenerator = lgo;//new LevelGenerationOptions();
LevelRuleset *gameRules = new LevelRuleset(); LevelRuleset *gameRules = new LevelRuleset();
//DWORD dwLen = 0; //std::uint32_t dataLength = 0;
//PBYTE pbData = dlcFile->getData(dwLen); //std::uint8_t *data = dlcFile->getData(dataLength);
//byteArray data(pbData,dwLen); //byteArray data(pbData,dwLen);
byteArray data(dIn, dSize); byteArray data(dIn, dSize);