LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-19 00:38:15 +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

24
Minecraft.World/Containers/ArmorSlot.cpp
View File

@@ -13,6 +13,9 @@ ArmorSlot::ArmorSlot(int slotNum, std::shared_ptr<Container> container, int id,
int ArmorSlot::getMaxStackSize() { return 1; }
bool ArmorSlot::mayPlace(std::shared_ptr<ItemInstance> item) {
if (item == NULL) {
return false;
}
if (dynamic_cast<ArmorItem*>(item->getItem()) != NULL) {
return dynamic_cast<ArmorItem*>(item->getItem())->slot == slotNum;
}
@@ -26,25 +29,24 @@ bool ArmorSlot::mayPlace(std::shared_ptr<ItemInstance> item) {
Icon* ArmorSlot::getNoItemIcon() { return ArmorItem::getEmptyIcon(slotNum); }
//
// bool ArmorSlot::mayCombine(std::shared_ptr<ItemInstance> item)
// bool ArmorSlot::mayCombine(shared_ptr<ItemInstance> item)
//{
// std::shared_ptr<ItemInstance> thisItemI = getItem();
// shared_ptr<ItemInstance> thisItemI = getItem();
// if(thisItemI == NULL || item == NULL) return false;
//
// ArmorItem *thisItem = (ArmorItem *)thisItemI->getItem();
// bool thisIsDyableArmor = thisItem->getMaterial() ==
//ArmorItem::ArmorMaterial::CLOTH; bool itemIsDye = item->id ==
//Item::dye_powder_Id; return thisIsDyableArmor && itemIsDye;
// ArmorItem::ArmorMaterial::CLOTH; bool itemIsDye = item->id ==
// Item::dye_powder_Id; return thisIsDyableArmor && itemIsDye;
//}
//
// std::shared_ptr<ItemInstance>
// ArmorSlot::combine(std::shared_ptr<ItemInstance> item)
// shared_ptr<ItemInstance> ArmorSlot::combine(shared_ptr<ItemInstance> item)
//{
// std::shared_ptr<CraftingContainer> craftSlots =
//std::shared_ptr<CraftingContainer>( new CraftingContainer(NULL, 2, 2) );
// shared_ptr<CraftingContainer> craftSlots =
// shared_ptr<CraftingContainer>( new CraftingContainer(NULL, 2, 2) );
// craftSlots->setItem(0, item);
// craftSlots->setItem(1, getItem()); // Armour item needs to go second
// std::shared_ptr<ItemInstance> result =
//ArmorDyeRecipe::assembleDyedArmor(craftSlots); craftSlots->setItem(0,
//nullptr); craftSlots->setItem(1, nullptr); return result;
// shared_ptr<ItemInstance> result =
// ArmorDyeRecipe::assembleDyedArmor(craftSlots); craftSlots->setItem(0,
// nullptr); craftSlots->setItem(1, nullptr); return result;
//}