From 5d8251bebbcf139752514313e5a297b311c0aa75 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Wed, 28 Dec 2016 18:14:34 -0800 Subject: [PATCH] Fix algo. for new Agricraft version --- src/client/models/crafting/crafting_step.coffee | 2 +- src/client/models/game/mod_version.coffee | 3 ++- src/client/models/game/recipe.coffee | 2 +- src/common/constants.coffee | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client/models/crafting/crafting_step.coffee b/src/client/models/crafting/crafting_step.coffee index 2d1a2bd60..1f855e951 100644 --- a/src/client/models/crafting/crafting_step.coffee +++ b/src/client/models/crafting/crafting_step.coffee @@ -68,6 +68,6 @@ module.exports = class CraftingStep @_inventory = new SimpleInventory for stack in @_recipe.input qualifiedSlug = @_modPack.qualifySlug stack.itemSlug - required = @_recipe.getQuantityRequired(stack.itemSlug) - @_recipe.getQuantityProduced(stack.itemSlug) + required = @_recipe.getQuantityRequired(stack.itemSlug) required = if required > 0 then required * @multiplier else 1 @_inventory.add qualifiedSlug, required diff --git a/src/client/models/game/mod_version.coffee b/src/client/models/game/mod_version.coffee index 466361538..31acc1898 100644 --- a/src/client/models/game/mod_version.coffee +++ b/src/client/models/game/mod_version.coffee @@ -152,7 +152,8 @@ module.exports = class ModVersion extends BaseModel if recipe.itemSlug.matches itemSlug primaryRecipes.push recipe else if recipe.produces itemSlug - otherRecipes.push recipe + if not recipe.requires itemSlug + otherRecipes.push recipe for recipe in primaryRecipes result.push recipe diff --git a/src/client/models/game/recipe.coffee b/src/client/models/game/recipe.coffee index a3416a42f..7db5f5241 100644 --- a/src/client/models/game/recipe.coffee +++ b/src/client/models/game/recipe.coffee @@ -111,7 +111,7 @@ module.exports = class Recipe extends BaseModel return result isPassThroughFor: (itemSlug)-> - return @getQuantityProduced(itemSlug) is @getQuantityRequired(itemSlug) + return @getQuantityProduced(itemSlug) > 0 and @getQuantityRequired(itemSlug) > 0 produces: (itemSlug)-> if not @_produces? diff --git a/src/common/constants.coffee b/src/common/constants.coffee index e14156acf..edf9188d4 100644 --- a/src/common/constants.coffee +++ b/src/common/constants.coffee @@ -33,7 +33,7 @@ exports.defaultMods = defaultMods = {} defaultMods.minecraft = { defaultVersion: '1.7.10' } # Minecraft must be first defaultMods.advanced_solar_panels = { defaultVersion: '3.5.1' } -defaultMods.agricraft = { defaultVersion: '1.4.6' } +defaultMods.agricraft = { defaultVersion: '1.7.10_1.5.0' } defaultMods.applied_energistics_2 = { defaultVersion: 'rv1-stable-1' } defaultMods.big_reactors = { defaultVersion: '0.4.2A2' } defaultMods.buildcraft = { defaultVersion: '1.7.18' }