Qualify all item slugs to the mod which adds them #53
* Change default item URL to fall under /mod/<mod slug>/<item slug> but kept the old URL pattern around with the old behavior (i.e., find the first item with that slug) * Update Item to have a `qualifiedSlug` property which combines the item's own slug with its Mod's slug. Updated a lot of code all over to use this in preference to the plain slug. * Add a `localizeTo` method to Inventory to allow non-qualified slugs to be converted into qualified slugs within the inventory's stacks * Update ModPack to work with either qualified or unqualified slugs for relevant methods * Fix model state changes to happen before related events are triggered * Add a debounce to the CraftingPlan object when triggering a recraft due to changes in related objects (esp. its inventories) * Update the Inventory's sort to keep items sorted by mod before name with the Minecraft items sorted to the top * Fix `ModPack.findItemByName` to actually recursively use the Mod's method instead of slugifying the given name and looking for the slug (since this won't necessarily work anymore). * Ensure each Mod is assigned a reference to its containing ModPack * Fix NameFinder to only consider an item non-gatherable if it is also craftable * Update ModVersionParserV1 to assign qualified slugs to recipes for any items which are in the same mod (leaving any other slugs unqualified) * Add Underscore mixins for composing and decomposing slugs * Update old tests for the use of qualified slugs, and some new tests for the new methods added
This commit is contained in:
@@ -25,9 +25,16 @@ module.exports = class ModPack extends BaseModel
|
||||
findItem: (slug, options={})->
|
||||
options.includeDisabled ?= false
|
||||
|
||||
[modSlug, itemSlug] = _.decomposeSlug slug
|
||||
if modSlug?
|
||||
mod = @getMod modSlug
|
||||
if mod?
|
||||
item = mod.findItem itemSlug, options
|
||||
return item if item?
|
||||
|
||||
for mod in @_mods
|
||||
continue unless mod.enabled or options.includeDisabled
|
||||
item = mod.findItem slug, options
|
||||
item = mod.findItem itemSlug, options
|
||||
return item if item?
|
||||
|
||||
return null
|
||||
@@ -36,10 +43,9 @@ module.exports = class ModPack extends BaseModel
|
||||
options.enableAsNeeded ?= false
|
||||
options.includeDisabled = true if options.enableAsNeeded
|
||||
|
||||
slug = _.slugify name
|
||||
for mod in @_mods
|
||||
continue unless mod.enabled or options.includeDisabled
|
||||
item = mod.findItem slug, options
|
||||
item = mod.findItemByName name, options
|
||||
return item if item?
|
||||
|
||||
return null
|
||||
@@ -74,6 +80,14 @@ module.exports = class ModPack extends BaseModel
|
||||
return null
|
||||
|
||||
findRecipes: (slug, result=[])->
|
||||
[modSlug, itemSlug] = _.decomposeSlug slug
|
||||
|
||||
if modSlug?
|
||||
mod = @getMod modSlug
|
||||
if mod?
|
||||
mod.findRecipes slug, result
|
||||
return result if result.length > 0
|
||||
|
||||
for mod in @_mods
|
||||
continue unless mod.enabled
|
||||
mod.findRecipes slug, result
|
||||
@@ -88,12 +102,9 @@ module.exports = class ModPack extends BaseModel
|
||||
|
||||
isValidName: (name)->
|
||||
slug = _.slugify name
|
||||
for mod in @_mods
|
||||
continue unless mod.enabled
|
||||
name = mod.findName slug
|
||||
return true if name
|
||||
existingName = @findName slug
|
||||
|
||||
return false
|
||||
return name is existingName
|
||||
|
||||
# Property Methods #############################################################################
|
||||
|
||||
@@ -101,6 +112,7 @@ module.exports = class ModPack extends BaseModel
|
||||
if not mod? then throw new Error 'mod is required'
|
||||
return if @_mods.indexOf(mod) isnt -1
|
||||
|
||||
mod.modPack = this
|
||||
@_mods.push mod
|
||||
@listenTo mod, Event.change, => @trigger Event.change, this
|
||||
@trigger Event.add + ':mod', mod, this
|
||||
|
||||
Reference in New Issue
Block a user