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

19
Minecraft.World/ContainerMenu.cpp
View File

@@ -11,7 +11,7 @@
ContainerMenu::ContainerMenu(shared_ptr<Container> inventory, shared_ptr<Container> container) : AbstractContainerMenu()
{
this->container = container;
this->containerRows = container->getContainerSize() / 9;
containerRows = container->getContainerSize() / 9;
container->startOpen();
int yo = (containerRows - 4) * 18;
@@ -45,7 +45,7 @@ bool ContainerMenu::stillValid(shared_ptr<Player> player)
shared_ptr<ItemInstance> ContainerMenu::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();
@@ -53,7 +53,7 @@ shared_ptr<ItemInstance> ContainerMenu::quickMoveStack(shared_ptr<Player> player
if (slotIndex < containerRows * 9)
{
if(!moveItemStackTo(stack, containerRows * 9, (int)slots->size(), true))
if(!moveItemStackTo(stack, containerRows * 9, (int)slots.size(), true))
{
// 4J Stu - Brought forward from 1.2
return nullptr;
@@ -85,9 +85,14 @@ void ContainerMenu::removed(shared_ptr<Player> player)
container->stopOpen();
}
shared_ptr<ItemInstance> ContainerMenu::clicked(int slotIndex, int buttonNum, int clickType, shared_ptr<Player> player)
shared_ptr<Container> ContainerMenu::getContainer()
{
shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
return container;
}
shared_ptr<ItemInstance> ContainerMenu::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
shared_ptr<LocalPlayer> localPlayer = dynamic_pointer_cast<LocalPlayer>(player);
@@ -98,7 +103,7 @@ shared_ptr<ItemInstance> ContainerMenu::clicked(int slotIndex, int buttonNum, in
for (int i = 0; i < container->getContainerSize(); i++)
{
shared_ptr<ItemInstance> item = container->getItem(i);
if ( (item != nullptr) && (item->id == Tile::stoneBrick_Id) )
if ( (item != nullptr) && (item->id == Tile::cobblestone_Id) )
{
cobblecount += item->GetCount();
}
@@ -107,7 +112,7 @@ shared_ptr<ItemInstance> ContainerMenu::clicked(int slotIndex, int buttonNum, in
// 4J-JEV: This check performed on XboxOne servers, for other platforms check here.
#ifndef _DURANGO
StatsCounter *sc = Minecraft::GetInstance()->stats[localPlayer->GetXboxPad()];
int minedCount = sc->getTotalValue(GenericStats::blocksMined(Tile::rock_Id)) + sc->getTotalValue(GenericStats::blocksMined(Tile::stoneBrick_Id));
int minedCount = sc->getTotalValue(GenericStats::blocksMined(Tile::stone_Id)) + sc->getTotalValue(GenericStats::blocksMined(Tile::cobblestone_Id));
if (cobblecount >= 1728 && minedCount >= 1728 )
#endif
{