return str_starts_with(rec_name, std::string("group:"));
}
+static bool hasGroupItem(const std::vector<std::string> &recipe)
+{
+ for (const auto &item : recipe) {
+ if (isGroupRecipeStr(item))
+ return true;
+ }
+ return false;
+}
+
inline u64 getHashForString(const std::string &recipe_str)
{
/*errorstream << "Hashing craft string \"" << recipe_str << '"';*/
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:
const std::vector<std::string> &itemstrings, IGameDef *gamedef)
{
std::vector<std::string> result;
- for (std::vector<std::string>::size_type i = 0;
- i < itemstrings.size(); i++) {
- result.push_back(craftGetItemName(itemstrings[i], gamedef));
+ result.reserve(itemstrings.size());
+ 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>::size_type i = 0;
- i < items.size(); i++) {
- result.push_back(items[i].name);
+ result.reserve(items.size());
+ 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>::size_type i = 0;
- i < items.size(); i++) {
- result.push_back(ItemStack(std::string(items[i]), (u16)1,
- (u16)0, "", gamedef->getItemDefManager()));
+ result.reserve(items.size());
+ 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>::size_type i = 0;
- i < items.size(); i++) {
+ for (const std::string &item : items) {
// Is this an actual item?
- if (items[i] != "") {
+ if (!item.empty()) {
if (!success) {
// This is the first nonempty item
min_x = max_x = x;
// Removes 1 from each item stack
static void craftDecrementInput(CraftInput &input, IGameDef *gamedef)
{
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- if (input.items[i].count != 0)
- input.items[i].remove(1);
+ for (auto &item : input.items) {
+ if (item.count != 0)
+ item.remove(1);
}
}
// Make a copy of the replacements pair list
std::vector<std::pair<std::string, std::string> > pairs = replacements.pairs;
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- ItemStack &item = input.items[i];
+ for (auto &item : input.items) {
// 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) {
+ 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;
- } else {
- ItemStack rep;
- rep.deSerialize(j->second, gamedef->idef());
- item.remove(1);
- found_replacement = true;
- output_replacements.push_back(rep);
- 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 by one
CraftInput
*/
+bool CraftInput::empty() const
+{
+ for (const auto &item : items) {
+ if (!item.empty())
+ return false;
+ }
+ return true;
+}
+
std::string CraftInput::dump() const
{
std::ostringstream os(std::ios::binary);
std::ostringstream os(std::ios::binary);
os<<"{";
const char *sep = "";
- for (std::vector<std::pair<std::string, std::string> >::size_type i = 0;
- i < pairs.size(); i++) {
- const std::pair<std::string, std::string> &repl_p = pairs[i];
+ for (const auto &repl_p : pairs) {
os << sep
<< '"' << (repl_p.first)
<< "\"=>\"" << (repl_p.second) << '"';
CraftDefinitionShaped
*/
+CraftDefinitionShaped::CraftDefinitionShaped(
+ const std::string &output_,
+ unsigned int width_,
+ const std::vector<std::string> &recipe_,
+ const CraftReplacements &replacements_):
+ output(output_), width(width_), recipe(recipe_), replacements(replacements_)
+{
+ if (hasGroupItem(recipe))
+ priority = PRIORITY_SHAPED_AND_GROUPS;
+ else
+ priority = PRIORITY_SHAPED;
+}
+
std::string CraftDefinitionShaped::getName() const
{
return "shaped";
if (inp_width == 0)
return false;
while (inp_names.size() % inp_width != 0)
- inp_names.push_back("");
+ 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 (rec_width == 0)
return false;
while (rec_names.size() % rec_width != 0)
- rec_names.push_back("");
+ 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;
craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
-CraftHashType CraftDefinitionShaped::getHashType() const
-{
- assert(hash_inited); // Pre-condition
- bool has_group = false;
- for (size_t i = 0; i < recipe_names.size(); i++) {
- if (isGroupRecipeStr(recipe_names[i])) {
- has_group = true;
- break;
- }
- }
- if (has_group)
- return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
-}
-
u64 CraftDefinitionShaped::getHash(CraftHashType type) const
{
assert(hash_inited); // Pre-condition
return;
hash_inited = true;
recipe_names = craftGetItemNames(recipe, gamedef);
+
+ if (hasGroupItem(recipe_names))
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ else
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
}
std::string CraftDefinitionShaped::dump() const
CraftDefinitionShapeless
*/
+CraftDefinitionShapeless::CraftDefinitionShapeless(
+ const std::string &output_,
+ const std::vector<std::string> &recipe_,
+ const CraftReplacements &replacements_):
+ output(output_), recipe(recipe_), replacements(replacements_)
+{
+ if (hasGroupItem(recipe))
+ priority = PRIORITY_SHAPELESS_AND_GROUPS;
+ else
+ priority = PRIORITY_SHAPELESS;
+}
+
std::string CraftDefinitionShapeless::getName() const
{
return "shapeless";
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- const ItemStack &item = input.items[i];
- if (item.name != "")
+ for (const auto &item : input.items) {
+ if (!item.name.empty())
input_filtered.push_back(item.name);
}
craftDecrementOrReplaceInput(input, output_replacements, replacements, gamedef);
}
-CraftHashType CraftDefinitionShapeless::getHashType() const
-{
- assert(hash_inited); // Pre-condition
- bool has_group = false;
- for (size_t i = 0; i < recipe_names.size(); i++) {
- if (isGroupRecipeStr(recipe_names[i])) {
- has_group = true;
- break;
- }
- }
- if (has_group)
- return CRAFT_HASH_TYPE_COUNT;
- else
- return CRAFT_HASH_TYPE_ITEM_NAMES;
-}
-
u64 CraftDefinitionShapeless::getHash(CraftHashType type) const
{
assert(hash_inited); // Pre-condition
hash_inited = true;
recipe_names = craftGetItemNames(recipe, gamedef);
std::sort(recipe_names.begin(), recipe_names.end());
+
+ if (hasGroupItem(recipe_names))
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ else
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
}
std::string CraftDefinitionShapeless::dump() const
CraftDefinitionToolRepair
*/
+CraftDefinitionToolRepair::CraftDefinitionToolRepair(float additional_wear_):
+ additional_wear(additional_wear_)
+{
+ priority = PRIORITY_TOOLREPAIR;
+}
+
static ItemStack craftToolRepair(
const ItemStack &item1,
const ItemStack &item2,
IItemDefManager *idef = gamedef->idef();
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) {
+ || itemgroup_get(idef->get(item1.name).groups, "disable_repair") == 1) {
// Failure
return ItemStack();
}
ItemStack item1;
ItemStack item2;
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- const ItemStack &item = input.items[i];
+ for (const auto &item : input.items) {
if (!item.empty()) {
if (item1.empty())
item1 = item;
{
ItemStack item1;
ItemStack item2;
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- const ItemStack &item = input.items[i];
+ for (const auto &item : input.items) {
if (!item.empty()) {
if (item1.empty())
item1 = item;
CraftInput CraftDefinitionToolRepair::getInput(const CraftOutput &output, IGameDef *gamedef) const
{
std::vector<ItemStack> stack;
- stack.push_back(ItemStack());
+ stack.emplace_back();
return CraftInput(CRAFT_METHOD_COOKING, additional_wear, stack);
}
CraftDefinitionCooking
*/
+CraftDefinitionCooking::CraftDefinitionCooking(
+ const std::string &output_,
+ const std::string &recipe_,
+ float cooktime_,
+ const CraftReplacements &replacements_):
+ output(output_), recipe(recipe_), cooktime(cooktime_), replacements(replacements_)
+{
+ if (isGroupRecipeStr(recipe))
+ priority = PRIORITY_SHAPELESS_AND_GROUPS;
+ else
+ priority = PRIORITY_SHAPELESS;
+}
+
std::string CraftDefinitionCooking::getName() const
{
return "cooking";
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- const std::string &name = input.items[i].name;
- if (name != "")
+ for (const auto &item : input.items) {
+ const std::string &name = item.name;
+ if (!name.empty())
input_filtered.push_back(name);
}
}
// Check the single input item
- return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
+ std::string rec_name = craftGetItemName(recipe, gamedef);
+ return inputItemMatchesRecipe(input_filtered[0], rec_name, gamedef->idef());
}
CraftOutput CraftDefinitionCooking::getOutput(const CraftInput &input, IGameDef *gamedef) const
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;
-}
-
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)
return;
hash_inited = true;
recipe_name = craftGetItemName(recipe, gamedef);
+
+ if (isGroupRecipeStr(recipe_name))
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ else
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
}
std::string CraftDefinitionCooking::dump() const
CraftDefinitionFuel
*/
+CraftDefinitionFuel::CraftDefinitionFuel(
+ const std::string &recipe_,
+ float burntime_,
+ const CraftReplacements &replacements_):
+ recipe(recipe_), burntime(burntime_), replacements(replacements_)
+{
+ if (isGroupRecipeStr(recipe_name))
+ priority = PRIORITY_SHAPELESS_AND_GROUPS;
+ else
+ priority = PRIORITY_SHAPELESS;
+}
+
std::string CraftDefinitionFuel::getName() const
{
return "fuel";
// Filter empty items out of input
std::vector<std::string> input_filtered;
- for (std::vector<ItemStack>::size_type i = 0;
- i < input.items.size(); i++) {
- const std::string &name = input.items[i].name;
- if (name != "")
+ for (const auto &item : input.items) {
+ const std::string &name = item.name;
+ if (!name.empty())
input_filtered.push_back(name);
}
}
// Check the single input item
- return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
+ std::string rec_name = craftGetItemName(recipe, gamedef);
+ return inputItemMatchesRecipe(input_filtered[0], rec_name, gamedef->idef());
}
CraftOutput CraftDefinitionFuel::getOutput(const CraftInput &input, IGameDef *gamedef) const
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;
-}
-
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)
return;
hash_inited = true;
recipe_name = craftGetItemName(recipe, gamedef);
+
+ if (isGroupRecipeStr(recipe_name))
+ hash_type = CRAFT_HASH_TYPE_COUNT;
+ else
+ hash_type = CRAFT_HASH_TYPE_ITEM_NAMES;
}
+
std::string CraftDefinitionFuel::dump() const
{
std::ostringstream os(std::ios::binary);
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>::size_type i = 0;
- i < input.items.size(); i++) {
- if (!input.items[i].empty()) {
- all_empty = false;
- break;
- }
- }
- if (all_empty)
+ if (input.empty())
return false;
std::vector<std::string> input_names;
input_names = craftGetItemNames(input.items, gamedef);
std::sort(input_names.begin(), input_names.end());
- // Try hash types with increasing collision rate, and return if found.
+ // Try hash types with increasing collision rate
+ // while remembering the latest, highest priority recipe.
+ CraftDefinition::RecipePriority priority_best =
+ CraftDefinition::PRIORITY_NO_RECIPE;
+ CraftDefinition *def_best = nullptr;
for (int type = 0; type <= craft_hash_type_max; type++) {
u64 hash = getHashForGrid((CraftHashType) type, input_names);
// 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;
/*errorstream << "Checking " << input.dump() << std::endl
<< " against " << def->dump() << std::endl;*/
- if (def->check(input, gamedef)) {
- // Get output, then decrement input (if requested)
- output = def->getOutput(input, gamedef);
- if (decrementInput)
- def->decrementInput(input, output_replacement, gamedef);
- /*errorstream << "Check RETURNS TRUE" << std::endl;*/
- return true;
+ CraftDefinition::RecipePriority priority = def->getPriority();
+ if (priority > priority_best
+ && 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;
+ }
+
+ output = out;
+ priority_best = priority;
+ def_best = def;
}
}
}
- return false;
+ if (priority_best == CraftDefinition::PRIORITY_NO_RECIPE)
+ return false;
+ if (decrementInput)
+ def_best->decrementInput(input, output_replacement, gamedef);
+ return true;
}
virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
{
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;
return recipes;
}
+
+ virtual bool clearCraftsByOutput(const CraftOutput &output, IGameDef *gamedef)
+ {
+ auto to_clear = m_output_craft_definitions.find(output.item);
+
+ if (to_clear == m_output_craft_definitions.end())
+ return false;
+
+ for (auto def : to_clear->second) {
+ // Recipes are not yet hashed at this point
+ std::vector<CraftDefinition *> &defs = m_craft_defs[(int)CRAFT_HASH_TYPE_UNHASHED][0];
+ defs.erase(std::remove(defs.begin(), defs.end(), def), defs.end());
+ delete def;
+ }
+ m_output_craft_definitions.erase(to_clear);
+ return true;
+ }
+
+ virtual bool clearCraftsByInput(const CraftInput &input, IGameDef *gamedef)
+ {
+ if (input.empty())
+ return false;
+
+ // Recipes are not yet hashed at this point
+ std::vector<CraftDefinition *> &defs = m_craft_defs[(int)CRAFT_HASH_TYPE_UNHASHED][0];
+ std::vector<CraftDefinition *> new_defs;
+ bool got_hit = false;
+ for (auto def : defs) {
+ if (!def->check(input, gamedef)) {
+ new_defs.push_back(def);
+ continue;
+ }
+ got_hit = true;
+ std::string output = def->getOutput(input, gamedef).item;
+ delete def;
+ auto it = m_output_craft_definitions.find(craftGetItemName(output, gamedef));
+ if (it == m_output_craft_definitions.end())
+ continue;
+ std::vector<CraftDefinition *> &outdefs = it->second;
+ outdefs.erase(std::remove(outdefs.begin(), outdefs.end(), def), outdefs.end());
+ }
+ if (got_hit)
+ defs.swap(new_defs);
+
+ 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
- it = (m_craft_defs[type]).begin();
- it != (m_craft_defs[type]).end(); ++it) {
+ 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
}
virtual void registerCraft(CraftDefinition *def, IGameDef *gamedef)
{
- verbosestream << "registerCraft: registering craft definition: "
- << def->dump() << std::endl;
+ TRACESTREAM(<< "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
- it = m_craft_defs[type].begin();
- it != m_craft_defs[type].end(); ++it) {
- for (std::vector<CraftDefinition*>::iterator
- iit = it->second.begin();
- iit != it->second.end(); ++iit) {
- delete *iit;
+ for (auto &it : m_craft_defs[type]) {
+ for (auto &iit : it.second) {
+ delete iit;
}
- it->second.clear();
+ it.second.clear();
}
m_craft_defs[type].clear();
}
// Move the CraftDefs from the unhashed layer into layers higher up.
std::vector<CraftDefinition *> &unhashed =
m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0];
- for (std::vector<CraftDefinition*>::size_type i = 0;
- i < unhashed.size(); i++) {
- CraftDefinition *def = unhashed[i];
-
+ for (auto def : unhashed) {
// Initialize and get the definition's hash
def->initHash(gamedef);
CraftHashType type = def->getHashType();
unhashed.clear();
}
private:
- //TODO: change both maps to unordered_map when c++11 can be used
- std::vector<std::map<u64, std::vector<CraftDefinition*> > > m_craft_defs;
- std::map<std::string, std::vector<CraftDefinition*> > m_output_craft_definitions;
+ std::vector<std::unordered_map<u64, std::vector<CraftDefinition*> > >
+ m_craft_defs;
+ std::unordered_map<std::string, std::vector<CraftDefinition*> >
+ m_output_craft_definitions;
};
IWritableCraftDefManager* createCraftDefManager()
{
return new CCraftDefManager();
}
-
projects / dragonfireclient.git / blobdiff