Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Miner 802697c428 Merge branch 'master' of github.com-andrewminer:andrewminer/crafting-guide
Conflicts:
	src/scripts/controllers/crafting_table_controller.coffee
2015-01-18 16:38:02 -08:00
Andrew Miner ecc839cca8 Factor out the ReceipeController 2015-01-18 16:37:23 -08:00
Andrew Miner 57bc7e08b3 Factor out the ReceipeController 2015-01-18 16:35:01 -08:00
Andrew Miner 0811a868af Fix mod controller bug with fetching
Fix a bug in the ModController where it would ask the current
ModVersion to fetch itself even when there wasn't one selected.
2015-01-18 11:21:11 -08:00
Andrew Miner 28f762abe9 Make fetch a no-up if already loaded 2015-01-18 11:15:52 -08:00
Andrew Miner d1621bb9f6 Refactor ModVersion into Mod and ModVersion
* Remove V1 of the mod version parser and shift V2 up to be V1
* Add a parser for mod.cg files, and refactor the the mod-version.cg
  files to push the appropriate content up to the mod.cg
* Remove the concept of "silent" from BaseModel along with logging
  each event as they are fired (which is what really prompted the
  need for it in the first place)
* Move use of the Storage class to be completely the province of the
  controllers most closely related to models affected
* Convert the ModVersionController to the ModController and have it
  take on responsibility for choosing the mod version
* Update BaseModel to support simple accessors for the current state
* Update CraftingPlan to be able to remove uncraftable items
* Implement the Mod model
2015-01-18 10:48:12 -08:00
Andrew Miner 76dc863372 Compress generated CSS 2015-01-17 12:26:21 -08:00
Andrew Miner 83868e2760 Massive refactoring to clean up models
* Tweak style of quantity label in output box to be more visible
* Move data files for all mods under a directory for the specific
  version of the mod
* Add a `silent` property to the base model to prevent models which
  shouldn't be observed from emitting events
* Change the term "itemSlug" to just "slug" across the board
* Change all models so that they don't require their parent in their
  constructors and so that they don't automatically add themselves to
  their parents lists
* Remove a bunch of unnecessary event triggering
* Tighten up access to various lists of children across all models
* Refactor the guts of the V2 parser into an abstract base class so
  it can be used for other parsers in the future
* Remove a number of unused methods
2015-01-17 11:49:07 -08:00
Andrew Miner bb959264ee Update deploy --new ot always rebuild for prod 2015-01-16 21:03:47 -08:00
Andrew Miner 3efdff6ca4 Fix bug where GA being slow to load caused crash 2015-01-16 21:03:25 -08:00
Andrew Miner c3aac86e3a Fix bug which made deep links fail 2015-01-16 20:49:41 -08:00
Andrew Miner 5f57622cf3 Several large refactorings
* Refactor location of all data files to include a subdirectory
  for the mod version
* Update the BaseModel class to allow models to load themselves from
  any text file (whether JSON or CG)
* Refactor ModPack & ModVersion to move the laoding functionality in
  one into the other (and use the new stuff in BaseModel)
* Move the parser versions into a new subdirectory which allows for
  future additional parsers
2015-01-16 20:26:54 -08:00
Andrew Miner c14997ef90 Update README.md 2015-01-16 13:11:29 -08:00
Andrew Miner ed68159b19 Fix another AE2 recipe 2015-01-16 09:03:56 -08:00
Andrew Miner 1e153d98a9 Fix recipe in AE2 2015-01-16 09:02:32 -08:00
Andrew Miner 03b46f3958 Add local storage for certain UI state 2015-01-16 09:01:06 -08:00
Andrew Miner 33b9214386 Add a "report a problem" link in crafting plan 2015-01-15 21:59:03 -08:00
Andrew Miner d94bd39e52 Refactor the SAYT code to return better results 2015-01-15 17:12:12 -08:00
Andrew Miner a50e3d9621 Add button to suggest a new mod 2015-01-15 14:43:17 -08:00
Andrew Miner 6562c5a4b8 Only report path to GA 2015-01-15 11:43:41 -08:00
Andrew Miner f7fb6cd10e Ensure the current URL is recorded for GA 2015-01-15 11:38:42 -08:00
Andrew Miner 03eacc243c Don't duplicate reports of page visits 2015-01-15 11:30:47 -08:00
Andrew Miner f0c6c055ff Ensure GA is recorded for each page change 2015-01-15 11:14:04 -08:00
Andrew Miner d2b9720e72 Fix recipe in AE2 2015-01-15 11:12:49 -08:00
Andrew Miner 355e98b032 Fix image loader bug which caused broken links 2015-01-15 09:35:00 -08:00
Andrew Miner 2e163600fa Fix missing line number bug in parser 2015-01-15 09:34:16 -08:00
Andrew Miner 271367114f Add full recipes for Applied Energistics 2015-01-15 09:33:45 -08:00
Andrew Miner b228aabe27 Convert IC2 and BC to the V2 format 2015-01-14 16:07:27 -08:00
Andrew Miner fd2bf159ad Fix bug where including tools doesn't re-craft 2015-01-14 16:00:42 -08:00
Andrew Miner aa3406aa54 Convert the MC 1.7.10 recipes into V2 format 2015-01-14 15:58:20 -08:00
Andrew Miner 291f94da57 Add the "verify" script
In addition to the new script, this changes the V2 parser to be able
to continue past the first error found so that as many errors as
possible may be displayed.
2015-01-14 15:57:27 -08:00
Andrew Miner 89a8e2b539 Add V2 file format 2015-01-14 15:19:02 -08:00
Andrew Miner c417a24653 Fix recipes in MC and IC2 2015-01-14 09:30:20 -08:00
Andrew Miner a78ff47c92 Fix carpet recipes in MC 1.7.10 2015-01-14 08:47:39 -08:00
Andrew Miner aaee2e6090 Add images for AE2 and start of recipes file 2015-01-13 09:46:32 -08:00
Andrew Miner 823df84924 Revert local storage change & refactor parser V1
* Revert the local storage change as it ties model objects to global
  state and makes testing impossible. It will be necessary to redo
  that feature differently
* Refactor the parser versions to move V1 into its own set of files
2015-01-13 09:44:13 -08:00
Andrew Miner 47c7cf693a Fix bug where "include tools" would always stay on 2015-01-12 14:21:34 -08:00
Andrew Miner fef9d155d8 Store tool and modVersion enabled states 2015-01-12 14:18:07 -08:00
Andrew Miner 3e70c0deef Show tooltips for items in crafting grid 2015-01-12 12:56:24 -08:00
Andrew Miner a2f4484235 Update jQueryUI to include tool tips 2015-01-12 12:56:09 -08:00
Andrew Miner 833d255dce Don't send feedback on return 2015-01-12 12:37:51 -08:00
Andrew Miner c510c5a1da Add feedback widget 2015-01-12 12:35:36 -08:00
Andrew Miner 1b328a8542 Add missing recipes for BC 6.2.6 2015-01-12 03:59:41 -08:00
Andrew Miner a784f275ff Add back the "include tools" option
* Rewrite the crafting algorithm to recursively find all the steps
  involved and then resolve how many times each needs to be run.
* Update the base controller to debounce calls to refresh
* Fix a few erroneous recipes for IC2-Classic
2015-01-11 16:01:51 -08:00
Andrew Miner 16f17f62a1 Update URL to reflect single item crafting 2015-01-11 09:09:58 -08:00
Andrew Miner 77a026c0e3 Add marketing copy for forums 2015-01-11 09:09:09 -08:00
Andrew Miner 24a9add3f5 Update Gruntfile to uglify prod scripts 2015-01-10 13:34:51 -08:00
Andrew Miner eaabb754a2 Lower logging level in production 2015-01-10 12:48:03 -08:00
Andrew Miner 26a5e028a6 Hide/show inventory toolbar when editable 2015-01-10 12:40:28 -08:00
Andrew Miner 1b2552a20a Remove ability to upload recipe books 2015-01-10 12:31:12 -08:00
Andrew Miner a442ff3245 Prevent quantity field from accepting huge numbers 2015-01-10 12:23:53 -08:00
Andrew Miner 9970b92157 Fix broken tests for gatherNames 2015-01-10 12:13:43 -08:00
Andrew Miner 9756f1f045 Allow "have" inventory to include non-craftables 2015-01-10 11:55:07 -08:00
Andrew Miner 634dec0ee8 Fix autocomplete to dismiss after selecting 2015-01-10 10:52:46 -08:00
Andrew Miner cbe836086a Change crafting table name to show step count 2015-01-10 10:52:23 -08:00
Andrew Miner f21e1592c0 Fix some bugs with IC2 Classic recipes 2015-01-10 10:51:17 -08:00
Andrew Miner 59b9f0b29e Adjust the appearance of the crafting table 2015-01-10 10:50:05 -08:00
Andrew Miner ca43bfb93c Fix name for 30K Cooling Cell from IC2-Classic 2015-01-10 10:24:06 -08:00
Andrew Miner e4e6e68c52 Fix bug with selecting an item from inventory list
When selecting an item, it would formerly just update the text of the
name field without adding the item. The fix is to make it add the
item automatically.
2015-01-10 10:23:12 -08:00
Andrew Miner fa29b77746 Update URL param handling for new site 2015-01-10 09:40:50 -08:00
Andrew Miner f01d367024 Only record Google Analytics in prod 2015-01-10 09:39:26 -08:00
Andrew Miner 8e91200f12 Add remaining IC2 Classic patterns 2015-01-10 08:32:38 -08:00
Andrew Miner f5681a84aa Fix default patterns to not be recorded 2015-01-10 02:16:38 -08:00
Andrew Miner 2f7ae584a0 Add IC2 recipe patterns 2015-01-10 02:15:07 -08:00
Andrew Miner b8a0918541 Complete the Crafting Table view/controller
* Add output box to the crafting table view
* Add remaining crafting patterns to all MC 1.7.10 recipes
* Add all crafting patterns to Buildcraft 6.2.6
* Disable mods which don't have patterns yet
* Add the Url constants for computing urls from templates
* Add the `findItemDisplay` to ModPack (along with tests) and remove
  all replace all uses of `getPathSlugs` with it
2015-01-09 10:08:02 -08:00
Andrew Miner b8d60ac245 Add shaped crafing and recipes for MC 1.7.10 2015-01-08 22:01:02 -08:00
Andrew Miner cf9a76df21 Fix algo. for compacting steps in a crafting plan 2015-01-08 15:11:11 -08:00
Andrew Miner 7954b86140 Add label showing tool names 2015-01-08 14:57:43 -08:00
Andrew Miner fb3db0f393 Add in next/prev buttons for crafting table 2015-01-08 12:34:33 -08:00
Andrew Miner 9424af9d84 Initial version of the new crafting table 2015-01-08 11:03:43 -08:00
Andrew Miner 9f79722378 Refactor image loading code into ImageLoader class 2015-01-07 11:20:49 -08:00
Andrew Miner 4a10a36e37 Fix CraftingPlan tests 2015-01-07 08:48:30 -08:00
Andrew Miner f51082a1cb Add ability to craft multipl items at once
* Remove the old crafting table view
* Complete UI/UX of the inventory view
2015-01-07 08:31:53 -08:00
Andrew Miner a1a7ee5dc9 Initial implementation of the InventoryController 2015-01-06 10:25:05 -08:00
Andrew Miner d499e8e9cf Update jQuery UI to include class transitions 2015-01-06 10:02:56 -08:00
Andrew Miner 61027daf0a Update header 2015-01-05 06:55:51 -08:00
Andrew Miner 206973e304 Update header comments 2015-01-05 06:42:05 -08:00
Andrew Miner bba161445d Change "{furnace fuel}" to just "furnace fuel" 2015-01-04 21:26:25 -08:00
Andrew Miner 13b9874afd Update Buildcraft recipies to version 6.2.6 2015-01-04 21:25:52 -08:00
Andrew Miner a5a2ee0534 Fix missing MC 1.7.10 images 2015-01-04 21:25:14 -08:00
Andrew Miner 96d7f56280 Add images for BC 6.2.6 2015-01-04 21:24:12 -08:00
Andrew Miner 5c5ea861cc Show list to make in order to be made 2015-01-04 15:18:00 -08:00
Andrew Miner 761a244a83 Fix output of unparsing V1 of the data format 2015-01-04 13:14:02 -08:00
Andrew Miner 549abc1224 Improve layout of stacks in crafting table 2015-01-04 11:35:43 -08:00
Andrew Miner e99a688b7e Add remaining MC 1.7.10 images 2015-01-04 11:33:48 -08:00
Andrew Miner 150e85bb49 Display images for each item referenced 2015-01-04 01:01:00 -08:00
Andrew Miner fc97854718 Add more MC 1.7.10 images 2015-01-04 00:58:06 -08:00
Andrew Miner 0d25ac723d Complete refactoring to move Recipes into Items
* Changed "version" to "dataVersion" in data format
* Changed the "modName" and "modVersion" fields on the ModVersion
  class to remove the "mod" prefix and changed the data format to
  match
* Change the Stack class to use the itemSlug instead of the item
  itself
* Update the ModVersion and ModPack classes to include methods for
  recording a correspondence between slugs and names. Update code
  which displays items from stacks to use these methods to determine
  display names.
* Add a reference from Recipe back to the item it creates
2015-01-03 20:08:11 -08:00
Andrew Miner 392c410df8 Add some missing recipes 2015-01-03 19:36:19 -08:00
Andrew Miner 343c27e68d Add more MC 1.7.10 images 2015-01-03 19:29:08 -08:00
Andrew Miner b642c51486 wip 2015-01-02 23:03:06 -08:00
Andrew Miner e389c01468 Add images for Minecraft items 2015-01-02 22:12:48 -08:00
Andrew Miner f16c01ca3d Clear recipeName field on focus 2015-01-01 21:38:58 -08:00
Andrew Miner 3493c41b39 Fix bug where deep links don't compute 2015-01-01 20:54:16 -08:00
Andrew Miner 1434533e92 Add Coal as a raw material 2015-01-01 20:39:55 -08:00
Andrew Miner ca5fed7f26 Update UI to reflect Recipe Catalog -> Mod Pack 2015-01-01 20:18:01 -08:00
Andrew Miner e14a4d0810 Rename RecipeCatalog to ModPack 2015-01-01 20:16:38 -08:00
Andrew Miner f28a763b13 Rename RecipeBook to ModVersion 2015-01-01 20:12:27 -08:00
Andrew Miner 5d4bf92948 Allow reformat to accept diff src/target 2015-01-01 19:58:06 -08:00
Andrew Miner 1a9ae1791e Require input as part of all recipes 2015-01-01 19:06:04 -08:00