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

13
Minecraft.World/CraftingMenu.cpp
View File

@@ -23,9 +23,9 @@ CraftingMenu::CraftingMenu(shared_ptr<Inventory> inventory, Level *level, int xt
resultSlots = shared_ptr<ResultContainer>( new ResultContainer() );
this->level = level;
this->x = xt;
this->y = yt;
this->z = zt;
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++)
@@ -81,7 +81,7 @@ bool CraftingMenu::stillValid(shared_ptr<Player> player)
shared_ptr<ItemInstance> CraftingMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
{
shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = slots->at(slotIndex);
Slot *slot = slots.at(slotIndex);
if (slot != NULL && slot->hasItem())
{
shared_ptr<ItemInstance> stack = slot->getItem();
@@ -135,4 +135,9 @@ shared_ptr<ItemInstance> CraftingMenu::quickMoveStack(shared_ptr<Player> player,
}
}
return clicked;
}
bool CraftingMenu::canTakeItemForPickAll(shared_ptr<ItemInstance> carried, Slot *target)
{
return target->container != resultSlots && AbstractContainerMenu::canTakeItemForPickAll(carried, target);
}