TU19: merge Minecraft.World/Containers

keeping virtual destructors where possible
2026-07-09 04:58:48 +00:00 · 2026-03-21 15:18:52 -05:00
parent db0a6b2e6a
commit f25cd66f4d
56 changed files with 1412 additions and 373 deletions
--- a/Minecraft.World/Containers/FireworksMenu.cpp
+++ b/Minecraft.World/Containers/FireworksMenu.cpp
@@ -0,0 +1,136 @@
+#include "../Platform/stdafx.h"
+#include "../Headers/net.minecraft.world.entity.player.h"
+#include "../Headers/net.minecraft.world.level.h"
+#include "../Headers/net.minecraft.world.level.tile.h"
+#include "../Headers/net.minecraft.world.item.h"
+#include "../Headers/net.minecraft.world.item.crafting.h"
+#include "CraftingContainer.h"
+#include "ResultContainer.h"
+#include "ResultSlot.h"
+#include "FireworksMenu.h"
+
+FireworksMenu::FireworksMenu(std::shared_ptr<Inventory> inventory, Level* level,
+                             int xt, int yt, int zt)
+    : AbstractContainerMenu() {
+    m_canMakeFireworks = false;
+    m_canMakeCharge = false;
+    m_canMakeFade = false;
+
+    craftSlots =
+        std::shared_ptr<CraftingContainer>(new CraftingContainer(this, 3, 3));
+    resultSlots = std::shared_ptr<ResultContainer>(new ResultContainer());
+
+    this->level = level;
+    x = xt;
+    y = yt;
+    z = zt;
+    addSlot(new ResultSlot(inventory->player, craftSlots, resultSlots, 0,
+                           120 + 4, 31 + 4));
+
+    for (int y = 0; y < 3; y++) {
+        for (int x = 0; x < 3; x++) {
+            addSlot(new Slot(craftSlots, x + y * 3, 30 + x * 18, 17 + y * 18));
+        }
+    }
+
+    for (int y = 0; y < 3; y++) {
+        for (int x = 0; x < 9; x++) {
+            addSlot(
+                new Slot(inventory, x + y * 9 + 9, 8 + x * 18, 84 + y * 18));
+        }
+    }
+    for (int x = 0; x < 9; x++) {
+        addSlot(new Slot(inventory, x, 8 + x * 18, 142));
+    }
+
+    slotsChanged();  // 4J - removed craftSlots parameter, see comment below
+}
+
+void FireworksMenu::slotsChanged()  // 4J used to take a shared_ptr<Container>
+                                    // but wasn't using it, so removed to
+                                    // simplify things
+{
+    FireworksRecipe::updatePossibleRecipes(craftSlots, &m_canMakeFireworks,
+                                           &m_canMakeCharge, &m_canMakeFade);
+    resultSlots->setItem(0, Recipes::getInstance()->getItemFor(
+                                craftSlots, level, Recipes::pFireworksRecipes));
+}
+
+void FireworksMenu::removed(std::shared_ptr<Player> player) {
+    AbstractContainerMenu::removed(player);
+    if (level->isClientSide) return;
+
+    for (int i = 0; i < 9; i++) {
+        std::shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
+        if (item != NULL) {
+            player->drop(item);
+        }
+    }
+}
+
+bool FireworksMenu::stillValid(std::shared_ptr<Player> player) { return true; }
+
+std::shared_ptr<ItemInstance> FireworksMenu::quickMoveStack(
+    std::shared_ptr<Player> player, int slotIndex) {
+    std::shared_ptr<ItemInstance> clicked = nullptr;
+    Slot* slot = slots.at(slotIndex);
+    if (slot != NULL && slot->hasItem()) {
+        std::shared_ptr<ItemInstance> stack = slot->getItem();
+        clicked = stack->copy();
+
+        if (slotIndex == RESULT_SLOT) {
+            if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
+                                 true)) {
+                return nullptr;
+            }
+            slot->onQuickCraft(stack, clicked);
+        } else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) {
+            if (isValidIngredient(stack, -1) &&
+                moveItemStackTo(stack, CRAFT_SLOT_START, CRAFT_SLOT_END,
+                                false)) {
+            } else if (!moveItemStackTo(stack, USE_ROW_SLOT_START,
+                                        USE_ROW_SLOT_END, false)) {
+                return nullptr;
+            }
+        } else if (slotIndex >= USE_ROW_SLOT_START &&
+                   slotIndex < USE_ROW_SLOT_END) {
+            if (isValidIngredient(stack, -1) &&
+                moveItemStackTo(stack, CRAFT_SLOT_START, CRAFT_SLOT_END,
+                                false)) {
+            } else if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END,
+                                        false)) {
+                return nullptr;
+            }
+        } else {
+            if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
+                                 false)) {
+                return nullptr;
+            }
+        }
+        if (stack->count == 0) {
+            slot->set(nullptr);
+        } else {
+            slot->setChanged();
+        }
+        if (stack->count == clicked->count) {
+            // nothing moved
+            return nullptr;
+        } else {
+            slot->onTake(player, stack);
+        }
+    }
+    return clicked;
+}
+
+bool FireworksMenu::canTakeItemForPickAll(std::shared_ptr<ItemInstance> carried,
+                                          Slot* target) {
+    return target->container != resultSlots &&
+           AbstractContainerMenu::canTakeItemForPickAll(carried, target);
+}
+
+bool FireworksMenu::isValidIngredient(std::shared_ptr<ItemInstance> item,
+                                      int slotId) {
+    if (item == NULL || slotId == RESULT_SLOT) return true;
+    return FireworksRecipe::isValidIngredient(item, m_canMakeFireworks,
+                                              m_canMakeCharge, m_canMakeFade);
+}