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

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Minecraft.World/McRegionLevelStorageSource.cpp
View File

@@ -51,12 +51,12 @@ vector<LevelSummary *> *McRegionLevelStorageSource::getLevelList()
wstring levelId = file->getName();
LevelData *levelData = getDataTagFor(levelId);
if (levelData != NULL)
if (levelData != nullptr)
{
bool requiresConversion = levelData->getVersion() != McRegionLevelStorage::MCREGION_VERSION_ID;
wstring levelName = levelData->getLevelName();
if (levelName.empty()) // 4J Jev TODO: levelName can't be NULL? if (levelName == NULL || isEmpty(levelName))
if (levelName.empty()) // 4J Jev TODO: levelName can't be nullptr? if (levelName == nullptr || isEmpty(levelName))
{
levelName = levelId;
}
@@ -76,14 +76,14 @@ void McRegionLevelStorageSource::clearAll()
shared_ptr<LevelStorage> McRegionLevelStorageSource::selectLevel(ConsoleSaveFile *saveFile, const wstring& levelId, bool createPlayerDir)
{
// return new LevelStorageProfilerDecorator(new McRegionLevelStorage(baseDir, levelId, createPlayerDir));
return shared_ptr<LevelStorage>(new McRegionLevelStorage(saveFile, baseDir, levelId, createPlayerDir));
return std::make_shared<McRegionLevelStorage>(saveFile, baseDir, levelId, createPlayerDir);
}
bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile *saveFile, const wstring& levelId)
{
// check if there is old file format level data
LevelData *levelData = getDataTagFor(saveFile, levelId);
if (levelData == NULL || levelData->getVersion() != 0)
if (levelData == nullptr || levelData->getVersion() != 0)
{
delete levelData;
return false;
@@ -96,7 +96,7 @@ bool McRegionLevelStorageSource::isConvertible(ConsoleSaveFile *saveFile, const
bool McRegionLevelStorageSource::requiresConversion(ConsoleSaveFile *saveFile, const wstring& levelId)
{
LevelData *levelData = getDataTagFor(saveFile, levelId);
if (levelData == NULL || levelData->getVersion() != 0)
if (levelData == nullptr || levelData->getVersion() != 0)
{
delete levelData;
return false;
@@ -275,7 +275,7 @@ void McRegionLevelStorageSource::eraseFolders(vector<File *> *folders, int curre
folder->_delete();
currentCount++;
int percent = (int) Math::round(100.0 * (double) currentCount / (double) totalCount);
int percent = static_cast<int>(Math::round(100.0 * (double)currentCount / (double)totalCount));
progress->progressStagePercentage(percent);
}
}