TU19: merge Minecraft.World/Containers

keeping virtual destructors where possible
2026-06-11 01:22:12 +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/BeaconMenu.cpp
+++ b/Minecraft.World/Containers/BeaconMenu.cpp
@@ -0,0 +1,114 @@
+#include "../Platform/stdafx.h"
+#include "../Headers/net.minecraft.world.item.h"
+#include "../Headers/net.minecraft.world.level.tile.entity.h"
+#include "BeaconMenu.h"
+
+BeaconMenu::BeaconMenu(std::shared_ptr<Container> inventory,
+                       std::shared_ptr<BeaconTileEntity> beacon) {
+    this->beacon = beacon;
+
+    addSlot(paymentSlot =
+                new BeaconMenu::PaymentSlot(beacon, PAYMENT_SLOT, 136, 110));
+
+    int xo = 36;
+    int yo = 137;
+
+    for (int y = 0; y < 3; y++) {
+        for (int x = 0; x < 9; x++) {
+            addSlot(
+                new Slot(inventory, x + y * 9 + 9, xo + x * 18, yo + y * 18));
+        }
+    }
+    for (int x = 0; x < 9; x++) {
+        addSlot(new Slot(inventory, x, xo + x * 18, 58 + yo));
+    }
+
+    levels = beacon->getLevels();
+    primaryPower = beacon->getPrimaryPower();
+    secondaryPower = beacon->getSecondaryPower();
+}
+
+void BeaconMenu::addSlotListener(ContainerListener* listener) {
+    AbstractContainerMenu::addSlotListener(listener);
+
+    listener->setContainerData(this, 0, levels);
+    listener->setContainerData(this, 1, primaryPower);
+    listener->setContainerData(this, 2, secondaryPower);
+}
+
+void BeaconMenu::setData(int id, int value) {
+    if (id == 0) beacon->setLevels(value);
+    if (id == 1) beacon->setPrimaryPower(value);
+    if (id == 2) beacon->setSecondaryPower(value);
+}
+
+std::shared_ptr<BeaconTileEntity> BeaconMenu::getBeacon() { return beacon; }
+
+bool BeaconMenu::stillValid(std::shared_ptr<Player> player) {
+    return beacon->stillValid(player);
+}
+
+std::shared_ptr<ItemInstance> BeaconMenu::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 == PAYMENT_SLOT) {
+            if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
+                                 true)) {
+                return nullptr;
+            }
+            slot->onQuickCraft(stack, clicked);
+        } else if (!paymentSlot->hasItem() && paymentSlot->mayPlace(stack) &&
+                   stack->count == 1) {
+            if (!moveItemStackTo(stack, PAYMENT_SLOT, PAYMENT_SLOT + 1,
+                                 false)) {
+                return nullptr;
+            }
+        } else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) {
+            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 (!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) {
+            return nullptr;
+        } else {
+            slot->onTake(player, stack);
+        }
+    }
+    return clicked;
+}
+
+BeaconMenu::PaymentSlot::PaymentSlot(std::shared_ptr<Container> container,
+                                     int slot, int x, int y)
+    : Slot(container, slot, x, y) {}
+
+bool BeaconMenu::PaymentSlot::mayPlace(std::shared_ptr<ItemInstance> item) {
+    if (item != NULL) {
+        return (item->id == Item::emerald_Id || item->id == Item::diamond_Id ||
+                item->id == Item::goldIngot_Id ||
+                item->id == Item::ironIngot_Id);
+    }
+    return false;
+}
+
+int BeaconMenu::PaymentSlot::getMaxStackSize() { return 1; }