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

33
Minecraft.World/Containers/InventoryMenu.cpp
View File

@@ -65,9 +65,9 @@ void InventoryMenu::_init(std::shared_ptr<Inventory> inventory, bool active) {
slotsChanged(); // 4J removed craftSlots parameter, see comment below
}
void InventoryMenu::slotsChanged() // 4J used to take a
// std::shared_ptr<Container> but wasn't
// using it, so removed to simplify things
void InventoryMenu::slotsChanged() // 4J used to take a shared_ptr<Container>
// but wasn't using it, so removed to
// simplify things
{
MemSect(23);
resultSlots->setItem(
@@ -92,12 +92,12 @@ bool InventoryMenu::stillValid(std::shared_ptr<Player> player) { return true; }
std::shared_ptr<ItemInstance> InventoryMenu::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* HelmetSlot = slots->at(ARMOR_SLOT_START);
Slot* ChestplateSlot = slots->at(ARMOR_SLOT_START + 1);
Slot* LeggingsSlot = slots->at(ARMOR_SLOT_START + 2);
Slot* BootsSlot = slots->at(ARMOR_SLOT_START + 3);
Slot* HelmetSlot = slots.at(ARMOR_SLOT_START);
Slot* ChestplateSlot = slots.at(ARMOR_SLOT_START + 1);
Slot* LeggingsSlot = slots.at(ARMOR_SLOT_START + 2);
Slot* BootsSlot = slots.at(ARMOR_SLOT_START + 3);
if (slot != NULL && slot->hasItem()) {
std::shared_ptr<ItemInstance> stack = slot->getItem();
@@ -211,18 +211,25 @@ bool InventoryMenu::mayCombine(Slot* slot, std::shared_ptr<ItemInstance> item) {
return slot->mayCombine(item);
}
bool InventoryMenu::canTakeItemForPickAll(std::shared_ptr<ItemInstance> carried,
Slot* target) {
return target->container != resultSlots &&
AbstractContainerMenu::canTakeItemForPickAll(carried, target);
}
// 4J-JEV: Added for achievement 'Iron Man'.
std::shared_ptr<ItemInstance> InventoryMenu::clicked(
int slotIndex, int buttonNum, int clickType,
std::shared_ptr<Player> player) {
std::shared_ptr<ItemInstance> out =
AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
int slotIndex, int buttonNum, int clickType, std::shared_ptr<Player> player,
bool looped) // 4J Added looped param
{
std::shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(
slotIndex, buttonNum, clickType, player, looped);
#ifdef _EXTENDED_ACHIEVEMENTS
static int ironItems[4] = {Item::helmet_iron_Id, Item::chestplate_iron_Id,
Item::leggings_iron_Id, Item::boots_iron_Id};
for (int i = ARMOR_SLOT_START; i < ARMOR_SLOT_END; i++) {
Slot* slot = slots->at(i);
Slot* slot = slots.at(i);
if ((slot == NULL) || (!slot->hasItem()) ||
(slot->getItem()->getItem()->id !=
ironItems[i - ARMOR_SLOT_START])) {