From 35e3712783ae72c28ab206edf9bee78ba92bb943 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Wed, 11 Mar 2015 22:17:17 -0700 Subject: [PATCH] Bug: Make sure mod recipes for MC items show up This fixes a regression where recipes for vanilla Minecraft items (e.g., Iron Ingot) added by mods (e.g., Pulverized Iron to Iron Ingot) didn't show up on that item's detail page. --- src/coffee/models/parser_versions/mod_parser_v1.coffee | 2 +- src/coffee/models/parser_versions/mod_version_parser_v1.coffee | 3 ++- src/coffee/models/recipe.coffee | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/coffee/models/parser_versions/mod_parser_v1.coffee b/src/coffee/models/parser_versions/mod_parser_v1.coffee index 94b86a7fb..3c2c25f50 100644 --- a/src/coffee/models/parser_versions/mod_parser_v1.coffee +++ b/src/coffee/models/parser_versions/mod_parser_v1.coffee @@ -25,7 +25,7 @@ module.exports = class ModParserV1 extends CommandParserVersionBase _command_author: (authorParts...)-> if @_rawData.author? then throw new Error 'duplicate declaration of "author"' - author = authorParts.join '' + author = authorParts.join ', ' if author.length is 0 then throw new Error '"author" cannot be empty, but may be omitted' @_rawData.author = author diff --git a/src/coffee/models/parser_versions/mod_version_parser_v1.coffee b/src/coffee/models/parser_versions/mod_version_parser_v1.coffee index 3540ff702..1cdd772a9 100644 --- a/src/coffee/models/parser_versions/mod_version_parser_v1.coffee +++ b/src/coffee/models/parser_versions/mod_version_parser_v1.coffee @@ -153,7 +153,7 @@ module.exports = class ModVersionParserV1 extends CommandParserVersionBase createSlug = (name)=> item = @_rawData.items[name] - if item? + if item? and item.type isnt 'update' slug = new ItemSlug modVersion.modSlug, _.slugify name else slug = new ItemSlug _.slugify name @@ -198,6 +198,7 @@ module.exports = class ModVersionParserV1 extends CommandParserVersionBase pattern: recipeData.pattern tools: toolStacks + logger.debug "adding recipe: #{recipe}" modVersion.addRecipe recipe return recipe diff --git a/src/coffee/models/recipe.coffee b/src/coffee/models/recipe.coffee index aa2a6ddac..a789ba394 100644 --- a/src/coffee/models/recipe.coffee +++ b/src/coffee/models/recipe.coffee @@ -107,7 +107,7 @@ module.exports = class Recipe extends BaseModel @_produces[stack.itemSlug.qualified] = true @_produces[stack.itemSlug.item] = true - return @_produces[itemSlug.qualified] + return @_produces[itemSlug.qualified] or @_produces[itemSlug.item] requires: (itemSlug)-> for stack in @input