LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 03:06:54 +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

24
Minecraft.World/Containers/AbstractContainerMenu.cpp
View File

@@ -42,24 +42,24 @@ void AbstractContainerMenu::addSlotListener(ContainerListener* listener) {
}
void AbstractContainerMenu::removeSlotListener(ContainerListener* listener) {
AUTO_VAR(it, find(containerListeners.begin(), containerListeners.end(),
listener));
auto it = find(containerListeners.begin(), containerListeners.end(),
listener);
if (it != containerListeners.end()) containerListeners.erase(it);
}
std::vector<std::shared_ptr<ItemInstance> >* AbstractContainerMenu::getItems() {
std::vector<std::shared_ptr<ItemInstance> >* items =
new std::vector<std::shared_ptr<ItemInstance> >();
AUTO_VAR(itEnd, slots.end());
for (AUTO_VAR(it, slots.begin()); it != itEnd; it++) {
auto itEnd = slots.end();
for (auto it = slots.begin(); it != itEnd; it++) {
items->push_back((*it)->getItem());
}
return items;
}
void AbstractContainerMenu::sendData(int id, int value) {
AUTO_VAR(itEnd, containerListeners.end());
for (AUTO_VAR(it, containerListeners.begin()); it != itEnd; it++) {
auto itEnd = containerListeners.end();
for (auto it = containerListeners.begin(); it != itEnd; it++) {
(*it)->setContainerData(this, id, value);
}
}
@@ -79,8 +79,8 @@ void AbstractContainerMenu::broadcastChanges() {
lastSlots[i] = expected;
m_bNeedsRendered = true;
AUTO_VAR(itEnd, containerListeners.end());
for (AUTO_VAR(it, containerListeners.begin()); it != itEnd; it++) {
auto itEnd = containerListeners.end();
for (auto it = containerListeners.begin(); it != itEnd; it++) {
(*it)->slotChanged(this, i, expected);
}
}
@@ -111,8 +111,8 @@ bool AbstractContainerMenu::clickMenuButton(std::shared_ptr<Player> player,
Slot* AbstractContainerMenu::getSlotFor(std::shared_ptr<Container> c,
int index) {
AUTO_VAR(itEnd, slots.end());
for (AUTO_VAR(it, slots.begin()); it != itEnd; it++) {
auto itEnd = slots.end();
for (auto it = slots.begin(); it != itEnd; it++) {
Slot* slot = *it; // slots->at(i);
if (slot->isAt(c, index)) {
return slot;
@@ -174,7 +174,7 @@ std::shared_ptr<ItemInstance> AbstractContainerMenu::clicked(
inventory->getCarried()->copy();
int remaining = inventory->getCarried()->count;
for (AUTO_VAR(it, quickcraftSlots.begin());
for (auto it = quickcraftSlots.begin();
it != quickcraftSlots.end(); ++it) {
Slot* slot = *it;
if (slot != nullptr &&
@@ -520,7 +520,7 @@ bool AbstractContainerMenu::isSynched(std::shared_ptr<Player> player) {
void AbstractContainerMenu::setSynched(std::shared_ptr<Player> player,
bool synched) {
if (synched) {
AUTO_VAR(it, unSynchedPlayers.find(player));
auto it = unSynchedPlayers.find(player);
if (it != unSynchedPlayers.end()) unSynchedPlayers.erase(it);
} else {