mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-17 20:10:23 +03:00
* Initial cleanup.
Will now need to cleanup includes, which will take a while ...
This commit is contained in:
iProgramInCpp
@@ -1,280 +0,0 @@
|
||||
#include "Inventory.hpp"
|
||||
#include "Item.hpp"
|
||||
|
||||
Inventory::Inventory(Player* pPlayer)
|
||||
{
|
||||
m_pPlayer = pPlayer;
|
||||
m_SelectedHotbarSlot = 0;
|
||||
|
||||
for (int i = 0; i < C_MAX_HOTBAR_ITEMS; i++)
|
||||
m_hotbar[i] = -1;
|
||||
}
|
||||
|
||||
void Inventory::prepareCreativeInventory()
|
||||
{
|
||||
m_bIsSurvival = false;
|
||||
|
||||
m_items.clear();
|
||||
|
||||
addCreativeItem(Tile::rock->m_ID);
|
||||
addCreativeItem(Tile::stoneBrick->m_ID);
|
||||
addCreativeItem(Tile::sandStone->m_ID);
|
||||
addCreativeItem(Tile::wood->m_ID);
|
||||
addCreativeItem(Tile::treeTrunk->m_ID);
|
||||
addCreativeItem(Tile::goldBlock->m_ID);
|
||||
addCreativeItem(Tile::ironBlock->m_ID);
|
||||
addCreativeItem(Tile::emeraldBlock->m_ID);
|
||||
addCreativeItem(Tile::redBrick->m_ID);
|
||||
addCreativeItem(Tile::leaves->m_ID);
|
||||
addCreativeItem(Tile::cloth_10->m_ID);
|
||||
addCreativeItem(Tile::cloth_20->m_ID);
|
||||
addCreativeItem(Tile::cloth_30->m_ID);
|
||||
addCreativeItem(Tile::cloth_40->m_ID);
|
||||
addCreativeItem(Tile::cloth_50->m_ID);
|
||||
addCreativeItem(Tile::cloth_60->m_ID);
|
||||
addCreativeItem(Tile::cloth_70->m_ID);
|
||||
addCreativeItem(Tile::glass->m_ID);
|
||||
addCreativeItem(Tile::cloth_01->m_ID);
|
||||
addCreativeItem(Tile::cloth_11->m_ID);
|
||||
addCreativeItem(Tile::cloth_21->m_ID);
|
||||
addCreativeItem(Tile::cloth_31->m_ID);
|
||||
addCreativeItem(Tile::cloth_41->m_ID);
|
||||
addCreativeItem(Tile::stairs_wood->m_ID);
|
||||
addCreativeItem(Tile::stairs_stone->m_ID);
|
||||
addCreativeItem(Tile::stoneSlabHalf->m_ID);
|
||||
addCreativeItem(Tile::sand->m_ID);
|
||||
addCreativeItem(Tile::ladder->m_ID);
|
||||
addCreativeItem(Tile::torch->m_ID);
|
||||
addCreativeItem(Tile::flower->m_ID);
|
||||
addCreativeItem(Tile::rose->m_ID);
|
||||
addCreativeItem(Tile::mushroom1->m_ID);
|
||||
addCreativeItem(Tile::mushroom2->m_ID);
|
||||
addCreativeItem(Tile::reeds->m_ID);
|
||||
addCreativeItem(Tile::obsidian->m_ID);
|
||||
addCreativeItem(Tile::dirt->m_ID);
|
||||
addCreativeItem(Tile::tnt->m_ID);
|
||||
addCreativeItem(Tile::gravel->m_ID);
|
||||
addCreativeItem(Tile::cloth->m_ID);
|
||||
addCreativeItem(Tile::mossStone->m_ID);
|
||||
addCreativeItem(Tile::bookshelf->m_ID);
|
||||
addCreativeItem(Tile::sponge->m_ID);
|
||||
addCreativeItem(Tile::sapling->m_ID);
|
||||
addCreativeItem(Tile::water->m_ID);
|
||||
addCreativeItem(Tile::lava->m_ID);
|
||||
addCreativeItem(Tile::fire->m_ID);
|
||||
addCreativeItem(Item::camera->m_itemID);
|
||||
addCreativeItem(Item::door_wood->m_itemID);
|
||||
addCreativeItem(Item::door_iron->m_itemID);
|
||||
|
||||
for (int i = 0; i < C_MAX_HOTBAR_ITEMS; i++)
|
||||
m_hotbar[i] = i;
|
||||
}
|
||||
|
||||
void Inventory::prepareSurvivalInventory()
|
||||
{
|
||||
m_bIsSurvival = true;
|
||||
m_items.clear();
|
||||
m_items.resize(C_NUM_SURVIVAL_SLOTS);
|
||||
|
||||
// Add some items for testing
|
||||
addTestItem(Item::stick->m_itemID, 64);
|
||||
addTestItem(Item::wheat->m_itemID, 64);
|
||||
addTestItem(Item::sugar->m_itemID, 64);
|
||||
addTestItem(Item::camera->m_itemID, 64);
|
||||
|
||||
for (int i = 0; i < C_MAX_HOTBAR_ITEMS; i++)
|
||||
m_hotbar[i] = i;
|
||||
}
|
||||
|
||||
int Inventory::getNumSlots()
|
||||
{
|
||||
if (m_bIsSurvival)
|
||||
return C_NUM_SURVIVAL_SLOTS;
|
||||
|
||||
return getNumItems();
|
||||
}
|
||||
|
||||
int Inventory::getNumItems()
|
||||
{
|
||||
return int(m_items.size());
|
||||
}
|
||||
|
||||
void Inventory::addCreativeItem(int itemID, int auxValue)
|
||||
{
|
||||
m_items.emplace_back(ItemInstance(itemID, 1, auxValue));
|
||||
}
|
||||
|
||||
void Inventory::clear()
|
||||
{
|
||||
m_items.clear();
|
||||
m_items.resize(C_NUM_SURVIVAL_SLOTS);
|
||||
}
|
||||
|
||||
void Inventory::addItem(ItemInstance* pInst)
|
||||
{
|
||||
if (!m_bIsSurvival)
|
||||
{
|
||||
// Just get rid of the item.
|
||||
pInst->m_amount = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
// look for an item with the same ID
|
||||
for (int i = 0; i < getNumItems(); i++)
|
||||
{
|
||||
if (m_items[i].m_itemID != pInst->m_itemID)
|
||||
continue;
|
||||
|
||||
int maxStackSize = m_items[i].getMaxStackSize();
|
||||
bool bIsStackedByData = Item::items[pInst->m_itemID]->isStackedByData();
|
||||
if (bIsStackedByData && m_items[i].m_auxValue != pInst->m_auxValue)
|
||||
continue;
|
||||
|
||||
// try to collate.
|
||||
int combinedItemAmount = pInst->m_amount + m_items[i].m_amount;
|
||||
|
||||
int leftover = combinedItemAmount - maxStackSize;
|
||||
if (leftover < 0)
|
||||
leftover = 0;
|
||||
else
|
||||
combinedItemAmount = C_MAX_AMOUNT;
|
||||
|
||||
m_items[i].m_amount = combinedItemAmount;
|
||||
|
||||
pInst->m_amount = leftover;
|
||||
|
||||
if (!bIsStackedByData)
|
||||
m_items[i].m_auxValue = 0;
|
||||
}
|
||||
|
||||
// If there's nothing leftover:
|
||||
if (!pInst->m_amount)
|
||||
return;
|
||||
|
||||
// try to add it to an empty slot
|
||||
for (int i = 0; i < getNumItems(); i++)
|
||||
{
|
||||
if (m_items[i].m_itemID != 0)
|
||||
continue;
|
||||
|
||||
m_items[i] = *pInst;
|
||||
pInst->m_amount = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
void Inventory::addTestItem(int itemID, int amount, int auxValue)
|
||||
{
|
||||
ItemInstance inst(itemID, amount, auxValue);
|
||||
addItem(&inst);
|
||||
|
||||
if (inst.m_amount != 0)
|
||||
{
|
||||
LogMsg("AddTestItem: Couldn't add all %d of %s, only gave %d",
|
||||
amount, Item::items[itemID]->m_DescriptionID.c_str(), amount - inst.m_amount);
|
||||
}
|
||||
}
|
||||
|
||||
ItemInstance* Inventory::getItem(int slotNo)
|
||||
{
|
||||
if (slotNo < 0 || slotNo >= int(m_items.size()))
|
||||
return nullptr;
|
||||
|
||||
if (m_items[slotNo].m_amount <= 0)
|
||||
m_items[slotNo].m_itemID = 0;
|
||||
|
||||
return &m_items[slotNo];
|
||||
}
|
||||
|
||||
int Inventory::getQuickSlotItemId(int slotNo)
|
||||
{
|
||||
if (slotNo < 0 || slotNo >= C_MAX_HOTBAR_ITEMS)
|
||||
return -1;
|
||||
|
||||
int idx = m_hotbar[slotNo];
|
||||
ItemInstance* pInst = getItem(idx);
|
||||
if (!pInst)
|
||||
return -1;
|
||||
|
||||
return pInst->m_itemID;
|
||||
}
|
||||
|
||||
ItemInstance* Inventory::getQuickSlotItem(int slotNo)
|
||||
{
|
||||
if (slotNo < 0 || slotNo >= C_MAX_HOTBAR_ITEMS)
|
||||
return nullptr;
|
||||
|
||||
return getItem(m_hotbar[slotNo]);
|
||||
}
|
||||
|
||||
ItemInstance* Inventory::getSelectedItem()
|
||||
{
|
||||
return getQuickSlotItem(m_SelectedHotbarSlot);
|
||||
}
|
||||
|
||||
int Inventory::getSelectedItemId()
|
||||
{
|
||||
return getQuickSlotItemId(m_SelectedHotbarSlot);
|
||||
}
|
||||
|
||||
void Inventory::selectItem(int slotNo)
|
||||
{
|
||||
if (slotNo < 0 || slotNo >= getNumItems())
|
||||
return;
|
||||
|
||||
// look for it in the hotbar
|
||||
for (int i = 0; i < C_MAX_HOTBAR_ITEMS; i++)
|
||||
{
|
||||
if (m_hotbar[i] == slotNo)
|
||||
{
|
||||
m_SelectedHotbarSlot = i;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = C_MAX_HOTBAR_ITEMS - 2; i >= 0; i--)
|
||||
m_hotbar[i + 1] = m_hotbar[i];
|
||||
|
||||
m_hotbar[0] = slotNo;
|
||||
m_SelectedHotbarSlot = 0;
|
||||
}
|
||||
|
||||
void Inventory::selectSlot(int slotNo)
|
||||
{
|
||||
if (slotNo < 0 || slotNo >= C_MAX_HOTBAR_ITEMS)
|
||||
return;
|
||||
|
||||
m_SelectedHotbarSlot = slotNo;
|
||||
}
|
||||
|
||||
void Inventory::setQuickSlotIndexByItemId(int slotNo, int itemID)
|
||||
{
|
||||
if (slotNo < 0 || slotNo >= C_MAX_HOTBAR_ITEMS)
|
||||
return;
|
||||
|
||||
if (m_bIsSurvival)
|
||||
return; // TODO
|
||||
|
||||
for (int i = 0; i < getNumItems(); i++)
|
||||
{
|
||||
if (m_items[i].m_itemID == itemID)
|
||||
{
|
||||
m_hotbar[slotNo] = i;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
m_hotbar[slotNo] = -1;
|
||||
}
|
||||
|
||||
void Inventory::selectItemById(int itemID)
|
||||
{
|
||||
for (int i = 0; i < getNumItems(); i++)
|
||||
{
|
||||
if (m_items[i].m_itemID != itemID)
|
||||
continue;
|
||||
|
||||
selectItem(i);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "Player.hpp"
|
||||
#include "ItemInstance.hpp"
|
||||
|
||||
class Player; // in case we're included from Player.hpp
|
||||
|
||||
#define C_MAX_HOTBAR_ITEMS (9)
|
||||
#define C_NUM_SURVIVAL_SLOTS (36)
|
||||
#define C_MAX_AMOUNT (64)
|
||||
|
||||
class Inventory
|
||||
{
|
||||
public:
|
||||
Inventory(Player*);
|
||||
void prepareCreativeInventory();
|
||||
void prepareSurvivalInventory();
|
||||
|
||||
int getNumSlots();
|
||||
int getNumItems();
|
||||
|
||||
void addCreativeItem(int itemID, int auxValue = 0);
|
||||
void addTestItem(int itemID, int amount, int auxValue = 0);
|
||||
|
||||
void clear();
|
||||
void addItem(ItemInstance* pInst);
|
||||
|
||||
ItemInstance* getItem(int slotNo);
|
||||
ItemInstance* getQuickSlotItem(int slotNo);
|
||||
ItemInstance* getSelectedItem();
|
||||
int getQuickSlotItemId(int slotNo);
|
||||
int getSelectedItemId();
|
||||
void selectItem(int slotNo); // selects an item by slot number and puts it in the quick slots if needed
|
||||
void selectSlot(int slotNo);
|
||||
|
||||
void setQuickSlotIndexByItemId(int slotNo, int itemID);
|
||||
void selectItemById(int itemID);
|
||||
|
||||
int getSelectedSlotNo() const
|
||||
{
|
||||
return m_SelectedHotbarSlot;
|
||||
}
|
||||
|
||||
public:
|
||||
int m_SelectedHotbarSlot = 0;
|
||||
private:
|
||||
Player* m_pPlayer = nullptr;
|
||||
bool m_bIsSurvival = false;
|
||||
|
||||
int m_hotbar[C_MAX_HOTBAR_ITEMS];
|
||||
std::vector<ItemInstance> m_items;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user