Allow "have" inventory to include non-craftables

src/data/ic2_classic/recipes.json

@@ -209,7 +209,7 @@
             "tools": "Macerator"
         }, {
             "output": "Coal Ball",
-            "input": [[8, "Coal Dust"], "1 Flint"],
+            "input": [[8, "Coal Dust"], "Flint"],
             "pattern": "000 010 000",
             "tools": "Crafting Table"
         }, {

src/scripts/controllers/inventory_controller.coffee

@@ -21,10 +21,11 @@ module.exports = class InventoryController extends BaseController
         if not options.model? then throw new Error 'options.model is required'
         if not options.modPack? then throw new Error 'options.modPack is required'
 
-        options.icon         ?= '/images/chest_front.png'
+        options.icon        ?= '/images/chest_front.png'
-        options.editable     ?= true
+        options.editable    ?= true
-        options.imageLoader  ?= new ImageLoader defaultUrl:'/images/unknown.png'
+        options.imageLoader ?= new ImageLoader defaultUrl:'/images/unknown.png'
-        options.title        ?= 'Inventory'
+        options.gatherNames ?= -> @modPack.gatherNames()
+        options.title       ?= 'Inventory'
 
         options.templateName  = 'inventory'
         super options
@@ -33,6 +34,7 @@ module.exports = class InventoryController extends BaseController
         @icon        = options.icon
         @imageLoader = options.imageLoader
         @modPack     = options.modPack
+        @gatherNames = options.gatherNames
         @title       = options.title
 
         @_stackControllers = []
@@ -42,14 +44,15 @@ module.exports = class InventoryController extends BaseController
     # Event Methods ################################################################################
 
     onAddButtonClicked: ->
-        item = @modPack.findItemByName @$nameField.val()
+        name = @$nameField.val()
-        return unless item?
+        return unless @modPack.isValidName name
 
-        @model.add item.slug, parseInt(@$quantityField.val())
+        @model.add _.slugify(name), parseInt(@$quantityField.val())
         @$nameField.val ''
         @$quantityField.val '1'
 
         @$scrollbox.scrollTop @$scrollbox.prop 'scrollHeight'
+        @$nameField.autocomplete 'close'
 
     onClearButtonClicked: ->
         @model.clear()
@@ -163,7 +166,7 @@ module.exports = class InventoryController extends BaseController
         onSelected = => @onItemSelected()
 
         @$nameField.autocomplete
-            source:    @modPack.gatherRecipeNames()
+            source:    @gatherNames()
             delay:     0
             minLength: 0
             change:    onChanged

src/scripts/controllers/item_page_controller.coffee

@@ -25,27 +25,28 @@ module.exports = class ItemPageController extends BaseController
     # BaseController Overrides #####################################################################
 
     onDidRender: ->
+        @wantController = @addChild InventoryController, '.want',
+            editable:    true
+            icon:        '/images/fishing_rod.png'
+            imageLoader: @imageLoader
+            model:       @model.plan.want
+            modPack:     @model.modPack
+            title:       'Items you want'
+
         @haveController = @addChild InventoryController, '.have',
             editable:    true,
             imageLoader: @imageLoader
-            model:       @model.plan.have,
+            model:       @model.plan.have
-            modPack:     @model.modPack,
+            modPack:     @model.modPack
+            gatherNames: -> @modPack.gatherNames includeGatherable:true
             title:       'Items you have'
 
-        @wantController = @addChild InventoryController, '.want',
-            editable:    true
-            icon:        '/images/fishing_rod.png',
-            imageLoader: @imageLoader
-            model:       @model.plan.want,
-            modPack:     @model.modPack,
-            title:       'Items you want'
-
         @needController = @addChild InventoryController, '.need',
             editable:    false
-            icon:        '/images/boots.png',
+            icon:        '/images/boots.png'
             imageLoader: @imageLoader
-            model:       @model.plan.need,
+            model:       @model.plan.need
-            modPack:     @model.modPack,
+            modPack:     @model.modPack
             title:       "Items you'll need"
 
         @craftingTableController = @addChild CraftingTableController, '.view__crafting_table',

src/scripts/models/mod_pack.coffee

@@ -76,13 +76,14 @@ module.exports = class ModPack extends BaseModel
         result.itemUrl = Url.item result
         return result
 
-    gatherRecipeNames: (options={})->
+    gatherNames: (options={})->
+        options.includeGatherable ?= false
         options.includeDisabled ?= false
 
         nameData = {}
         for modVersion in @modVersions
             continue unless modVersion.enabled or options.includeDisabled
-            modVersion.gatherRecipeNames nameData
+            modVersion.gatherNames nameData, options
 
         result = []
         names = _.keys(nameData).sort()
@@ -102,6 +103,17 @@ module.exports = class ModPack extends BaseModel
     isLoading: ->
         return @loading.inspect().state isnt 'pending'
 
+    isValidName: (name, options={})->
+        options.includeDisabled ?= false
+
+        slug = _.slugify name
+        for modVersion in @modVersions
+            continue unless modVersion.enabled or options.includeDisabled
+            name = modVersion.findName slug
+            return true if name
+
+        return false
+
     loadModVersion: (url)->
         promise = w.promise (resolve, reject)=>
             @trigger Event.load.started, this, url

src/scripts/models/mod_version.coffee

@@ -53,12 +53,20 @@ module.exports = class ModVersion extends BaseModel
     findName: (slug)->
         return @names[slug]
 
-    gatherRecipeNames: (result={})->
+    gatherNames: (result={}, options={})->
+        options.includeGatherable ?= false
+
         for slug, item of @items
             continue if result[item.slug]
-            continue unless item.isCraftable
+            if item.isGatherable
+                continue unless options.includeGatherable
             result[item.slug] = value:item.name, label:"#{item.name} (from #{@name} #{@version})"
 
+        if options.includeGatherable
+            for slug, name of @names
+                continue if result[slug]
+                result[slug] = value:name, label:"#{name} (from #{@name} #{@version})"
+
         return result
 
     hasRecipe: (name)->

src/templates/item_page.jade

@@ -6,8 +6,8 @@
 //-
 
 .view__item_page
-    .view__inventory.have
     .view__inventory.want
+    .view__inventory.have
     .view__inventory.need
 
     .view__crafting_table