Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Minecraft.World/InventoryMenu.cpp
View File

@@ -94,12 +94,12 @@ bool InventoryMenu::stillValid(shared_ptr<Player> player)
shared_ptr<ItemInstance> InventoryMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
{
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())
@@ -225,16 +225,21 @@ bool InventoryMenu::mayCombine(Slot *slot, shared_ptr<ItemInstance> item)
return slot->mayCombine(item);
}
// 4J-JEV: Added for achievement 'Iron Man'.
shared_ptr<ItemInstance> InventoryMenu::clicked(int slotIndex, int buttonNum, int clickType, shared_ptr<Player> player)
bool InventoryMenu::canTakeItemForPickAll(shared_ptr<ItemInstance> carried, Slot *target)
{
shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
return target->container != resultSlots && AbstractContainerMenu::canTakeItemForPickAll(carried, target);
}
// 4J-JEV: Added for achievement 'Iron Man'.
shared_ptr<ItemInstance> InventoryMenu::clicked(int slotIndex, int buttonNum, int clickType, shared_ptr<Player> player, bool looped) // 4J Added looped param
{
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]) )
{
return out;