/*
-Minetest-c55
-Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "inventory.h"
#include "serialization.h"
-#include "utility.h"
#include "debug.h"
#include <sstream>
#include "log.h"
#include "itemdef.h"
-#include "strfnd.h"
+#include "util/strfnd.h"
#include "content_mapnode.h" // For loading legacy MaterialItems
#include "nameidmapping.h" // For loading legacy MaterialItems
+#include "util/serialize.h"
+#include "util/string.h"
/*
ItemStack
static content_t content_translate_from_19_to_internal(content_t c_from)
{
- for(u32 i=0; i<sizeof(trans_table_19)/sizeof(trans_table_19[0]); i++)
- {
- if(trans_table_19[i][1] == c_from)
- {
- return trans_table_19[i][0];
+ for (const auto &tt : trans_table_19) {
+ if(tt[1] == c_from) {
+ return tt[0];
}
}
return c_from;
}
-// If the string contains spaces, quotes or control characters, encodes as JSON.
-// Else returns the string unmodified.
-static std::string serializeJsonStringIfNeeded(const std::string &s)
-{
- for(size_t i = 0; i < s.size(); ++i)
- {
- if(s[i] <= 0x1f || s[i] >= 0x7f || s[i] == ' ' || s[i] == '\"')
- return serializeJsonString(s);
- }
- return s;
-}
-
-// Parses a string serialized by serializeJsonStringIfNeeded.
-static std::string deSerializeJsonStringIfNeeded(std::istream &is)
+ItemStack::ItemStack(const std::string &name_, u16 count_,
+ u16 wear_, IItemDefManager *itemdef) :
+ name(itemdef->getAlias(name_)),
+ count(count_),
+ wear(wear_)
{
- std::ostringstream tmp_os;
- bool expect_initial_quote = true;
- bool is_json = false;
- bool was_backslash = false;
- for(;;)
- {
- char c = is.get();
- if(is.eof())
- break;
- if(expect_initial_quote && c == '"')
- {
- tmp_os << c;
- is_json = true;
- }
- else if(is_json)
- {
- tmp_os << c;
- if(was_backslash)
- was_backslash = false;
- else if(c == '\\')
- was_backslash = true;
- else if(c == '"')
- break; // Found end of string
- }
- else
- {
- if(c == ' ')
- {
- // Found end of word
- is.unget();
- break;
- }
- else
- {
- tmp_os << c;
- }
- }
- expect_initial_quote = false;
- }
- if(is_json)
- {
- std::istringstream tmp_is(tmp_os.str(), std::ios::binary);
- return deSerializeJsonString(tmp_is);
- }
- else
- return tmp_os.str();
-}
-
-
-ItemStack::ItemStack(std::string name_, u16 count_,
- u16 wear_, std::string metadata_,
- IItemDefManager *itemdef)
-{
- name = itemdef->getAlias(name_);
- count = count_;
- wear = wear_;
- metadata = metadata_;
-
- if(name.empty() || count == 0)
+ if (name.empty() || count == 0)
clear();
- else if(itemdef->get(name).type == ITEM_TOOL)
+ else if (itemdef->get(name).type == ITEM_TOOL)
count = 1;
}
void ItemStack::serialize(std::ostream &os) const
{
- DSTACK(__FUNCTION_NAME);
-
- if(empty())
+ if (empty())
return;
// Check how many parts of the itemstring are needed
parts = 2;
if(wear != 0)
parts = 3;
- if(metadata != "")
+ if (!metadata.empty())
parts = 4;
os<<serializeJsonStringIfNeeded(name);
os<<" "<<count;
if(parts >= 3)
os<<" "<<wear;
- if(parts >= 4)
- os<<" "<<serializeJsonStringIfNeeded(metadata);
+ if (parts >= 4) {
+ os << " ";
+ metadata.serialize(os);
+ }
}
void ItemStack::deSerialize(std::istream &is, IItemDefManager *itemdef)
{
- DSTACK(__FUNCTION_NAME);
-
clear();
// Read name
std::getline(is, tmp, ' ');
if(!tmp.empty())
throw SerializationError("Unexpected text after item name");
-
+
if(name == "MaterialItem")
{
// Obsoleted on 2011-07-30
// Convert old materials
if(material <= 0xff)
material = content_translate_from_19_to_internal(material);
- if(material > MAX_CONTENT)
+ if(material > 0xfff)
throw SerializationError("Too large material number");
// Convert old id to name
NameIdMapping legacy_nimap;
content_mapnode_get_name_id_mapping(&legacy_nimap);
legacy_nimap.getName(material, name);
- if(name == "")
+ if(name.empty())
name = "unknown_block";
- name = itemdef->getAlias(name);
+ if (itemdef)
+ name = itemdef->getAlias(name);
count = materialcount;
}
else if(name == "MaterialItem2")
is>>material;
u16 materialcount;
is>>materialcount;
- if(material > MAX_CONTENT)
+ if(material > 0xfff)
throw SerializationError("Too large material number");
// Convert old id to name
NameIdMapping legacy_nimap;
content_mapnode_get_name_id_mapping(&legacy_nimap);
legacy_nimap.getName(material, name);
- if(name == "")
+ if(name.empty())
name = "unknown_block";
- name = itemdef->getAlias(name);
+ if (itemdef)
+ name = itemdef->getAlias(name);
count = materialcount;
}
else if(name == "node" || name == "NodeItem" || name == "MaterialItem3"
Strfnd fnd(all);
fnd.next("\"");
// If didn't skip to end, we have ""s
- if(!fnd.atend()){
+ if(!fnd.at_end()){
name = fnd.next("\"");
} else { // No luck, just read a word then
fnd.start(all);
name = fnd.next(" ");
}
fnd.skip_over(" ");
- name = itemdef->getAlias(name);
+ if (itemdef)
+ name = itemdef->getAlias(name);
count = stoi(trim(fnd.next("")));
if(count == 0)
count = 1;
Strfnd fnd(all);
fnd.next("\"");
// If didn't skip to end, we have ""s
- if(!fnd.atend()){
+ if(!fnd.at_end()){
name = fnd.next("\"");
} else { // No luck, just read a word then
fnd.start(all);
count = 1;
// Then read wear
fnd.skip_over(" ");
- name = itemdef->getAlias(name);
+ if (itemdef)
+ name = itemdef->getAlias(name);
wear = stoi(trim(fnd.next("")));
}
else
// The real thing
// Apply item aliases
- name = itemdef->getAlias(name);
+ if (itemdef)
+ name = itemdef->getAlias(name);
// Read the count
std::string count_str;
std::getline(is, count_str, ' ');
- if(count_str.empty())
- {
+ if (count_str.empty()) {
count = 1;
break;
}
- else
- count = stoi(count_str);
+
+ count = stoi(count_str);
// Read the wear
std::string wear_str;
std::getline(is, wear_str, ' ');
if(wear_str.empty())
break;
- else
- wear = stoi(wear_str);
+
+ wear = stoi(wear_str);
// Read metadata
- metadata = deSerializeJsonStringIfNeeded(is);
+ metadata.deSerialize(is);
// In case fields are added after metadata, skip space here:
//std::getline(is, tmp, ' ');
} while(false);
}
- if(name.empty() || count == 0)
+ if (name.empty() || count == 0)
clear();
- else if(itemdef->get(name).type == ITEM_TOOL)
+ else if (itemdef && itemdef->get(name).type == ITEM_TOOL)
count = 1;
}
std::string ItemStack::getItemString() const
{
- // Get item string
std::ostringstream os(std::ios::binary);
serialize(os);
return os.str();
}
-ItemStack ItemStack::addItem(const ItemStack &newitem_,
- IItemDefManager *itemdef)
-{
- ItemStack newitem = newitem_;
+ItemStack ItemStack::addItem(ItemStack newitem, IItemDefManager *itemdef)
+{
// If the item is empty or the position invalid, bail out
if(newitem.empty())
{
*this = newitem;
newitem.clear();
}
- // If item name differs, bail out
- else if(name != newitem.name)
+ // If item name or metadata differs, bail out
+ else if (name != newitem.name
+ || metadata != newitem.metadata)
{
// cannot be added
}
return newitem;
}
-bool ItemStack::itemFits(const ItemStack &newitem_,
+bool ItemStack::itemFits(ItemStack newitem,
ItemStack *restitem,
IItemDefManager *itemdef) const
{
- ItemStack newitem = newitem_;
// If the item is empty or the position invalid, bail out
if(newitem.empty())
{
newitem.clear();
}
- // If item name differs, bail out
- else if(name != newitem.name)
+ // If item name or metadata differs, bail out
+ else if (name != newitem.name
+ || metadata != newitem.metadata)
{
// cannot be added
}
newitem.clear();
}
// Else the item does not fit fully. Return the rest.
- // the rest.
else
{
u16 freespace = freeSpace(itemdef);
if(restitem)
*restitem = newitem;
+
return newitem.empty();
}
Inventory
*/
-InventoryList::InventoryList(std::string name, u32 size, IItemDefManager *itemdef)
+InventoryList::InventoryList(const std::string &name, u32 size, IItemDefManager *itemdef):
+ m_name(name),
+ m_size(size),
+ m_itemdef(itemdef)
{
- m_name = name;
- m_size = size;
- m_itemdef = itemdef;
clearItems();
- //m_dirty = false;
-}
-
-InventoryList::~InventoryList()
-{
}
void InventoryList::clearItems()
{
m_items.clear();
- for(u32 i=0; i<m_size; i++)
- {
- m_items.push_back(ItemStack());
+ for (u32 i=0; i < m_size; i++) {
+ m_items.emplace_back();
}
//setDirty(true);
m_size = newsize;
}
+void InventoryList::setWidth(u32 newwidth)
+{
+ m_width = newwidth;
+}
+
void InventoryList::setName(const std::string &name)
{
m_name = name;
void InventoryList::serialize(std::ostream &os) const
{
//os.imbue(std::locale("C"));
-
- for(u32 i=0; i<m_items.size(); i++)
- {
- const ItemStack &item = m_items[i];
- if(item.empty())
- {
+
+ os<<"Width "<<m_width<<"\n";
+
+ for (const auto &item : m_items) {
+ if (item.empty()) {
os<<"Empty";
- }
- else
- {
+ } else {
os<<"Item ";
item.serialize(os);
}
clearItems();
u32 item_i = 0;
+ m_width = 0;
- for(;;)
- {
+ while (is.good()) {
std::string line;
std::getline(is, line, '\n');
std::string name;
std::getline(iss, name, ' ');
- if(name == "EndInventoryList")
- {
- break;
- }
+ if (name == "EndInventoryList")
+ return;
+
// This is a temporary backwards compatibility fix
- else if(name == "end")
- {
- break;
+ if (name == "end")
+ return;
+
+ if (name == "Width") {
+ iss >> m_width;
+ if (iss.fail())
+ throw SerializationError("incorrect width property");
}
else if(name == "Item")
{
throw SerializationError("too many items");
m_items[item_i++].clear();
}
- else
- {
- throw SerializationError("Unknown inventory identifier");
- }
}
+
+ // Contents given to deSerialize() were not terminated properly: throw error.
+
+ std::ostringstream ss;
+ ss << "Malformatted inventory list. list="
+ << m_name << ", read " << item_i << " of " << getSize()
+ << " ItemStacks." << std::endl;
+ throw SerializationError(ss.str());
}
InventoryList::InventoryList(const InventoryList &other)
{
m_items = other.m_items;
m_size = other.m_size;
+ m_width = other.m_width;
m_name = other.m_name;
m_itemdef = other.m_itemdef;
//setDirty(true);
return *this;
}
+bool InventoryList::operator == (const InventoryList &other) const
+{
+ if(m_size != other.m_size)
+ return false;
+ if(m_width != other.m_width)
+ return false;
+ if(m_name != other.m_name)
+ return false;
+ for (u32 i = 0; i < m_items.size(); i++)
+ if (m_items[i] != other.m_items[i])
+ return false;
+
+ return true;
+}
+
const std::string &InventoryList::getName() const
{
return m_name;
return m_items.size();
}
+u32 InventoryList::getWidth() const
+{
+ return m_width;
+}
+
u32 InventoryList::getUsedSlots() const
{
u32 num = 0;
- for(u32 i=0; i<m_items.size(); i++)
- {
- if(!m_items[i].empty())
+ for (const auto &m_item : m_items) {
+ if (!m_item.empty())
num++;
}
return num;
const ItemStack& InventoryList::getItem(u32 i) const
{
- assert(i < m_size);
+ assert(i < m_size); // Pre-condition
return m_items[i];
}
ItemStack& InventoryList::getItem(u32 i)
{
- assert(i < m_size);
+ assert(i < m_size); // Pre-condition
return m_items[i];
}
void InventoryList::deleteItem(u32 i)
{
- assert(i < m_items.size());
+ assert(i < m_items.size()); // Pre-condition
m_items[i].clear();
}
if(newitem.empty())
return newitem;
-
+
/*
First try to find if it could be added to some existing items
*/
return false;
}
-bool InventoryList::containsItem(const ItemStack &item) const
+bool InventoryList::containsItem(const ItemStack &item, bool match_meta) const
{
u32 count = item.count;
- if(count == 0)
+ if (count == 0)
return true;
- for(std::vector<ItemStack>::const_reverse_iterator
- i = m_items.rbegin();
- i != m_items.rend(); i++)
- {
- if(count == 0)
+
+ for (auto i = m_items.rbegin(); i != m_items.rend(); ++i) {
+ if (count == 0)
break;
- if(i->name == item.name)
- {
- if(i->count >= count)
+ if (i->name == item.name && (!match_meta || (i->metadata == item.metadata))) {
+ if (i->count >= count)
return true;
- else
- count -= i->count;
+
+ count -= i->count;
}
}
return false;
ItemStack InventoryList::removeItem(const ItemStack &item)
{
ItemStack removed;
- for(std::vector<ItemStack>::reverse_iterator
- i = m_items.rbegin();
- i != m_items.rend(); i++)
- {
- if(i->name == item.name)
- {
+ for (auto i = m_items.rbegin(); i != m_items.rend(); ++i) {
+ if (i->name == item.name) {
u32 still_to_remove = item.count - removed.count;
removed.addItem(i->takeItem(still_to_remove), m_itemdef);
- if(removed.count == item.count)
+ if (removed.count == item.count)
break;
}
}
return taken;
}
-ItemStack InventoryList::peekItem(u32 i, u32 peekcount) const
+void InventoryList::moveItemSomewhere(u32 i, InventoryList *dest, u32 count)
{
- if(i >= m_items.size())
- return ItemStack();
+ // Take item from source list
+ ItemStack item1;
+ if (count == 0)
+ item1 = changeItem(i, ItemStack());
+ else
+ item1 = takeItem(i, count);
- return m_items[i].peekItem(peekcount);
+ if (item1.empty())
+ return;
+
+ // Try to add the item to destination list
+ u32 dest_size = dest->getSize();
+ // First try all the non-empty slots
+ for (u32 dest_i = 0; dest_i < dest_size; dest_i++) {
+ if (!m_items[dest_i].empty()) {
+ item1 = dest->addItem(dest_i, item1);
+ if (item1.empty()) return;
+ }
+ }
+
+ // Then try all the empty ones
+ for (u32 dest_i = 0; dest_i < dest_size; dest_i++) {
+ if (m_items[dest_i].empty()) {
+ item1 = dest->addItem(dest_i, item1);
+ if (item1.empty()) return;
+ }
+ }
+
+ // If we reach this, the item was not fully added
+ // Add the remaining part back to the source item
+ addItem(i, item1);
}
-void InventoryList::moveItem(u32 i, InventoryList *dest, u32 dest_i, u32 count)
+u32 InventoryList::moveItem(u32 i, InventoryList *dest, u32 dest_i,
+ u32 count, bool swap_if_needed, bool *did_swap)
{
if(this == dest && i == dest_i)
- return;
+ return count;
// Take item from source list
ItemStack item1;
item1 = takeItem(i, count);
if(item1.empty())
- return;
+ return 0;
// Try to add the item to destination list
u32 oldcount = item1.count;
// If olditem is returned, nothing was added.
// Swap the items
- if(nothing_added)
- {
+ if (nothing_added && swap_if_needed) {
+ // Tell that we swapped
+ if (did_swap != NULL) {
+ *did_swap = true;
+ }
// Take item from source list
item1 = changeItem(i, ItemStack());
// Adding was not possible, swap the items.
changeItem(i, item2);
}
}
+ return (oldcount - item1.count);
}
/*
void Inventory::clear()
{
- for(u32 i=0; i<m_lists.size(); i++)
- {
- delete m_lists[i];
+ m_dirty = true;
+ for (auto &m_list : m_lists) {
+ delete m_list;
}
m_lists.clear();
}
void Inventory::clearContents()
{
- for(u32 i=0; i<m_lists.size(); i++)
- {
- InventoryList *list = m_lists[i];
- for(u32 j=0; j<list->getSize(); j++)
- {
+ m_dirty = true;
+ for (InventoryList *list : m_lists) {
+ for (u32 j=0; j<list->getSize(); j++) {
list->deleteItem(j);
}
}
Inventory::Inventory(IItemDefManager *itemdef)
{
+ m_dirty = false;
m_itemdef = itemdef;
}
Inventory::Inventory(const Inventory &other)
{
*this = other;
+ m_dirty = false;
}
Inventory & Inventory::operator = (const Inventory &other)
// Gracefully handle self assignment
if(this != &other)
{
+ m_dirty = true;
clear();
m_itemdef = other.m_itemdef;
- for(u32 i=0; i<other.m_lists.size(); i++)
- {
- m_lists.push_back(new InventoryList(*other.m_lists[i]));
+ for (InventoryList *list : other.m_lists) {
+ m_lists.push_back(new InventoryList(*list));
}
}
return *this;
}
-void Inventory::serialize(std::ostream &os) const
+bool Inventory::operator == (const Inventory &other) const
{
+ if(m_lists.size() != other.m_lists.size())
+ return false;
+
for(u32 i=0; i<m_lists.size(); i++)
{
- InventoryList *list = m_lists[i];
+ if(*m_lists[i] != *other.m_lists[i])
+ return false;
+ }
+ return true;
+}
+
+void Inventory::serialize(std::ostream &os) const
+{
+ for (InventoryList *list : m_lists) {
os<<"List "<<list->getName()<<" "<<list->getSize()<<"\n";
list->serialize(os);
}
{
clear();
- for(;;)
- {
+ while (is.good()) {
std::string line;
std::getline(is, line, '\n');
std::string name;
std::getline(iss, name, ' ');
- if(name == "EndInventory")
- {
- break;
- }
+ if (name == "EndInventory")
+ return;
+
// This is a temporary backwards compatibility fix
- else if(name == "end")
- {
- break;
- }
- else if(name == "List")
- {
+ if (name == "end")
+ return;
+
+ if (name == "List") {
std::string listname;
u32 listsize;
}
else
{
- throw SerializationError("Unknown inventory identifier");
+ throw SerializationError("invalid inventory specifier: " + name);
}
}
+
+ // Contents given to deSerialize() were not terminated properly: throw error.
+
+ std::ostringstream ss;
+ ss << "Malformatted inventory (damaged?). "
+ << m_lists.size() << " lists read." << std::endl;
+ throw SerializationError(ss.str());
}
InventoryList * Inventory::addList(const std::string &name, u32 size)
{
+ m_dirty = true;
s32 i = getListIndex(name);
if(i != -1)
{
}
return m_lists[i];
}
- else
- {
- InventoryList *list = new InventoryList(name, size, m_itemdef);
- m_lists.push_back(list);
- return list;
- }
+
+
+ //don't create list with invalid name
+ if (name.find(' ') != std::string::npos) return NULL;
+
+ InventoryList *list = new InventoryList(name, size, m_itemdef);
+ m_lists.push_back(list);
+ return list;
}
InventoryList * Inventory::getList(const std::string &name)
std::vector<const InventoryList*> Inventory::getLists()
{
std::vector<const InventoryList*> lists;
- for(u32 i=0; i<m_lists.size(); i++)
- {
- InventoryList *list = m_lists[i];
+ for (auto list : m_lists) {
lists.push_back(list);
}
return lists;
s32 i = getListIndex(name);
if(i == -1)
return false;
+ m_dirty = true;
delete m_lists[i];
m_lists.erase(m_lists.begin() + i);
return true;
projects / oweals / minetest.git / blobdiff