backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-19 20:07:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Win32 byte types from game rule helpers

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-10 19:17:56 +11:00
parent 0437fb921f
commit 2bc55b838d
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Minecraft.Client/Platform/Common/GameRules/BiomeOverride.cpp
View file

@ -52,8 +52,8 @@ bool BiomeOverride::isBiome(int id)
return m_biomeId == id; return m_biomeId == id;
} }
void BiomeOverride::getTileValues(BYTE &tile, BYTE &topTile) void BiomeOverride::getTileValues(std::uint8_t &tile, std::uint8_t &topTile)
{ {
if(m_tile != 0) tile = (BYTE)m_tile; if(m_tile != 0) tile = m_tile;
if(m_topTile != 0) topTile = (BYTE)m_topTile; if(m_topTile != 0) topTile = m_topTile;
} }

8
Minecraft.Client/Platform/Common/GameRules/BiomeOverride.h
View file

@ -6,8 +6,8 @@
class BiomeOverride : public GameRuleDefinition class BiomeOverride : public GameRuleDefinition
{ {
private: private:
BYTE m_topTile; std::uint8_t m_topTile;
BYTE m_tile; std::uint8_t m_tile;
int m_biomeId; int m_biomeId;
public: public:
@ -19,5 +19,5 @@ public:
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
bool isBiome(int id); bool isBiome(int id);
void getTileValues(BYTE &tile, BYTE &topTile); void getTileValues(std::uint8_t &tile, std::uint8_t &topTile);
}; };

2
Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
View file

@ -400,7 +400,7 @@ LPCWSTR LevelGenerationOptions::getString(const std::wstring &key)
} }
} }
void LevelGenerationOptions::getBiomeOverride(int biomeId, BYTE &tile, BYTE &topTile) void LevelGenerationOptions::getBiomeOverride(int biomeId, std::uint8_t &tile, std::uint8_t &topTile)
{ {
for(AUTO_VAR(it, m_biomeOverrides.begin()); it != m_biomeOverrides.end(); ++it) for(AUTO_VAR(it, m_biomeOverrides.begin()); it != m_biomeOverrides.end(); ++it)
{ {

2
Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h
View file

@ -198,7 +198,7 @@ public:
void setRequiredGameRules(LevelRuleset *rules); void setRequiredGameRules(LevelRuleset *rules);
LevelRuleset *getRequiredGameRules(); LevelRuleset *getRequiredGameRules();
void getBiomeOverride(int biomeId, BYTE &tile, BYTE &topTile); void getBiomeOverride(int biomeId, std::uint8_t &tile, std::uint8_t &topTile);
bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature); bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature);
void loadStringTable(StringTable *table); void loadStringTable(StringTable *table);

4
Minecraft.Client/Platform/Common/GameRules/LevelRules.cpp
View file

@ -6,7 +6,7 @@ LevelRules::LevelRules()
{ {
} }
void LevelRules::addLevelRule(const std::wstring &displayName, PBYTE pbData, DWORD dwLen) void LevelRules::addLevelRule(const std::wstring &displayName, std::uint8_t *pbData, unsigned int dataLength)
{ {
} }
@ -17,4 +17,4 @@ void LevelRules::addLevelRule(const std::wstring &displayName, LevelRuleset *roo
void LevelRules::removeLevelRule(LevelRuleset *removing) void LevelRules::removeLevelRule(LevelRuleset *removing)
{ {
// TODO ? // TODO ?
} }

4
Minecraft.Client/Platform/Common/GameRules/LevelRules.h
View file

@ -7,8 +7,8 @@ class LevelRules
public: public:
LevelRules(); LevelRules();
void addLevelRule(const std::wstring &displayName, PBYTE pbData, DWORD dwLen); void addLevelRule(const std::wstring &displayName, std::uint8_t *pbData, unsigned int dataLength);
void addLevelRule(const std::wstring &displayName, LevelRuleset *rootRule); void addLevelRule(const std::wstring &displayName, LevelRuleset *rootRule);
void removeLevelRule(LevelRuleset *removing); void removeLevelRule(LevelRuleset *removing);
}; };