mirror of
https://forge.banditvault.co.uk/racoon/MinecraftConsoles.git
synced 2026-06-25 15:55:54 +00:00
feat: TU19 (Dec 2014) Features & Content (#155)
* 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 97a43994725008e35fceb984d5549df9c8cea470. * 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:
@@ -1,6 +1,6 @@
|
||||
#include "stdafx.h"
|
||||
#include "net.minecraft.world.entity.player.h"
|
||||
|
||||
#include "ContainerOpenPacket.h"
|
||||
#include "CompoundContainer.h"
|
||||
|
||||
CompoundContainer::CompoundContainer(int name, shared_ptr<Container> c1, shared_ptr<Container> c2)
|
||||
@@ -12,14 +12,38 @@ CompoundContainer::CompoundContainer(int name, shared_ptr<Container> c1, shared_
|
||||
this->c2 = c2;
|
||||
}
|
||||
|
||||
int CompoundContainer::getContainerType()
|
||||
{
|
||||
return ContainerOpenPacket::LARGE_CHEST;
|
||||
}
|
||||
|
||||
unsigned int CompoundContainer::getContainerSize()
|
||||
{
|
||||
return c1->getContainerSize() + c2->getContainerSize();
|
||||
}
|
||||
|
||||
int CompoundContainer::getName()
|
||||
bool CompoundContainer::contains(shared_ptr<Container> c)
|
||||
{
|
||||
return name;
|
||||
return c1 == c || c2 == c;
|
||||
}
|
||||
|
||||
wstring CompoundContainer::getName()
|
||||
{
|
||||
if (c1->hasCustomName()) return c1->getName();
|
||||
if (c2->hasCustomName()) return c2->getName();
|
||||
return app.GetString(name);
|
||||
}
|
||||
|
||||
wstring CompoundContainer::getCustomName()
|
||||
{
|
||||
if (c1->hasCustomName()) return c1->getName();
|
||||
if (c2->hasCustomName()) return c2->getName();
|
||||
return L"";
|
||||
}
|
||||
|
||||
bool CompoundContainer::hasCustomName()
|
||||
{
|
||||
return c1->hasCustomName() || c2->hasCustomName();
|
||||
}
|
||||
|
||||
shared_ptr<ItemInstance> CompoundContainer::getItem(unsigned int slot)
|
||||
@@ -72,4 +96,9 @@ void CompoundContainer::stopOpen()
|
||||
{
|
||||
c1->stopOpen();
|
||||
c2->stopOpen();
|
||||
}
|
||||
|
||||
bool CompoundContainer::canPlaceItem(int slot, shared_ptr<ItemInstance> item)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
Reference in New Issue
Block a user