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

Remove AUTO_VAR macro and _toString function (#592)

Browse Source
This commit is contained in:
void_17
2026-03-06 02:11:18 +07:00
committed by GitHub
parent 7d6658fe5b
commit 55231bb8d3
294 changed files with 5067 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
Minecraft.World/GameRules.cpp
View File

@@ -14,27 +14,6 @@ const int GameRules::RULE_DOTILEDROPS = 5;
const int GameRules::RULE_NATURAL_REGENERATION = 7;
const int GameRules::RULE_DAYLIGHT = 8;
GameRules::GameRules()
{
/*registerRule(RULE_DOFIRETICK, L"1");
registerRule(RULE_MOBGRIEFING, L"1");
registerRule(RULE_KEEPINVENTORY, L"0");
registerRule(RULE_DOMOBSPAWNING, L"1");
registerRule(RULE_DOMOBLOOT, L"1");
registerRule(RULE_DOTILEDROPS, L"1");
registerRule(RULE_COMMANDBLOCKOUTPUT, L"1");
registerRule(RULE_NATURAL_REGENERATION, L"1");
registerRule(RULE_DAYLIGHT, L"1");*/
}
GameRules::~GameRules()
{
/*for(AUTO_VAR(it,rules.begin()); it != rules.end(); ++it)
{
delete it->second;
}*/
}
bool GameRules::getBoolean(const int rule)
{
switch(rule)
@@ -60,134 +39,3 @@ bool GameRules::getBoolean(const int rule)
return false;
}
}
/*
void GameRules::registerRule(const wstring &name, const wstring &startValue)
{
rules[name] = new GameRule(startValue);
}
void GameRules::set(const wstring &ruleName, const wstring &newValue)
{
AUTO_VAR(it, rules.find(ruleName));
if(it != rules.end() )
{
GameRule *gameRule = it->second;
gameRule->set(newValue);
}
else
{
registerRule(ruleName, newValue);
}
}
wstring GameRules::get(const wstring &ruleName)
{
AUTO_VAR(it, rules.find(ruleName));
if(it != rules.end() )
{
GameRule *gameRule = it->second;
return gameRule->get();
}
return L"";
}
int GameRules::getInt(const wstring &ruleName)
{
AUTO_VAR(it, rules.find(ruleName));
if(it != rules.end() )
{
GameRule *gameRule = it->second;
return gameRule->getInt();
}
return 0;
}
double GameRules::getDouble(const wstring &ruleName)
{
AUTO_VAR(it, rules.find(ruleName));
if(it != rules.end() )
{
GameRule *gameRule = it->second;
return gameRule->getDouble();
}
return 0;
}
CompoundTag *GameRules::createTag()
{
CompoundTag *result = new CompoundTag(L"GameRules");
for(AUTO_VAR(it,rules.begin()); it != rules.end(); ++it)
{
GameRule *gameRule = it->second;
result->putString(it->first, gameRule->get());
}
return result;
}
void GameRules::loadFromTag(CompoundTag *tag)
{
vector<Tag *> *allTags = tag->getAllTags();
for (AUTO_VAR(it, allTags->begin()); it != allTags->end(); ++it)
{
Tag *ruleTag = *it;
wstring ruleName = ruleTag->getName();
wstring value = tag->getString(ruleTag->getName());
set(ruleName, value);
}
delete allTags;
}
// Need to delete returned vector.
vector<wstring> *GameRules::getRuleNames()
{
vector<wstring> *out = new vector<wstring>();
for (AUTO_VAR(it, rules.begin()); it != rules.end(); it++) out->push_back(it->first);
return out;
}
bool GameRules::contains(const wstring &rule)
{
AUTO_VAR(it, rules.find(rule));
return it != rules.end();
}
GameRules::GameRule::GameRule(const wstring &startValue)
{
value = L"";
booleanValue = false;
intValue = 0;
doubleValue = 0.0;
set(startValue);
}
void GameRules::GameRule::set(const wstring &newValue)
{
value = newValue;
booleanValue = _fromString<bool>(newValue);
intValue = _fromString<int>(newValue);
doubleValue = _fromString<double>(newValue);
}
wstring GameRules::GameRule::get()
{
return value;
}
bool GameRules::GameRule::getBoolean()
{
return booleanValue;
}
int GameRules::GameRule::getInt()
{
return intValue;
}
double GameRules::GameRule::getDouble()
{
return doubleValue;
}*/