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

Remove UINT from game rule attribute writers

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 03:08:43 +11:00
parent 7a0d3f709e
commit 29edda1cc7
32 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()
m_enchantmentId = m_enchantmentLevel = 0; m_enchantmentId = m_enchantmentLevel = 0;
} }
void AddEnchantmentRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void AddEnchantmentRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes)
{ {
GameRuleDefinition::writeAttributes(dos, numAttributes + 2); GameRuleDefinition::writeAttributes(dos, numAttributes + 2);

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

@ -15,7 +15,7 @@ public:
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_AddEnchantment; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_AddEnchantment; }
virtual void writeAttributes(DataOutputStream *, UINT numAttrs); virtual void writeAttributes(DataOutputStream *, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);

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

@ -12,7 +12,7 @@ AddItemRuleDefinition::AddItemRuleDefinition()
m_slot = -1; m_slot = -1;
} }
void AddItemRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttrs) void AddItemRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);

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

@ -18,7 +18,7 @@ private:
public: public:
AddItemRuleDefinition(); AddItemRuleDefinition();
virtual void writeAttributes(DataOutputStream *, UINT numAttributes); virtual void writeAttributes(DataOutputStream *, unsigned int numAttributes);
virtual void getChildren(std::vector<GameRuleDefinition *> *children); virtual void getChildren(std::vector<GameRuleDefinition *> *children);
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_AddItem; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_AddItem; }

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

@ -30,7 +30,7 @@ ApplySchematicRuleDefinition::~ApplySchematicRuleDefinition()
delete m_location; delete m_location;
} }
void ApplySchematicRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttrs) void ApplySchematicRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);

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

@ -30,7 +30,7 @@ public:
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_ApplySchematic; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_ApplySchematic; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
void processSchematic(AABB *chunkBox, LevelChunk *chunk); void processSchematic(AABB *chunkBox, LevelChunk *chunk);

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

@ -9,7 +9,7 @@ BiomeOverride::BiomeOverride()
m_biomeId = 0; m_biomeId = 0;
} }
void BiomeOverride::writeAttributes(DataOutputStream *dos, UINT numAttrs) void BiomeOverride::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
GameRuleDefinition::writeAttributes(dos, numAttrs + 3); GameRuleDefinition::writeAttributes(dos, numAttrs + 3);

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

@ -15,7 +15,7 @@ public:
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_BiomeOverride; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_BiomeOverride; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
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);

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

@ -17,7 +17,7 @@ CollectItemRuleDefinition::~CollectItemRuleDefinition()
{ {
} }
void CollectItemRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void CollectItemRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes)
{ {
GameRuleDefinition::writeAttributes(dos, numAttributes + 3); GameRuleDefinition::writeAttributes(dos, numAttributes + 3);

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

@ -20,7 +20,7 @@ public:
ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_CollectItemRule; } ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_CollectItemRule; }
virtual void writeAttributes(DataOutputStream *, UINT numAttributes); virtual void writeAttributes(DataOutputStream *, unsigned int numAttributes);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
virtual int getGoal(); virtual int getGoal();

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

@ -55,7 +55,7 @@ GameRuleDefinition *ConsoleGenerateStructure::addChild(ConsoleGameRules::EGameRu
return rule; return rule;
} }
void ConsoleGenerateStructure::writeAttributes(DataOutputStream *dos, UINT numAttrs) void ConsoleGenerateStructure::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);

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

@ -23,7 +23,7 @@ public:
virtual void getChildren(std::vector<GameRuleDefinition *> *children); virtual void getChildren(std::vector<GameRuleDefinition *> *children);
virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType);
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
// StructurePiece // StructurePiece

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

@ -29,7 +29,7 @@ void GameRuleDefinition::write(DataOutputStream *dos)
(*it)->write(dos); (*it)->write(dos);
} }
void GameRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void GameRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes)
{ {
dos->writeInt(numAttributes + 3); dos->writeInt(numAttributes + 3);

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

@ -34,7 +34,7 @@ public:
virtual void write(DataOutputStream *); virtual void write(DataOutputStream *);
virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes);
virtual void getChildren(std::vector<GameRuleDefinition *> *); virtual void getChildren(std::vector<GameRuleDefinition *> *);
virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType);

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

@ -90,7 +90,7 @@ LevelGenerationOptions::~LevelGenerationOptions()
ConsoleGameRules::EGameRuleType LevelGenerationOptions::getActionType() { return ConsoleGameRules::eGameRuleType_LevelGenerationOptions; } ConsoleGameRules::EGameRuleType LevelGenerationOptions::getActionType() { return ConsoleGameRules::eGameRuleType_LevelGenerationOptions; }
void LevelGenerationOptions::writeAttributes(DataOutputStream *dos, UINT numAttrs) void LevelGenerationOptions::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
GameRuleDefinition::writeAttributes(dos, numAttrs + 5); GameRuleDefinition::writeAttributes(dos, numAttrs + 5);

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

@ -170,7 +170,7 @@ public:
virtual ConsoleGameRules::EGameRuleType getActionType(); virtual ConsoleGameRules::EGameRuleType getActionType();
virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes);
virtual void getChildren(std::vector<GameRuleDefinition *> *children); virtual void getChildren(std::vector<GameRuleDefinition *> *children);
virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);

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

@ -14,7 +14,7 @@ NamedAreaRuleDefinition::~NamedAreaRuleDefinition()
delete m_area; delete m_area;
} }
void NamedAreaRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void NamedAreaRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes)
{ {
GameRuleDefinition::writeAttributes(dos, numAttributes + 7); GameRuleDefinition::writeAttributes(dos, numAttributes + 7);

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

@ -12,7 +12,7 @@ public:
NamedAreaRuleDefinition(); NamedAreaRuleDefinition();
~NamedAreaRuleDefinition(); ~NamedAreaRuleDefinition();
virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes);
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_NamedArea; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_NamedArea; }

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

@ -9,7 +9,7 @@ StartFeature::StartFeature()
m_feature = StructureFeature::eFeature_Temples; m_feature = StructureFeature::eFeature_Temples;
} }
void StartFeature::writeAttributes(DataOutputStream *dos, UINT numAttrs) void StartFeature::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
GameRuleDefinition::writeAttributes(dos, numAttrs + 3); GameRuleDefinition::writeAttributes(dos, numAttrs + 3);

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

@ -15,7 +15,7 @@ public:
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_StartFeature; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_StartFeature; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature); bool isFeatureChunk(int chunkX, int chunkZ, StructureFeature::EFeatureTypes feature);

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

@ -24,7 +24,7 @@ UpdatePlayerRuleDefinition::~UpdatePlayerRuleDefinition()
} }
} }
void UpdatePlayerRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void UpdatePlayerRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes)
{ {
int attrCount = 3; int attrCount = 3;
if(m_bUpdateHealth) ++attrCount; if(m_bUpdateHealth) ++attrCount;

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

@ -26,7 +26,7 @@ public:
virtual void getChildren(std::vector<GameRuleDefinition *> *children); virtual void getChildren(std::vector<GameRuleDefinition *> *children);
virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType);
virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
virtual void postProcessPlayer(std::shared_ptr<Player> player); virtual void postProcessPlayer(std::shared_ptr<Player> player);

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

@ -8,7 +8,7 @@ UseTileRuleDefinition::UseTileRuleDefinition()
m_useCoords = false; m_useCoords = false;
} }
void UseTileRuleDefinition::writeAttributes(DataOutputStream *dos, UINT numAttributes) void UseTileRuleDefinition::writeAttributes(DataOutputStream *dos, unsigned int numAttributes)
{ {
GameRuleDefinition::writeAttributes(dos, numAttributes + 5); GameRuleDefinition::writeAttributes(dos, numAttributes + 5);

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

@ -17,7 +17,7 @@ public:
ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_UseTileRule; } ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_UseTileRule; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
virtual bool onUseTile(GameRule *rule, int tileId, int x, int y, int z); virtual bool onUseTile(GameRule *rule, int tileId, int x, int y, int z);

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

@ -9,7 +9,7 @@ XboxStructureActionGenerateBox::XboxStructureActionGenerateBox()
m_skipAir = false; m_skipAir = false;
} }
void XboxStructureActionGenerateBox::writeAttributes(DataOutputStream *dos, UINT numAttrs) void XboxStructureActionGenerateBox::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 9); ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 9);

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

@ -19,7 +19,7 @@ public:
virtual int getEndY() { return m_y1; } virtual int getEndY() { return m_y1; }
virtual int getEndZ() { return m_z1; } virtual int getEndZ() { return m_z1; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
bool generateBoxInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB); bool generateBoxInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB);

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

@ -8,7 +8,7 @@ XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock()
m_x = m_y = m_z = m_tile = m_data = 0; m_x = m_y = m_z = m_tile = m_data = 0;
} }
void XboxStructureActionPlaceBlock::writeAttributes(DataOutputStream *dos, UINT numAttrs) void XboxStructureActionPlaceBlock::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 5); ConsoleGenerateStructureAction::writeAttributes(dos, numAttrs + 5);

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

@ -18,7 +18,7 @@ public:
virtual int getEndY() { return m_y; } virtual int getEndY() { return m_y; }
virtual int getEndZ() { return m_z; } virtual int getEndZ() { return m_z; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
bool placeBlockInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB); bool placeBlockInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB);

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

@ -21,7 +21,7 @@ XboxStructureActionPlaceContainer::~XboxStructureActionPlaceContainer()
} }
// 4J-JEV: Super class handles attr-facing fine. // 4J-JEV: Super class handles attr-facing fine.
//void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream *dos, UINT numAttrs) //void XboxStructureActionPlaceContainer::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
void XboxStructureActionPlaceContainer::getChildren(std::vector<GameRuleDefinition *> *children) void XboxStructureActionPlaceContainer::getChildren(std::vector<GameRuleDefinition *> *children)

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

@ -21,7 +21,7 @@ public:
virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType); virtual GameRuleDefinition *addChild(ConsoleGameRules::EGameRuleType ruleType);
// 4J-JEV: Super class handles attr-facing fine. // 4J-JEV: Super class handles attr-facing fine.
//virtual void writeAttributes(DataOutputStream *dos, UINT numAttributes); //virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttributes);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);

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

@ -15,7 +15,7 @@ XboxStructureActionPlaceSpawner::~XboxStructureActionPlaceSpawner()
{ {
} }
void XboxStructureActionPlaceSpawner::writeAttributes(DataOutputStream *dos, UINT numAttrs) void XboxStructureActionPlaceSpawner::writeAttributes(DataOutputStream *dos, unsigned int numAttrs)
{ {
XboxStructureActionPlaceBlock::writeAttributes(dos, numAttrs + 1); XboxStructureActionPlaceBlock::writeAttributes(dos, numAttrs + 1);

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

@ -17,7 +17,7 @@ public:
virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_PlaceSpawner; } virtual ConsoleGameRules::EGameRuleType getActionType() { return ConsoleGameRules::eGameRuleType_PlaceSpawner; }
virtual void writeAttributes(DataOutputStream *dos, UINT numAttrs); virtual void writeAttributes(DataOutputStream *dos, unsigned int numAttrs);
virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue); virtual void addAttribute(const std::wstring &attributeName, const std::wstring &attributeValue);
bool placeSpawnerInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB); bool placeSpawnerInLevel(StructurePiece *structure, Level *level, BoundingBox *chunkBB);