LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-02 08:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-dev' into cleanup/nullptr-replacement

Browse Source 
# Conflicts:
#	Minecraft.Client/Network/PlayerChunkMap.cpp
#	Minecraft.Client/Network/PlayerList.cpp
#	Minecraft.Client/Network/ServerChunkCache.cpp
#	Minecraft.Client/Platform/Common/Consoles_App.cpp
#	Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
#	Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp
#	Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
#	Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp
#	Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp
#	Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.cpp
#	Minecraft.Client/Platform/Common/UI/UIController.h
#	Minecraft.Client/Platform/Extrax64Stubs.cpp
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h
#	Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h
#	Minecraft.Client/Player/EntityTracker.cpp
#	Minecraft.Client/Player/ServerPlayer.cpp
#	Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp
#	Minecraft.Client/Textures/Packs/DLCTexturePack.cpp
#	Minecraft.Client/Textures/Stitching/StitchedTexture.cpp
#	Minecraft.Client/Textures/Stitching/TextureMap.cpp
#	Minecraft.Client/Textures/Textures.cpp
#	Minecraft.World/Blocks/NotGateTile.cpp
#	Minecraft.World/Blocks/PressurePlateTile.cpp
#	Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp
#	Minecraft.World/Enchantments/EnchantmentHelper.cpp
#	Minecraft.World/Entities/HangingEntity.cpp
#	Minecraft.World/Entities/LeashFenceKnotEntity.cpp
#	Minecraft.World/Entities/LivingEntity.cpp
#	Minecraft.World/Entities/Mobs/Boat.cpp
#	Minecraft.World/Entities/Mobs/Minecart.cpp
#	Minecraft.World/Entities/Mobs/Witch.cpp
#	Minecraft.World/Entities/SyncedEntityData.cpp
#	Minecraft.World/Items/LeashItem.cpp
#	Minecraft.World/Items/PotionItem.cpp
#	Minecraft.World/Level/BaseMobSpawner.cpp
#	Minecraft.World/Level/CustomLevelSource.cpp
#	Minecraft.World/Level/Level.cpp
#	Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp
#	Minecraft.World/Level/Storage/McRegionLevelStorage.cpp
#	Minecraft.World/Level/Storage/RegionFileCache.cpp
#	Minecraft.World/Player/Player.cpp
#	Minecraft.World/WorldGen/Biomes/BiomeCache.cpp
#	Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp
#	Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
This commit is contained in:
MatthewBeshay
2026-03-30 16:28:40 +11:00
parent dfb0e3b03e 00cd713cc8
commit a0fdc643d1
265 changed files with 1408 additions and 1426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Minecraft.World/Level/Storage/EntityIO.cpp
View File

@@ -231,7 +231,7 @@ std::shared_ptr<Entity> EntityIO::newEntity(const std::wstring& id,
Level* level) {
std::shared_ptr<Entity> entity;
AUTO_VAR(it, idCreateMap->find(id));
auto it = idCreateMap->find(id);
if (it != idCreateMap->end()) {
entityCreateFn create = it->second;
if (create != nullptr) entity = std::shared_ptr<Entity>(create(level));
@@ -265,7 +265,7 @@ std::shared_ptr<Entity> EntityIO::loadStatic(CompoundTag* tag, Level* level) {
tag->remove(L"Type");
}
AUTO_VAR(it, idCreateMap->find(tag->getString(L"id")));
auto it = idCreateMap->find(tag->getString(L"id"));
if (it != idCreateMap->end()) {
entityCreateFn create = it->second;
if (create != nullptr) entity = std::shared_ptr<Entity>(create(level));
@@ -289,7 +289,7 @@ std::shared_ptr<Entity> EntityIO::loadStatic(CompoundTag* tag, Level* level) {
std::shared_ptr<Entity> EntityIO::newById(int id, Level* level) {
std::shared_ptr<Entity> entity;
AUTO_VAR(it, numCreateMap->find(id));
auto it = numCreateMap->find(id);
if (it != numCreateMap->end()) {
entityCreateFn create = it->second;
if (create != nullptr) entity = std::shared_ptr<Entity>(create(level));
@@ -314,7 +314,7 @@ std::shared_ptr<Entity> EntityIO::newByEnumType(eINSTANCEOF eType,
eINSTANCEOFKeyEq>::iterator it =
classNumMap->find(eType);
if (it != classNumMap->end()) {
AUTO_VAR(it2, numCreateMap->find(it->second));
auto it2 = numCreateMap->find(it->second);
if (it2 != numCreateMap->end()) {
entityCreateFn create = it2->second;
if (create != nullptr) entity = std::shared_ptr<Entity>(create(level));
@@ -346,7 +346,7 @@ std::wstring EntityIO::getEncodeId(std::shared_ptr<Entity> entity) {
}
int EntityIO::getId(const std::wstring& encodeId) {
AUTO_VAR(it, idNumMap->find(encodeId));
auto it = idNumMap->find(encodeId);
if (it == idNumMap->end()) {
// defaults to pig...
return 90;
@@ -361,7 +361,7 @@ std::wstring EntityIO::getEncodeId(int entityIoValue) {
// return classIdMap.get(class1);
// }
AUTO_VAR(it, numClassMap->find(entityIoValue));
auto it = numClassMap->find(entityIoValue);
if (it != numClassMap->end()) {
std::unordered_map<eINSTANCEOF, std::wstring, eINSTANCEOFKeyHash,
eINSTANCEOFKeyEq>::iterator classIdIt =
@@ -378,7 +378,7 @@ std::wstring EntityIO::getEncodeId(int entityIoValue) {
int EntityIO::getNameId(int entityIoValue) {
int id = -1;
AUTO_VAR(it, idsSpawnableInCreative.find(entityIoValue));
auto it = idsSpawnableInCreative.find(entityIoValue);
if (it != idsSpawnableInCreative.end()) {
id = it->second->nameId;
}
@@ -387,7 +387,7 @@ int EntityIO::getNameId(int entityIoValue) {
}
eINSTANCEOF EntityIO::getType(const std::wstring& idString) {
AUTO_VAR(it, numClassMap->find(getId(idString)));
auto it = numClassMap->find(getId(idString));
if (it != numClassMap->end()) {
return it->second;
}
@@ -395,7 +395,7 @@ eINSTANCEOF EntityIO::getType(const std::wstring& idString) {
}
eINSTANCEOF EntityIO::getClass(int id) {
AUTO_VAR(it, numClassMap->find(id));
auto it = numClassMap->find(id);
if (it != numClassMap->end()) {
return it->second;
}