#include "util/serialize.h"
#include "util/string.h"
#include "util/numeric.h"
-#include "strfnd.h"
+#include "util/strfnd.h"
#include "exceptions.h"
inline bool isGroupRecipeStr(const std::string &rec_name)
inline u64 getHashForString(const std::string &recipe_str)
{
- /*errorstream << "Hashing craft string \"" << recipe_str << "\"";*/
+ /*errorstream << "Hashing craft string \"" << recipe_str << '"';*/
return murmur_hash_64_ua(recipe_str.data(), recipe_str.length(), 0xdeadbeef);
}
case CRAFT_HASH_TYPE_ITEM_NAMES: {
std::ostringstream os;
bool is_first = true;
- for (size_t i = 0; i < grid_names.size(); i++) {
- if (grid_names[i] != "") {
- os << (is_first ? "" : "\n") << grid_names[i];
+ for (const std::string &grid_name : grid_names) {
+ if (!grid_name.empty()) {
+ os << (is_first ? "" : "\n") << grid_name;
is_first = false;
}
}
return getHashForString(os.str());
} case CRAFT_HASH_TYPE_COUNT: {
u64 cnt = 0;
- for (size_t i = 0; i < grid_names.size(); i++)
- if (grid_names[i] != "")
+ for (const std::string &grid_name : grid_names)
+ if (!grid_name.empty())
cnt++;
return cnt;
} case CRAFT_HASH_TYPE_UNHASHED:
}
// invalid CraftHashType
assert(false);
+ return 0;
}
// Check if input matches recipe
const std::string &rec_name, IItemDefManager *idef)
{
// Exact name
- if(inp_name == rec_name)
+ if (inp_name == rec_name)
return true;
// Group
const struct ItemDefinition &def = idef->get(inp_name);
Strfnd f(rec_name.substr(6));
bool all_groups_match = true;
- do{
+ do {
std::string check_group = f.next(",");
- if(itemgroup_get(def.groups, check_group) == 0){
+ if (itemgroup_get(def.groups, check_group) == 0) {
all_groups_match = false;
break;
}
- }while(!f.atend());
- if(all_groups_match)
+ } while (!f.at_end());
+ if (all_groups_match)
return true;
}
const std::vector<std::string> &itemstrings, IGameDef *gamedef)
{
std::vector<std::string> result;
- for(std::vector<std::string>::const_iterator
- i = itemstrings.begin();
- i != itemstrings.end(); i++)
- {
- result.push_back(craftGetItemName(*i, gamedef));
+ for (const auto &itemstring : itemstrings) {
+ result.push_back(craftGetItemName(itemstring, gamedef));
}
return result;
}
const std::vector<ItemStack> &items, IGameDef *gamedef)
{
std::vector<std::string> result;
- for(std::vector<ItemStack>::const_iterator
- i = items.begin();
- i != items.end(); i++)
- {
- result.push_back(i->name);
+ for (const auto &item : items) {
+ result.push_back(item.name);
}
return result;
}
const std::vector<std::string> &items, IGameDef *gamedef)
{
std::vector<ItemStack> result;
- for(std::vector<std::string>::const_iterator
- i = items.begin();
- i != items.end(); i++)
- {
- result.push_back(ItemStack(std::string(*i),(u16)1,(u16)0,"",gamedef->getItemDefManager()));
+ for (const auto &item : items) {
+ result.emplace_back(std::string(item), (u16)1,
+ (u16)0, gamedef->getItemDefManager());
}
return result;
}
bool success = false;
unsigned int x = 0;
unsigned int y = 0;
- for(std::vector<std::string>::const_iterator
- i = items.begin();
- i != items.end(); i++)
- {
- if(*i != "") // Is this an actual item?
- {
- if(!success)
- {
+ for (const std::string &item : items) {
+ // Is this an actual item?
+ if (!item.empty()) {
+ if (!success) {
// This is the first nonempty item
min_x = max_x = x;
min_y = max_y = y;
success = true;
- }
- else
- {
- if(x < min_x) min_x = x;
- if(x > max_x) max_x = x;
- if(y < min_y) min_y = y;
- if(y > max_y) max_y = y;
+ } else {
+ if (x < min_x) min_x = x;
+ if (x > max_x) max_x = x;
+ if (y < min_y) min_y = y;
+ if (y > max_y) max_y = y;
}
}
// Step coordinate
x++;
- if(x == width)
- {
+ if (x == width) {
x = 0;
y++;
}
// Removes 1 from each item stack
static void craftDecrementInput(CraftInput &input, IGameDef *gamedef)
{
- for(std::vector<ItemStack>::iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(i->count != 0)
- i->remove(1);
+ for (auto &item : input.items) {
+ if (item.count != 0)
+ item.remove(1);
}
}
// Example: if replacements contains the pair ("bucket:bucket_water", "bucket:bucket_empty"),
// a water bucket will not be removed but replaced by an empty bucket.
static void craftDecrementOrReplaceInput(CraftInput &input,
+ std::vector<ItemStack> &output_replacements,
const CraftReplacements &replacements,
IGameDef *gamedef)
{
- if(replacements.pairs.empty())
- {
+ if (replacements.pairs.empty()) {
craftDecrementInput(input, gamedef);
return;
}
// Make a copy of the replacements pair list
std::vector<std::pair<std::string, std::string> > pairs = replacements.pairs;
- for(std::vector<ItemStack>::iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(i->count == 1)
- {
- // Find an appropriate replacement
- bool found_replacement = false;
- for(std::vector<std::pair<std::string, std::string> >::iterator
- j = pairs.begin();
- j != pairs.end(); j++)
- {
- ItemStack from_item;
- from_item.deSerialize(j->first, gamedef->idef());
- if(i->name == from_item.name)
- {
- i->deSerialize(j->second, gamedef->idef());
+ for (auto &item : input.items) {
+ // Find an appropriate replacement
+ bool found_replacement = false;
+ for (auto j = pairs.begin(); j != pairs.end(); ++j) {
+ if (inputItemMatchesRecipe(item.name, j->first, gamedef->idef())) {
+ if (item.count == 1) {
+ item.deSerialize(j->second, gamedef->idef());
found_replacement = true;
pairs.erase(j);
break;
}
+
+ ItemStack rep;
+ rep.deSerialize(j->second, gamedef->idef());
+ item.remove(1);
+ found_replacement = true;
+ output_replacements.push_back(rep);
+ break;
+
}
- // No replacement was found, simply decrement count to zero
- if(!found_replacement)
- i->remove(1);
- }
- else if(i->count >= 2)
- {
- // Ignore replacements for items with count >= 2
- i->remove(1);
}
+ // No replacement was found, simply decrement count by one
+ if (!found_replacement && item.count > 0)
+ item.remove(1);
}
}
unsigned int width)
{
std::ostringstream os(std::ios::binary);
- os<<"{ ";
+ os << "{ ";
unsigned int x = 0;
- for(std::vector<std::string>::const_iterator
- i = items.begin();
- i != items.end(); i++, x++)
- {
- if(x == width)
- {
- os<<"; ";
+ for(std::vector<std::string>::size_type i = 0;
+ i < items.size(); i++, x++) {
+ if (x == width) {
+ os << "; ";
x = 0;
+ } else if (x != 0) {
+ os << ",";
}
- else if(x != 0)
- {
- os<<",";
- }
- os<<"\""<<(*i)<<"\"";
+ os << '"' << items[i] << '"';
}
- os<<" }";
+ os << " }";
return os.str();
}
unsigned int width)
{
std::ostringstream os(std::ios::binary);
- os<<"{ ";
+ os << "{ ";
unsigned int x = 0;
- for(std::vector<ItemStack>::const_iterator
- i = items.begin();
- i != items.end(); i++, x++)
- {
- if(x == width)
- {
- os<<"; ";
+ for (std::vector<ItemStack>::size_type i = 0;
+ i < items.size(); i++, x++) {
+ if (x == width) {
+ os << "; ";
x = 0;
+ } else if (x != 0) {
+ os << ",";
}
- else if(x != 0)
- {
- os<<",";
- }
- os<<"\""<<(i->getItemString())<<"\"";
+ os << '"' << (items[i].getItemString()) << '"';
}
- os<<" }";
+ os << " }";
return os.str();
}
std::string CraftInput::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(method="<<((int)method)<<", items="<<craftDumpMatrix(items, width)<<")";
+ os << "(method=" << ((int)method) << ", items="
+ << craftDumpMatrix(items, width) << ")";
return os.str();
}
std::string CraftOutput::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(item=\""<<item<<"\", time="<<time<<")";
+ os << "(item=\"" << item << "\", time=" << time << ")";
return os.str();
}
std::ostringstream os(std::ios::binary);
os<<"{";
const char *sep = "";
- for(std::vector<std::pair<std::string, std::string> >::const_iterator
- i = pairs.begin();
- i != pairs.end(); i++)
- {
- os<<sep<<"\""<<(i->first)<<"\"=>\""<<(i->second)<<"\"";
+ for (const auto &repl_p : pairs) {
+ os << sep
+ << '"' << (repl_p.first)
+ << "\"=>\"" << (repl_p.second) << '"';
sep = ",";
}
- os<<"}";
+ os << "}";
return os.str();
}
-void CraftReplacements::serialize(std::ostream &os) const
-{
- writeU16(os, pairs.size());
- for(u32 i=0; i<pairs.size(); i++)
- {
- os<<serializeString(pairs[i].first);
- os<<serializeString(pairs[i].second);
- }
-}
-
-void CraftReplacements::deSerialize(std::istream &is)
-{
- pairs.clear();
- u32 count = readU16(is);
- for(u32 i=0; i<count; i++)
- {
- std::string first = deSerializeString(is);
- std::string second = deSerializeString(is);
- pairs.push_back(std::make_pair(first, second));
- }
-}
-
-/*
- CraftDefinition
-*/
-
-void CraftDefinition::serialize(std::ostream &os) const
-{
- writeU8(os, 1); // version
- os<<serializeString(getName());
- serializeBody(os);
-}
-
-CraftDefinition* CraftDefinition::deSerialize(std::istream &is)
-{
- int version = readU8(is);
- if(version != 1) throw SerializationError(
- "unsupported CraftDefinition version");
- std::string name = deSerializeString(is);
- CraftDefinition *def = NULL;
- if(name == "shaped")
- {
- def = new CraftDefinitionShaped;
- }
- else if(name == "shapeless")
- {
- def = new CraftDefinitionShapeless;
- }
- else if(name == "toolrepair")
- {
- def = new CraftDefinitionToolRepair;
- }
- else if(name == "cooking")
- {
- def = new CraftDefinitionCooking;
- }
- else if(name == "fuel")
- {
- def = new CraftDefinitionFuel;
- }
- else
- {
- infostream<<"Unknown CraftDefinition name=\""<<name<<"\""<<std::endl;
- throw SerializationError("Unknown CraftDefinition name");
- }
- def->deSerializeBody(is, version);
- return def;
-}
-
/*
CraftDefinitionShaped
*/
bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) const
{
- if(input.method != CRAFT_METHOD_NORMAL)
+ if (input.method != CRAFT_METHOD_NORMAL)
return false;
// Get input item matrix
std::vector<std::string> inp_names = craftGetItemNames(input.items, gamedef);
unsigned int inp_width = input.width;
- if(inp_width == 0)
+ if (inp_width == 0)
return false;
- while(inp_names.size() % inp_width != 0)
- inp_names.push_back("");
+ while (inp_names.size() % inp_width != 0)
+ inp_names.emplace_back("");
// Get input bounds
- unsigned int inp_min_x=0, inp_max_x=0, inp_min_y=0, inp_max_y=0;
- if(!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x, inp_min_y, inp_max_y))
+ unsigned int inp_min_x = 0, inp_max_x = 0, inp_min_y = 0, inp_max_y = 0;
+ if (!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x,
+ inp_min_y, inp_max_y))
return false; // it was empty
std::vector<std::string> rec_names;
// Get recipe item matrix
unsigned int rec_width = width;
- if(rec_width == 0)
+ if (rec_width == 0)
return false;
- while(rec_names.size() % rec_width != 0)
- rec_names.push_back("");
+ while (rec_names.size() % rec_width != 0)
+ rec_names.emplace_back("");
// Get recipe bounds
unsigned int rec_min_x=0, rec_max_x=0, rec_min_y=0, rec_max_y=0;
- if(!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x, rec_min_y, rec_max_y))
+ if (!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x,
+ rec_min_y, rec_max_y))
return false; // it was empty
// Different sizes?
- if(inp_max_x - inp_min_x != rec_max_x - rec_min_x ||
+ if (inp_max_x - inp_min_x != rec_max_x - rec_min_x ||
inp_max_y - inp_min_y != rec_max_y - rec_min_y)
return false;
unsigned int w = inp_max_x - inp_min_x + 1;
unsigned int h = inp_max_y - inp_min_y + 1;
- for(unsigned int y=0; y < h; y++) {
+ for (unsigned int y=0; y < h; y++) {
unsigned int inp_y = (inp_min_y + y) * inp_width;
unsigned int rec_y = (rec_min_y + y) * rec_width;
- for(unsigned int x=0; x < w; x++) {
+ for (unsigned int x=0; x < w; x++) {
unsigned int inp_x = inp_min_x + x;
unsigned int rec_x = rec_min_x + x;
- if(!inputItemMatchesRecipe(
+ if (!inputItemMatchesRecipe(
inp_names[inp_y + inp_x],
- rec_names[rec_y + rec_x], gamedef->idef())
- ) {
+ rec_names[rec_y + rec_x], gamedef->idef())) {
return false;
}
}
return CraftInput(CRAFT_METHOD_NORMAL,width,craftGetItems(recipe,gamedef));
}
-void CraftDefinitionShaped::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionShaped::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionShaped::getHashType() const
{
- assert(hash_inited); //pre-condition
+ assert(hash_inited); // Pre-condition
bool has_group = false;
- for (size_t i = 0; i < recipe_names.size(); i++) {
- if (isGroupRecipeStr(recipe_names[i])) {
+ for (const auto &recipe_name : recipe_names) {
+ if (isGroupRecipeStr(recipe_name)) {
has_group = true;
break;
}
}
if (has_group)
return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+
+ return CRAFT_HASH_TYPE_ITEM_NAMES;
}
u64 CraftDefinitionShaped::getHash(CraftHashType type) const
{
- assert(hash_inited); //pre-condition
- if ((type == CRAFT_HASH_TYPE_ITEM_NAMES) || (type == CRAFT_HASH_TYPE_COUNT)) {
- std::vector<std::string> rec_names = recipe_names;
- std::sort(rec_names.begin(), rec_names.end());
- return getHashForGrid(type, rec_names);
- } else {
- //illegal hash type for this CraftDefinition (pre-condition)
- assert(false);
- return 0;
- }
+ assert(hash_inited); // Pre-condition
+ assert((type == CRAFT_HASH_TYPE_ITEM_NAMES)
+ || (type == CRAFT_HASH_TYPE_COUNT)); // Pre-condition
+
+ std::vector<std::string> rec_names = recipe_names;
+ std::sort(rec_names.begin(), rec_names.end());
+ return getHashForGrid(type, rec_names);
}
void CraftDefinitionShaped::initHash(IGameDef *gamedef)
std::string CraftDefinitionShaped::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(shaped, output=\""<<output
- <<"\", recipe="<<craftDumpMatrix(recipe, width)
- <<", replacements="<<replacements.dump()<<")";
+ os << "(shaped, output=\"" << output
+ << "\", recipe=" << craftDumpMatrix(recipe, width)
+ << ", replacements=" << replacements.dump() << ")";
return os.str();
}
-void CraftDefinitionShaped::serializeBody(std::ostream &os) const
-{
- os<<serializeString(output);
- writeU16(os, width);
- writeU16(os, recipe.size());
- for(u32 i=0; i<recipe.size(); i++)
- os<<serializeString(recipe[i]);
- replacements.serialize(os);
-}
-
-void CraftDefinitionShaped::deSerializeBody(std::istream &is, int version)
-{
- if(version != 1) throw SerializationError(
- "unsupported CraftDefinitionShaped version");
- output = deSerializeString(is);
- width = readU16(is);
- recipe.clear();
- u32 count = readU16(is);
- for(u32 i=0; i<count; i++)
- recipe.push_back(deSerializeString(is));
- replacements.deSerialize(is);
-}
-
/*
CraftDefinitionShapeless
*/
bool CraftDefinitionShapeless::check(const CraftInput &input, IGameDef *gamedef) const
{
- if(input.method != CRAFT_METHOD_NORMAL)
+ if (input.method != CRAFT_METHOD_NORMAL)
return false;
-
+
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for(std::vector<ItemStack>::const_iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(i->name != "")
- input_filtered.push_back(i->name);
+ for (const auto &item : input.items) {
+ if (!item.name.empty())
+ input_filtered.push_back(item.name);
}
// If there is a wrong number of items in input, no match
- if(input_filtered.size() != recipe.size()){
+ if (input_filtered.size() != recipe.size()) {
/*dstream<<"Number of input items ("<<input_filtered.size()
<<") does not match recipe size ("<<recipe.size()<<") "
<<"of recipe with output="<<output<<std::endl;*/
// If all items match, the recipe matches
bool all_match = true;
//dstream<<"Testing recipe (output="<<output<<"):";
- for(size_t i=0; i<recipe.size(); i++){
+ for (size_t i=0; i<recipe.size(); i++) {
//dstream<<" ("<<input_filtered[i]<<" == "<<recipe_copy[i]<<")";
- if(!inputItemMatchesRecipe(input_filtered[i], recipe_copy[i],
- gamedef->idef())){
+ if (!inputItemMatchesRecipe(input_filtered[i], recipe_copy[i],
+ gamedef->idef())) {
all_match = false;
break;
}
}
//dstream<<" -> match="<<all_match<<std::endl;
- if(all_match)
+ if (all_match)
return true;
- }while(std::next_permutation(recipe_copy.begin(), recipe_copy.end()));
+ } while (std::next_permutation(recipe_copy.begin(), recipe_copy.end()));
return false;
}
CraftInput CraftDefinitionShapeless::getInput(const CraftOutput &output, IGameDef *gamedef) const
{
- return CraftInput(CRAFT_METHOD_NORMAL,0,craftGetItems(recipe,gamedef));
+ return CraftInput(CRAFT_METHOD_NORMAL, 0, craftGetItems(recipe, gamedef));
}
-void CraftDefinitionShapeless::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionShapeless::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionShapeless::getHashType() const
{
- assert(hash_inited); //pre-condition
+ assert(hash_inited); // Pre-condition
bool has_group = false;
- for (size_t i = 0; i < recipe_names.size(); i++) {
- if (isGroupRecipeStr(recipe_names[i])) {
+ for (const auto &recipe_name : recipe_names) {
+ if (isGroupRecipeStr(recipe_name)) {
has_group = true;
break;
}
}
if (has_group)
return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+
+ return CRAFT_HASH_TYPE_ITEM_NAMES;
}
u64 CraftDefinitionShapeless::getHash(CraftHashType type) const
{
- assert(hash_inited); //pre-condition
- if (type == CRAFT_HASH_TYPE_ITEM_NAMES || type == CRAFT_HASH_TYPE_COUNT) {
- return getHashForGrid(type, recipe_names);
- } else {
- //illegal hash type for this CraftDefinition (pre-condition)
- assert(false);
- return 0;
- }
+ assert(hash_inited); // Pre-condition
+ assert(type == CRAFT_HASH_TYPE_ITEM_NAMES
+ || type == CRAFT_HASH_TYPE_COUNT); // Pre-condition
+ return getHashForGrid(type, recipe_names);
}
void CraftDefinitionShapeless::initHash(IGameDef *gamedef)
std::string CraftDefinitionShapeless::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(shapeless, output=\""<<output
- <<"\", recipe="<<craftDumpMatrix(recipe, recipe.size())
- <<", replacements="<<replacements.dump()<<")";
+ os << "(shapeless, output=\"" << output
+ << "\", recipe=" << craftDumpMatrix(recipe, recipe.size())
+ << ", replacements=" << replacements.dump() << ")";
return os.str();
}
-void CraftDefinitionShapeless::serializeBody(std::ostream &os) const
-{
- os<<serializeString(output);
- writeU16(os, recipe.size());
- for(u32 i=0; i<recipe.size(); i++)
- os<<serializeString(recipe[i]);
- replacements.serialize(os);
-}
-
-void CraftDefinitionShapeless::deSerializeBody(std::istream &is, int version)
-{
- if(version != 1) throw SerializationError(
- "unsupported CraftDefinitionShapeless version");
- output = deSerializeString(is);
- recipe.clear();
- u32 count = readU16(is);
- for(u32 i=0; i<count; i++)
- recipe.push_back(deSerializeString(is));
- replacements.deSerialize(is);
-}
-
/*
CraftDefinitionToolRepair
*/
IGameDef *gamedef)
{
IItemDefManager *idef = gamedef->idef();
- if(item1.count != 1 || item2.count != 1 || item1.name != item2.name
+ if (item1.count != 1 || item2.count != 1 || item1.name != item2.name
|| idef->get(item1.name).type != ITEM_TOOL
- || idef->get(item2.name).type != ITEM_TOOL)
- {
+ || idef->get(item2.name).type != ITEM_TOOL) {
// Failure
return ItemStack();
}
s32 item2_uses = 65536 - (u32) item2.wear;
s32 new_uses = item1_uses + item2_uses;
s32 new_wear = 65536 - new_uses + floor(additional_wear * 65536 + 0.5);
- if(new_wear >= 65536)
+ if (new_wear >= 65536)
return ItemStack();
- if(new_wear < 0)
+ if (new_wear < 0)
new_wear = 0;
ItemStack repaired = item1;
bool CraftDefinitionToolRepair::check(const CraftInput &input, IGameDef *gamedef) const
{
- if(input.method != CRAFT_METHOD_NORMAL)
+ if (input.method != CRAFT_METHOD_NORMAL)
return false;
ItemStack item1;
ItemStack item2;
- for(std::vector<ItemStack>::const_iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(!i->empty())
- {
- if(item1.empty())
- item1 = *i;
- else if(item2.empty())
- item2 = *i;
+ for (const auto &item : input.items) {
+ if (!item.empty()) {
+ if (item1.empty())
+ item1 = item;
+ else if (item2.empty())
+ item2 = item;
else
return false;
}
{
ItemStack item1;
ItemStack item2;
- for(std::vector<ItemStack>::const_iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(!i->empty())
- {
- if(item1.empty())
- item1 = *i;
- else if(item2.empty())
- item2 = *i;
+ for (const auto &item : input.items) {
+ if (!item.empty()) {
+ if (item1.empty())
+ item1 = item;
+ else if (item2.empty())
+ item2 = item;
}
}
ItemStack repaired = craftToolRepair(item1, item2, additional_wear, gamedef);
CraftInput CraftDefinitionToolRepair::getInput(const CraftOutput &output, IGameDef *gamedef) const
{
std::vector<ItemStack> stack;
- stack.push_back(ItemStack());
- return CraftInput(CRAFT_METHOD_COOKING,additional_wear,stack);
+ stack.emplace_back();
+ return CraftInput(CRAFT_METHOD_COOKING, additional_wear, stack);
}
-void CraftDefinitionToolRepair::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionToolRepair::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
craftDecrementInput(input, gamedef);
}
std::string CraftDefinitionToolRepair::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(toolrepair, additional_wear="<<additional_wear<<")";
+ os << "(toolrepair, additional_wear=" << additional_wear << ")";
return os.str();
}
-void CraftDefinitionToolRepair::serializeBody(std::ostream &os) const
-{
- writeF1000(os, additional_wear);
-}
-
-void CraftDefinitionToolRepair::deSerializeBody(std::istream &is, int version)
-{
- if(version != 1) throw SerializationError(
- "unsupported CraftDefinitionToolRepair version");
- additional_wear = readF1000(is);
-}
-
/*
CraftDefinitionCooking
*/
bool CraftDefinitionCooking::check(const CraftInput &input, IGameDef *gamedef) const
{
- if(input.method != CRAFT_METHOD_COOKING)
+ if (input.method != CRAFT_METHOD_COOKING)
return false;
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for(std::vector<ItemStack>::const_iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(i->name != "")
- input_filtered.push_back(i->name);
+ for (const auto &item : input.items) {
+ const std::string &name = item.name;
+ if (!name.empty())
+ input_filtered.push_back(name);
}
// If there is a wrong number of items in input, no match
- if(input_filtered.size() != 1){
+ if (input_filtered.size() != 1) {
/*dstream<<"Number of input items ("<<input_filtered.size()
<<") does not match recipe size (1) "
<<"of cooking recipe with output="<<output<<std::endl;*/
return false;
}
-
+
// Check the single input item
return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
}
return CraftInput(CRAFT_METHOD_COOKING,cooktime,craftGetItems(rec,gamedef));
}
-void CraftDefinitionCooking::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionCooking::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionCooking::getHashType() const
{
if (isGroupRecipeStr(recipe_name))
return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+
+ return CRAFT_HASH_TYPE_ITEM_NAMES;
}
u64 CraftDefinitionCooking::getHash(CraftHashType type) const
{
if (type == CRAFT_HASH_TYPE_ITEM_NAMES) {
return getHashForString(recipe_name);
- } else if (type == CRAFT_HASH_TYPE_COUNT) {
+ }
+
+ if (type == CRAFT_HASH_TYPE_COUNT) {
return 1;
- } else {
- //illegal hash type for this CraftDefinition (pre-condition)
- assert(false);
- return 0;
}
+
+ // illegal hash type for this CraftDefinition (pre-condition)
+ assert(false);
+ return 0;
}
void CraftDefinitionCooking::initHash(IGameDef *gamedef)
std::string CraftDefinitionCooking::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(cooking, output=\""<<output
- <<"\", recipe=\""<<recipe
- <<"\", cooktime="<<cooktime<<")"
- <<", replacements="<<replacements.dump()<<")";
+ os << "(cooking, output=\"" << output
+ << "\", recipe=\"" << recipe
+ << "\", cooktime=" << cooktime << ")"
+ << ", replacements=" << replacements.dump() << ")";
return os.str();
}
-void CraftDefinitionCooking::serializeBody(std::ostream &os) const
-{
- os<<serializeString(output);
- os<<serializeString(recipe);
- writeF1000(os, cooktime);
- replacements.serialize(os);
-}
-
-void CraftDefinitionCooking::deSerializeBody(std::istream &is, int version)
-{
- if(version != 1) throw SerializationError(
- "unsupported CraftDefinitionCooking version");
- output = deSerializeString(is);
- recipe = deSerializeString(is);
- cooktime = readF1000(is);
- replacements.deSerialize(is);
-}
-
/*
CraftDefinitionFuel
*/
bool CraftDefinitionFuel::check(const CraftInput &input, IGameDef *gamedef) const
{
- if(input.method != CRAFT_METHOD_FUEL)
+ if (input.method != CRAFT_METHOD_FUEL)
return false;
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for(std::vector<ItemStack>::const_iterator
- i = input.items.begin();
- i != input.items.end(); i++)
- {
- if(i->name != "")
- input_filtered.push_back(i->name);
+ for (const auto &item : input.items) {
+ const std::string &name = item.name;
+ if (!name.empty())
+ input_filtered.push_back(name);
}
// If there is a wrong number of items in input, no match
- if(input_filtered.size() != 1){
+ if (input_filtered.size() != 1) {
/*dstream<<"Number of input items ("<<input_filtered.size()
<<") does not match recipe size (1) "
<<"of fuel recipe with burntime="<<burntime<<std::endl;*/
return false;
}
-
+
// Check the single input item
return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
}
return CraftInput(CRAFT_METHOD_COOKING,(int)burntime,craftGetItems(rec,gamedef));
}
-void CraftDefinitionFuel::decrementInput(CraftInput &input, IGameDef *gamedef) const
+void CraftDefinitionFuel::decrementInput(CraftInput &input, std::vector<ItemStack> &output_replacements,
+ IGameDef *gamedef) const
{
- craftDecrementOrReplaceInput(input, replacements, gamedef);
+ craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
CraftHashType CraftDefinitionFuel::getHashType() const
{
if (isGroupRecipeStr(recipe_name))
return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
+
+ return CRAFT_HASH_TYPE_ITEM_NAMES;
}
u64 CraftDefinitionFuel::getHash(CraftHashType type) const
{
if (type == CRAFT_HASH_TYPE_ITEM_NAMES) {
return getHashForString(recipe_name);
- } else if (type == CRAFT_HASH_TYPE_COUNT) {
+ }
+
+ if (type == CRAFT_HASH_TYPE_COUNT) {
return 1;
- } else {
- //illegal hash type for this CraftDefinition (pre-condition)
- assert(false);
- return 0;
}
+
+ // illegal hash type for this CraftDefinition (pre-condition)
+ assert(false);
+ return 0;
}
void CraftDefinitionFuel::initHash(IGameDef *gamedef)
std::string CraftDefinitionFuel::dump() const
{
std::ostringstream os(std::ios::binary);
- os<<"(fuel, recipe=\""<<recipe
- <<"\", burntime="<<burntime<<")"
- <<", replacements="<<replacements.dump()<<")";
+ os << "(fuel, recipe=\"" << recipe
+ << "\", burntime=" << burntime << ")"
+ << ", replacements=" << replacements.dump() << ")";
return os.str();
}
-void CraftDefinitionFuel::serializeBody(std::ostream &os) const
-{
- os<<serializeString(recipe);
- writeF1000(os, burntime);
- replacements.serialize(os);
-}
-
-void CraftDefinitionFuel::deSerializeBody(std::istream &is, int version)
-{
- if(version != 1) throw SerializationError(
- "unsupported CraftDefinitionFuel version");
- recipe = deSerializeString(is);
- burntime = readF1000(is);
- replacements.deSerialize(is);
-}
-
/*
Craft definition manager
*/
}
virtual bool getCraftResult(CraftInput &input, CraftOutput &output,
- bool decrementInput, IGameDef *gamedef) const
+ std::vector<ItemStack> &output_replacement, bool decrementInput,
+ IGameDef *gamedef) const
{
output.item = "";
output.time = 0;
// If all input items are empty, abort.
bool all_empty = true;
- for (std::vector<ItemStack>::const_iterator
- i = input.items.begin();
- i != input.items.end(); i++) {
- if (!i->empty()) {
+ for (const auto &item : input.items) {
+ if (!item.empty()) {
all_empty = false;
break;
}
// We'd like to do "const [...] hash_collisions = m_craft_defs[type][hash];"
// but that doesn't compile for some reason. This does.
- std::map<u64, std::vector<CraftDefinition*> >::const_iterator
- col_iter = (m_craft_defs[type]).find(hash);
+ auto col_iter = (m_craft_defs[type]).find(hash);
if (col_iter == (m_craft_defs[type]).end())
continue;
const std::vector<CraftDefinition*> &hash_collisions = col_iter->second;
// Walk crafting definitions from back to front, so that later
// definitions can override earlier ones.
- for (std::vector<CraftDefinition*>::const_reverse_iterator
- i = hash_collisions.rbegin();
- i != hash_collisions.rend(); i++) {
- CraftDefinition *def = *i;
+ for (std::vector<CraftDefinition*>::size_type
+ i = hash_collisions.size(); i > 0; i--) {
+ CraftDefinition *def = hash_collisions[i - 1];
/*errorstream << "Checking " << input.dump() << std::endl
<< " against " << def->dump() << std::endl;*/
if (def->check(input, gamedef)) {
+ // Check if the crafted node/item exists
+ CraftOutput out = def->getOutput(input, gamedef);
+ ItemStack is;
+ is.deSerialize(out.item, gamedef->idef());
+ if (!is.isKnown(gamedef->idef())) {
+ infostream << "trying to craft non-existent "
+ << out.item << ", ignoring recipe" << std::endl;
+ continue;
+ }
+
// Get output, then decrement input (if requested)
- output = def->getOutput(input, gamedef);
+ output = out;
+
if (decrementInput)
- def->decrementInput(input, gamedef);
+ def->decrementInput(input, output_replacement, gamedef);
/*errorstream << "Check RETURNS TRUE" << std::endl;*/
return true;
}
{
std::vector<CraftDefinition*> recipes;
- std::map<std::string, std::vector<CraftDefinition*> >::const_iterator
- vec_iter = m_output_craft_definitions.find(output.item);
+ auto vec_iter = m_output_craft_definitions.find(output.item);
if (vec_iter == m_output_craft_definitions.end())
return recipes;
recipes.reserve(limit ? MYMIN(limit, vec.size()) : vec.size());
- for (std::vector<CraftDefinition*>::const_reverse_iterator
- it = vec.rbegin(); it != vec.rend(); ++it) {
+ for (std::vector<CraftDefinition*>::size_type i = vec.size();
+ i > 0; i--) {
+ CraftDefinition *def = vec[i - 1];
if (limit && recipes.size() >= limit)
break;
- recipes.push_back(*it);
+ recipes.push_back(def);
}
return recipes;
}
+
+ virtual bool clearCraftRecipesByOutput(const CraftOutput &output, IGameDef *gamedef)
+ {
+ auto vec_iter = m_output_craft_definitions.find(output.item);
+
+ if (vec_iter == m_output_craft_definitions.end())
+ return false;
+
+ std::vector<CraftDefinition*> &vec = vec_iter->second;
+ for (auto def : vec) {
+ // Recipes are not yet hashed at this point
+ std::vector<CraftDefinition*> &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+ std::vector<CraftDefinition*> new_vec_by_input;
+ /* We will preallocate necessary memory addresses, so we don't need to reallocate them later.
+ This would save us some performance. */
+ new_vec_by_input.reserve(unhashed_inputs_vec.size());
+ for (auto &i2 : unhashed_inputs_vec) {
+ if (def != i2) {
+ new_vec_by_input.push_back(i2);
+ }
+ }
+ m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input);
+ }
+ m_output_craft_definitions.erase(output.item);
+ return true;
+ }
+
+ virtual bool clearCraftRecipesByInput(CraftMethod craft_method, unsigned int craft_grid_width,
+ const std::vector<std::string> &recipe, IGameDef *gamedef)
+ {
+ bool all_empty = true;
+ for (const auto &i : recipe) {
+ if (!i.empty()) {
+ all_empty = false;
+ break;
+ }
+ }
+ if (all_empty)
+ return false;
+
+ CraftInput input(craft_method, craft_grid_width, craftGetItems(recipe, gamedef));
+ // Recipes are not yet hashed at this point
+ std::vector<CraftDefinition*> &unhashed_inputs_vec = m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+ std::vector<CraftDefinition*> new_vec_by_input;
+ bool got_hit = false;
+ for (std::vector<CraftDefinition*>::size_type
+ i = unhashed_inputs_vec.size(); i > 0; i--) {
+ CraftDefinition *def = unhashed_inputs_vec[i - 1];
+ /* If the input doesn't match the recipe definition, this recipe definition later
+ will be added back in source map. */
+ if (!def->check(input, gamedef)) {
+ new_vec_by_input.push_back(def);
+ continue;
+ }
+ CraftOutput output = def->getOutput(input, gamedef);
+ got_hit = true;
+ auto vec_iter = m_output_craft_definitions.find(output.item);
+ if (vec_iter == m_output_craft_definitions.end())
+ continue;
+ std::vector<CraftDefinition*> &vec = vec_iter->second;
+ std::vector<CraftDefinition*> new_vec_by_output;
+ /* We will preallocate necessary memory addresses, so we don't need
+ to reallocate them later. This would save us some performance. */
+ new_vec_by_output.reserve(vec.size());
+ for (auto &vec_i : vec) {
+ /* If pointers from map by input and output are not same,
+ we will add 'CraftDefinition*' to a new vector. */
+ if (def != vec_i) {
+ /* Adding dereferenced iterator value (which are
+ 'CraftDefinition' reference) to a new vector. */
+ new_vec_by_output.push_back(vec_i);
+ }
+ }
+ // Swaps assigned to current key value with new vector for output map.
+ m_output_craft_definitions[output.item].swap(new_vec_by_output);
+ }
+ if (got_hit)
+ // Swaps value with new vector for input map.
+ m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].swap(new_vec_by_input);
+
+ return got_hit;
+ }
+
virtual std::string dump() const
{
std::ostringstream os(std::ios::binary);
os << "Crafting definitions:\n";
- for (int type = 0; type <= craft_hash_type_max; type++) {
- for (std::map<u64, std::vector<CraftDefinition*> >::const_iterator
- i = (m_craft_defs[type]).begin();
- i != (m_craft_defs[type]).end(); i++) {
- for (std::vector<CraftDefinition*>::const_iterator
- ii = i->second.begin(); ii != i->second.end(); ii++) {
- os << "type " << type << " hash " << i->first << (*ii)->dump() << "\n";
+ for (int type = 0; type <= craft_hash_type_max; ++type) {
+ for (auto it = m_craft_defs[type].begin();
+ it != m_craft_defs[type].end(); ++it) {
+ for (std::vector<CraftDefinition*>::size_type i = 0;
+ i < it->second.size(); i++) {
+ os << "type " << type
+ << " hash " << it->first
+ << " def " << it->second[i]->dump()
+ << "\n";
}
}
}
}
virtual void registerCraft(CraftDefinition *def, IGameDef *gamedef)
{
- verbosestream<<"registerCraft: registering craft definition: "
- <<def->dump()<<std::endl;
+ verbosestream << "registerCraft: registering craft definition: "
+ << def->dump() << std::endl;
m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].push_back(def);
CraftInput input;
}
virtual void clear()
{
- for (int type = 0; type <= craft_hash_type_max; type++) {
- for (std::map<u64, std::vector<CraftDefinition*> >::iterator
- i = m_craft_defs[type].begin();
- i != m_craft_defs[type].end(); i++) {
- for (std::vector<CraftDefinition*>::iterator
- ii = i->second.begin(); ii != i->second.end(); ii++) {
- delete *ii;
+ for (int type = 0; type <= craft_hash_type_max; ++type) {
+ for (auto &it : m_craft_defs[type]) {
+ for (auto &iit : it.second) {
+ delete iit;
}
- i->second.clear();
+ it.second.clear();
}
m_craft_defs[type].clear();
}
virtual void initHashes(IGameDef *gamedef)
{
// Move the CraftDefs from the unhashed layer into layers higher up.
- for (std::vector<CraftDefinition*>::iterator
- i = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin();
- i != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); i++) {
- CraftDefinition *def = *i;
-
+ std::vector<CraftDefinition *> &unhashed =
+ m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
+ for (auto def : unhashed) {
// Initialize and get the definition's hash
def->initHash(gamedef);
CraftHashType type = def->getHashType();
// Enter the definition
m_craft_defs[type][hash].push_back(def);
}
- m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].clear();
+ unhashed.clear();
}
private:
//TODO: change both maps to unordered_map when c++11 can be used
{
return new CCraftDefManager();
}
-
projects / minetest.git / blobdiff