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

TU19: merge Minecraft.World/Containers

Browse Source 
keeping virtual destructors where possible
This commit is contained in:
Tropical
2026-03-21 15:18:52 -05:00
parent db0a6b2e6a
commit f25cd66f4d
56 changed files with 1412 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Minecraft.World/Containers/FurnaceMenu.cpp
View File

@@ -44,8 +44,8 @@ void FurnaceMenu::addSlotListener(ContainerListener* listener) {
void FurnaceMenu::broadcastChanges() {
AbstractContainerMenu::broadcastChanges();
AUTO_VAR(itEnd, containerListeners->end());
for (AUTO_VAR(it, containerListeners->begin()); it != itEnd; it++) {
AUTO_VAR(itEnd, containerListeners.end());
for (AUTO_VAR(it, containerListeners.begin()); it != itEnd; it++) {
ContainerListener* listener = *it; // containerListeners->at(i);
if (tc != furnace->tickCount) {
listener->setContainerData(this, 0, furnace->tickCount);
@@ -76,7 +76,7 @@ bool FurnaceMenu::stillValid(std::shared_ptr<Player> player) {
std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(
std::shared_ptr<Player> player, int slotIndex) {
std::shared_ptr<ItemInstance> clicked = nullptr;
Slot* slot = slots->at(slotIndex);
Slot* slot = slots.at(slotIndex);
// Slot *IngredientSlot = slots->at(INGREDIENT_SLOT);
bool charcoalUsed = furnace->wasCharcoalUsed();
@@ -140,12 +140,13 @@ std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(
}
std::shared_ptr<ItemInstance> FurnaceMenu::clicked(
int slotIndex, int buttonNum, int clickType,
std::shared_ptr<Player> player) {
int slotIndex, int buttonNum, int clickType, std::shared_ptr<Player> player,
bool looped) // 4J Added looped param
{
bool charcoalUsed = furnace->wasCharcoalUsed();
std::shared_ptr<ItemInstance> out =
AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
std::shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(
slotIndex, buttonNum, clickType, player, looped);
#ifdef _EXTENDED_ACHIEVEMENTS
if (charcoalUsed && (out != nullptr) &&