diff --git a/scripts/reformat b/scripts/reformat index 5ca6e4fa6..59eb7f46a 100755 --- a/scripts/reformat +++ b/scripts/reformat @@ -4,6 +4,7 @@ global._ = require 'underscore' global.Backbone = require 'backbone' fs = require 'fs' +Logger = require '../src/scripts/logger' ModVersionParser = require '../src/scripts/models/mod_version_parser' require '../src/scripts/underscore_mixins' @@ -33,6 +34,8 @@ else """ process.exit -1 +global.logger = new Logger level:Logger.WARNING + text = fs.readFileSync sourceFileName, 'UTF-8' data = JSON.parse text parser = new ModVersionParser diff --git a/src/data/buildcraft/recipes.json b/src/data/buildcraft/recipes.json index 6e2fd3079..0d18f0936 100644 --- a/src/data/buildcraft/recipes.json +++ b/src/data/buildcraft/recipes.json @@ -133,7 +133,7 @@ }, { "output": "Flood Gate", "input": [[4, "Iron Ingot"], [3, "Iron Bars"], "Iron Gear", "Tank"], - "tools": "Crafting Guide" + "tools": "Crafting Table" }, { "output": "Gate Copier", "input": ["Redstone Chipset", "Wrench"] diff --git a/src/data/minecraft/images/gold_helmet.png b/src/data/minecraft/images/gold_helm.png similarity index 100% rename from src/data/minecraft/images/gold_helmet.png rename to src/data/minecraft/images/gold_helm.png diff --git a/src/data/minecraft/images/wooden_ax.png b/src/data/minecraft/images/wooden_axe.png similarity index 100% rename from src/data/minecraft/images/wooden_ax.png rename to src/data/minecraft/images/wooden_axe.png diff --git a/src/data/minecraft/recipes.json b/src/data/minecraft/recipes.json index ee057e4eb..70d3011e2 100644 --- a/src/data/minecraft/recipes.json +++ b/src/data/minecraft/recipes.json @@ -17,79 +17,94 @@ "recipes": [ { "output": [[4, "Acacia Wood Planks"]], - "input": "Acacia Wood" + "input": "Acacia Wood", + "pattern": "... .0. ..." }, { "output": [[6, "Acacia Wood Slab"]], "input": [[3, "Acacia Wood Planks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Acacia Wood Stairs"]], "input": [[6, "Acacia Wood Planks"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": [[6, "Activator Rail"]], "input": [[6, "Iron Ingot"], [2, "Stick"], "Redstone Torch"], + "pattern": "010 020 010", "tools": "Crafting Table" }, { "output": "Anvil", "input": [[4, "Iron Ingot"], [3, "Block of Iron"]], + "pattern": "111 .0. 000", "tools": "Crafting Table" }, { "output": [[4, "Arrow"]], "input": ["Feather", "Flint", "Stick"], + "pattern": ".1. .2. .0.", "tools": "Crafting Table" }, { "output": [[3, "Awkward Potion"]], "input": [[3, "Water Bottle"], "Nether Wart"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": "Baked Potato", "input": ["furnace fuel", "Potato"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Beacon", "input": [[5, "Glass"], [3, "Obsidian"], "Nether Star"], - "tools": "Crafting Table" - }, { - "output": "Beacon", - "input": [[5, "Glass"], [3, "Obsidian"], "Nether Star"], + "pattern": "000 020 111", "tools": "Crafting Table" }, { "output": "Bed", "input": [[3, "Oak Wood Planks"], [3, "Wool"]], + "pattern": "... 111 000", "tools": "Crafting Table" }, { "output": [[4, "Birch Wood Planks"]], - "input": "Birch Wood" + "input": "Birch Wood", + "pattern": "... .0. ..." }, { "output": [[6, "Birch Wood Slab"]], "input": [[3, "Birch Wood Planks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Birch Wood Stairs"]], "input": [[6, "Birch Wood Planks"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": [[3, "Black Carpet"]], - "input": [[2, "Black Wool"]] + "input": [[2, "Black Wool"]], + "pattern": "00. ... ..." }, { "output": [[8, "Black Stained Clay"]], "input": [[8, "Hardened Clay"], "Ink Sac"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Black Stained Glass"]], "input": [[8, "Glass"], "Ink Sac"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Black Stained Glass Pane"]], "input": [[6, "Black Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Black Wool", - "input": ["Ink Sac", "Wool"] + "input": ["Ink Sac", "Wool"], + "pattern": "... .1. .0." }, { "output": [[2, "Blaze Powder"]], - "input": "Blaze Rod" + "input": "Blaze Rod", + "pattern": "... .0. ..." }, { "output": "Block of Coal", "input": [[9, "Coal"]], @@ -109,1437 +124,1815 @@ "input": [[9, "Iron Ingot"]] }, { "output": "Block of Quartz", - "input": [[4, "Nether Quartz"]] + "input": [[4, "Nether Quartz"]], + "pattern": "00. 00. ..." }, { "output": "Block of Redstone", "input": [[9, "Redstone"]], "tools": "Crafting Table" }, { "output": [[3, "Blue Carpet"]], - "input": [[2, "Blue Wool"]] + "input": [[2, "Blue Wool"]], + "pattern": "... 00. ..." }, { "output": "Blue Stained Clay", "input": [[8, "Hardened Clay"], "Lapis Lazuli"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Blue Stained Glass"]], "input": [[8, "Glass"], "Lapis Lazuli"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Blue Stained Glass Pane"]], "input": [[6, "Blue Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Blue Wool", - "input": ["Lapis Lazuli", "Wool"] + "input": ["Lapis Lazuli", "Wool"], + "pattern": "... .1. .0." }, { "output": "Boat", "input": [[5, "Oak Wood Planks"]], + "pattern": "... 0.0 000", "tools": "Crafting Table" }, { "output": [[3, "Bone Meal"]], - "input": "Bone" + "input": "Bone", + "pattern": "... .0. ..." }, { "output": "Book", - "input": [[3, "Paper"], "Leather"] + "input": [[3, "Paper"], "Leather"], + "pattern": "10. 00. ..." }, { "output": "Book and Quill", - "input": ["Book", "Feather", "Ink Sac"] + "input": ["Book", "Feather", "Ink Sac"], + "pattern": ".1. 02. ..." }, { "output": "Bookshelf", "input": [[6, "Oak Wood Planks"], [3, "Book"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Bow", "input": [[3, "Stick"], [3, "String"]], + "pattern": ".01 0.1 .01", "tools": "Crafting Table" }, { "output": "Bowl", "input": [[3, "Oak Wood Planks"]], + "pattern": "... 0.0 .0.", "tools": "Crafting Table" }, { "output": "Bread", "input": [[3, "Wheat"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": "Brewing Stand", "input": [[3, "Cobblestone"], "Blaze Rod"], + "pattern": "... .1. 000", "tools": "Crafting Table" }, { "output": "Brick", "input": ["Clay", "furnace fuel"], + "pattern": ".0. ... .1.", "tools": "Furnace" }, { "output": [[4, "Brick Stairs"]], "input": [[6, "Bricks"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Bricks", - "input": [[4, "Brick"]] + "input": [[4, "Brick"]], + "pattern": "00. 00. ..." }, { "output": [[6, "Bricks Slab"]], "input": [[3, "Bricks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[3, "Brown Carpet"]], - "input": [[2, "Brown Wool"]] + "input": [[2, "Brown Wool"]], + "pattern": "... 00. ..." }, { "output": "Brown Stained Clay", "input": [[8, "Hardened Clay"], "Cocoa Beans"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Brown Stained Glass"]], "input": [[8, "Glass"], "Cocoa Beans"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Brown Stained Glass Pane"]], "input": [[6, "Brown Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Brown Wool", - "input": ["Cocoa Beans", "Wool"] + "input": ["Cocoa Beans", "Wool"], + "pattern": "... .1. .0." }, { "output": "Bucket", "input": [[3, "Iron Ingot"]], + "pattern": "... 0.0 .0.", "tools": "Crafting Table" }, { "output": "Button", - "input": "Stone" + "input": "Stone", + "pattern": "... .0. ..." }, { "output": "Button (wood)", - "input": "Oak Wood Planks" + "input": "Oak Wood Planks", + "pattern": "... .0. ..." }, { "output": "Cactus Green", "input": ["Cactus", "furnace fuel"], + "pattern": ".0. ... .1.", "tools": "Furnace" }, { "output": ["Cake", [3, "Bucket"]], "input": [[3, "Milk"], [3, "Wheat"], [2, "Sugar"], "Egg"], + "pattern": "000 232 111", "tools": "Crafting Table" }, { "output": [[3, "Carpet"]], - "input": [[2, "Wool"]] + "input": [[2, "Wool"]], + "pattern": "... 00. ..." }, { "output": "Carrot on a Stick", - "input": ["Carrot", "Fishing Rod"] + "input": ["Carrot", "Fishing Rod"], + "pattern": "... 10. ..." }, { "output": "Cauldron", "input": [[7, "Iron Ingot"]], + "pattern": "0.0 0.0 000", "tools": "Crafting Table" }, { "output": "Chain Boots", "input": [[4, "Fire"]], + "pattern": "... 0.0 0.0", "tools": "Crafting Table" }, { "output": "Chain Chestplate", "input": [[8, "Fire"]], + "pattern": "0.0 000 000", "tools": "Crafting Table" }, { "output": "Chain Helmet", "input": [[5, "Fire"]], + "pattern": "000 0.0 ...", "tools": "Crafting Table" }, { "output": "Chain Leggings", "input": [[7, "Fire"]], + "pattern": "000 0.0 0.0", "tools": "Crafting Table" }, { "output": "Charcoal", "input": ["furnace fuel", "Oak Wood"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Charcoal", "input": ["furnace fuel", "Oak Wood"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Chest", "input": [[8, "Oak Wood Planks"]], + "pattern": "000 0.0 000", "tools": "Crafting Table" }, { "output": "Chiseled Quartz Block", - "input": [[2, "Quartz Slab"]] + "input": [[2, "Quartz Slab"]], + "pattern": "... .0. .0." }, { "output": "Chiseled Sandstone", - "input": [[2, "Sandstone Slab"]] + "input": [[2, "Sandstone Slab"]], + "pattern": "... .0. .0." }, { "output": "Clay (block)", - "input": [[4, "Clay (item)"]] - }, { - "output": "Clay (block)", - "input": [[4, "Clay"]] + "input": [[4, "Clay"]], + "pattern": "00. 00. ..." }, { "output": "Clock", "input": [[4, "Gold Ingot"], "Redstone"], - "tools": "Crafting Guide" + "pattern": ".0. 010 .0.", + "tools": "Crafting Table" }, { "output": [[9, "Coal"]], - "input": "Block of Coal" + "input": "Block of Coal", + "pattern": "... .0. ..." }, { "output": [[6, "Cobblestone Slab"]], - "input": [[3, "Cobblestone"]] + "input": [[3, "Cobblestone"]], + "pattern": "... 000 ..." }, { "output": [[6, "Cobblestone Wall"]], "input": [[6, "Cobblestone"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Compass", "input": [[4, "Iron Ingot"], "Redstone"], - "tools": "Crafting Guide" + "pattern": ".0. 010 .0.", + "tools": "Crafting Table" }, { "output": "Cooked Chicken", "input": ["furnace fuel", "Raw Chicken"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Cooked Fish", "input": ["furnace fuel", "Raw Fish"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Cooked Porkchop", "input": ["furnace fuel", "Raw Porkchop"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Cooked Salmon", "input": ["furnace fuel", "Raw Salmon"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Cookie", "input": [[2, "Wheat"], "Cocoa Beans"], + "pattern": "... 010 ...", "tools": "Crafting Table" }, { "output": "Crafting Table", - "input": [[4, "Oak Wood Planks"]] + "input": [[4, "Oak Wood Planks"]], + "pattern": "00. 00. ..." }, { "output": [[3, "Cyan Carpet"]], - "input": [[2, "Cyan Wool"]] + "input": [[2, "Cyan Wool"]], + "pattern": "... 01. ..." }, { "output": [[2, "Cyan Dye"]], - "input": ["Cactus Green", "Lapis Lazuli"] + "input": ["Cactus Green", "Lapis Lazuli"], + "pattern": "... 01. ..." }, { "output": "Cyan Stained Clay", "input": [[8, "Hardened Clay"], "Cyan Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Cyan Stained Glass"]], "input": [[8, "Glass"], "Cyan Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Cyan Stained Glass Pane"]], "input": [[6, "Cyan Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Cyan Wool", - "input": ["Cyan Dye", "Wool"] + "input": ["Cyan Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": [[2, "Dandelion Yellow"]], - "input": "Sunflower" + "input": "Sunflower", + "pattern": "... .0. ..." }, { "output": "Dandelion Yellow", - "input": "Dandelion" + "input": "Dandelion", + "pattern": "... .0. ..." }, { "output": [[4, "Dark Oak Wood Planks"]], - "input": "Dark Oak Wood" + "input": "Dark Oak Wood", + "pattern": "... .0. ..." }, { "output": [[6, "Dark Oak Wood Slab"]], "input": [[3, "Dark Oak Wood Planks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Dark Oak Wood Stairs"]], "input": [[6, "Dark Oak Wood Planks"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Daylight Sensor", "input": [[3, "Glass"], [3, "Nether Quartz"], [3, "Oak Wood Slab"]], + "pattern": "000 111 222", "tools": "Crafting Table" }, { "output": [[6, "Detector Rail"]], "input": [[6, "Iron Ingot"], "Pressure Plate", "Redstone"], + "pattern": "0.0 010 020", "tools": "Crafting Table" }, { "output": [[9, "Diamond"]], - "input": "Block of Diamond" + "input": "Block of Diamond", + "pattern": "... .0. ..." }, { "output": "Diamond Axe", "input": [[3, "Diamond"], [2, "Stick"]], + "pattern": "00. 01. .1.", "tools": "Crafting Table" }, { "output": "Diamond Boots", "input": [[4, "Diamond"]], + "pattern": "... 0.0 0.0", "tools": "Crafting Table" }, { "output": "Diamond Chestplate", "input": [[8, "Diamond"]], + "pattern": "0.0 000 000", "tools": "Crafting Table" }, { "output": "Diamond Helm", "input": [[5, "Diamond"]], + "pattern": "000 0.0 ...", "tools": "Crafting Table" }, { "output": "Diamond Hoe", "input": [[2, "Diamond"], [2, "Stick"]], + "pattern": "00. .1. .1.", "tools": "Crafting Table" }, { "output": "Diamond Leggings", "input": [[7, "Diamond"]], + "pattern": "000 0.0 0.0", "tools": "Crafting Table" }, { "output": "Diamond Pickaxe", "input": [[3, "Diamond"], [2, "Stick"]], + "pattern": "000 .1. .1.", "tools": "Crafting Table" }, { "output": "Diamond Shovel", "input": [[2, "Stick"], "Diamond"], + "pattern": ".0. .1. .1.", "tools": "Crafting Table" }, { "output": "Diamond Sword", "input": [[2, "Diamond"], "Stick"], + "pattern": ".0. .0. .1.", "tools": "Crafting Table" }, { "output": "Dispenser", "input": [[7, "Cobblestone"], "Bow", "Redstone"], + "pattern": "000 010 020", + "tools": "Crafting Table" + }, { + "output": "Door", + "input": [[6, "Oak Wood Planks"]], + "pattern": ".00 .00 .00", "tools": "Crafting Table" }, { "output": "Dropper", "input": [[7, "Cobblestone"], "Redstone"], + "pattern": "000 0.0 010", "tools": "Crafting Table" }, { "output": [[9, "Emerald"]], - "input": "Block of Emerald" + "input": "Block of Emerald", + "pattern": "... .0. ..." }, { "output": "Emerald", "input": ["Emerald Ore", "furnace fuel"], + "pattern": ".0. ... .1.", "tools": "Furnace" }, { "output": "Empty Map", "input": [[8, "Paper"], "Compass"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": "Empty Map", "input": [[8, "Paper"], "Map (completed)"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": "Enchantment Table", "input": [[4, "Obsidian"], [2, "Diamond"], "Book"], + "pattern": ".2. 101 000", "tools": "Crafting Table" }, { "output": "Ender Chest", "input": [[8, "Obsidian"], "Eye of Ender"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": "Eye of Ender", - "input": ["Blaze Powder", "Ender Pearl"] + "input": ["Blaze Powder", "Ender Pearl"], + "pattern": "... .0. .1." }, { "output": [[2, "Fence"]], "input": [[6, "Stick"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Fence Gate", "input": [[4, "Stick"], [2, "Oak Wood Planks"]], + "pattern": "... 101 101", "tools": "Crafting Table" }, { "output": "Fermented Spider Eye", - "input": ["Brown Mushroom", "Spider Eye", "Sugar"] + "input": ["Brown Mushroom", "Spider Eye", "Sugar"], + "pattern": ".2. .0. .1." }, { "output": [[3, "Fire Charge"]], - "input": ["Blaze Powder", "Coal", "Gunpowder"] + "input": ["Blaze Powder", "Coal", "Gunpowder"], + "pattern": ".2. .0. .1." }, { "output": [[3, "Fire Charge"]], - "input": ["Blaze Powder", "Charcoal", "Gunpowder"] + "input": ["Blaze Powder", "Charcoal", "Gunpowder"], + "pattern": ".2. .0. .1." }, { "output": "Firework Rocket (duration 1)", - "input": ["Gunpowder", "Paper"] + "input": ["Gunpowder", "Paper"], + "pattern": "... .1. .0." }, { "output": "Firework Rocket (duration 2)", - "input": [[2, "Gunpowder"], "Paper"] + "input": [[2, "Gunpowder"], "Paper"], + "pattern": "... .1. 0.0" }, { "output": "Firework Rocket (duration 3)", - "input": [[3, "Gunpowder"], "Paper"] + "input": [[3, "Gunpowder"], "Paper"], + "pattern": "... .1. 000" }, { "output": "Fishing Rod", "input": [[3, "Stick"], [2, "String"]], + "pattern": "..0 .01, 0.1", "tools": "Crafting Table" }, { "output": "Flint and Steel", - "input": ["Flint", "Iron Ingot"] + "input": ["Flint", "Iron Ingot"], + "pattern": "... .1. ..0" }, { "output": "Flower Pot", - "input": "Brick", - "tools": "Crafting Guide" + "input": [[3, "Brick"]], + "pattern": "... 0.0 .0.", + "tools": "Crafting Table" }, { "output": "Furnace", "input": [[8, "Cobblestone"]], + "pattern": "000 0.0 000", "tools": "Crafting Table" }, { "output": "Glass", "input": ["furnace fuel", "Sand"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": [[3, "Glass Bottle"]], "input": [[3, "Glass"]], + "pattern": "... 0.0 .0.", "tools": "Crafting Table" }, { "output": [[16, "Glass Pane"]], "input": [[6, "Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": [[16, "Glass Panes"]], "input": [[6, "Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Glistering Melon", "input": [[8, "Gold Nugget"], "Melon"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": "Glowstone", - "input": [[4, "Glowstone Dust"]] + "input": [[4, "Glowstone Dust"]], + "pattern": "00. 00. ..." }, { "output": "Gold Axe", "input": [[3, "Gold Ingot"], [2, "Stick"]], + "pattern": "00. 01. .1.", "tools": "Crafting Table" }, { "output": "Gold Boots", "input": [[4, "Gold Ingot"]], + "pattern": "... 0.0 0.0", "tools": "Crafting Table" }, { "output": "Gold Chestplate", "input": [[8, "Gold Ingot"]], + "pattern": "0.0 000 000", "tools": "Crafting Table" }, { "output": "Gold Helm", "input": [[5, "Gold Ingot"]], + "pattern": "000 0.0 ...", "tools": "Crafting Table" }, { "output": "Gold Hoe", "input": [[2, "Gold Ingot"], [2, "Stick"]], + "pattern": "00. .1. .1.", "tools": "Crafting Table" }, { "output": "Gold Ingot", "input": ["furnace fuel", "Gold Ore"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": [[9, "Gold Ingot"]], - "input": "Block of Gold" + "input": "Block of Gold", + "pattern": "... .0. ..." }, { "output": "Gold Ingot", "input": [[9, "Gold Nugget"]], + "pattern": "000 000 000", "tools": "Crafting Table" }, { "output": "Gold Leggings", "input": [[7, "Gold Ingot"]], + "pattern": "000 0.0 0.0", "tools": "Crafting Table" }, { "output": [[9, "Gold Nugget"]], - "input": "Gold Ingot" + "input": "Gold Ingot", + "pattern": "... .0. ..." }, { "output": "Gold Pickaxe", "input": [[3, "Gold Ingot"], [2, "Stick"]], + "pattern": "000 .1. .1.", "tools": "Crafting Table" }, { "output": "Gold Shovel", "input": [[2, "Stick"], "Gold Ingot"], + "pattern": ".0. .1. .1.", "tools": "Crafting Table" }, { "output": "Gold Sword", "input": [[2, "Gold Ingot"], "Stick"], + "pattern": ".0. .0. .1.", "tools": "Crafting Table" }, { "output": "Golden Apple", "input": [[8, "Gold Ingot"], "Apple"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": "Golden Apple (magic)", "input": [[8, "Block of Gold"], "Apple"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": "Golden Carrot", "input": [[8, "Gold Nugget"], "Carrot"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[3, "Gray Carpet"]], - "input": [[2, "Gray Wool"]] + "input": [[2, "Gray Wool"]], + "pattern": "... 01. ..." }, { "output": [[2, "Gray Dye"]], - "input": ["Bone Meal", "Ink Sac"] + "input": ["Bone Meal", "Ink Sac"], + "pattern": "... .0. .1." }, { "output": "Gray Stained Clay", "input": [[8, "Hardened Clay"], "Gray Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Gray Stained Glass"]], "input": [[8, "Glass"], "Gray Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Gray Stained Glass Pane"]], "input": [[6, "Gray Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Gray Wool", - "input": ["Gray Dye", "Wool"] + "input": ["Gray Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": [[3, "Green Carpet"]], - "input": [[2, "Green Wool"]] + "input": [[2, "Green Wool"]], + "pattern": "... 01. ..." }, { "output": "Green Stained Clay", "input": [[8, "Hardened Clay"], "Cactus Green"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Green Stained Glass"]], "input": [[8, "Glass"], "Cactus Green"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Green Stained Glass Pane"]], "input": [[6, "Green Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Green Wool", - "input": ["Cactus Green", "Wool"] + "input": ["Cactus Green", "Wool"], + "pattern": "... .1. .0." }, { "output": "Hardened Clay", "input": ["Clay (block)", "furnace fuel"], + "pattern": ".0. ... .1.", "tools": "Furnace" }, { "output": "Hay Bale", "input": [[9, "Wheat"]], + "pattern": "000 000 000", "tools": "Crafting Table" }, { "output": "Hopper", "input": [[5, "Iron Ingot"], "Chest"], + "pattern": "0.0 010 .0.", "tools": "Crafting Table" }, { "output": "Iron Axe", "input": [[3, "Iron Ingot"], [2, "Stick"]], + "pattern": "00. 01. .1.", "tools": "Crafting Table" }, { "output": [[16, "Iron Bars"]], "input": [[6, "Iron Ingot"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Iron Boots", "input": [[4, "Iron Ingot"]], + "pattern": "... 0.0 0.0", "tools": "Crafting Table" }, { "output": "Iron Chestplate", "input": [[8, "Iron Ingot"]], + "pattern": "0.0 000 000", "tools": "Crafting Table" }, { "output": "Iron Door", "input": [[6, "Iron Ingot"]], + "pattern": ".00 .00 .00", "tools": "Crafting Table" }, { "output": "Iron Helm", "input": [[5, "Iron Ingot"]], + "pattern": "000 0.0 0.0", "tools": "Crafting Table" }, { "output": "Iron Hoe", "input": [[2, "Iron Ingot"], [2, "Stick"]], + "pattern": "00 .1. .1.", "tools": "Crafting Table" }, { "output": "Iron Ingot", "input": ["furnace fuel", "Iron Ore"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": [[9, "Iron Ingot"]], - "input": "Block of Iron" + "input": "Block of Iron", + "pattern": "... .0. ..." }, { "output": "Iron Leggings", "input": [[7, "Iron Ingot"]], + "pattern": "000 0.0 0.0", "tools": "Crafting Table" }, { "output": [[9, "Iron Nugget"]], - "input": "Iron Ingot" + "input": "Iron Ingot", + "pattern": "... .0. ..." }, { "output": "Iron Pickaxe", "input": [[3, "Iron Ingot"], [2, "Stick"]], + "pattern": "000 .1. .1.", "tools": "Crafting Table" }, { "output": "Iron Shovel", "input": [[2, "Stick"], "Iron Ingot"], + "pattern": ".1. .0. .0.", "tools": "Crafting Table" }, { "output": "Iron Sword", "input": [[2, "Iron Ingot"], "Stick"], + "pattern": ".0. .0. .1.", "tools": "Crafting Table" }, { "output": "Item Frame", "input": [[8, "Stick"], "Leather"], - "tools": "Crafting Guide" + "pattern": "000 010 000", + "tools": "Crafting Table" }, { "output": "Jack o'Lantern", - "input": ["Pumpkin", "Torch"] + "input": ["Pumpkin", "Torch"], + "pattern": "... .0. .1." }, { "output": "Jukebox", "input": [[8, "Oak Wood Planks"], "Diamond"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[4, "Jungle Wood Planks"]], - "input": "Jungle Wood" + "input": "Jungle Wood", + "pattern": "... .0. ..." }, { "output": [[6, "Jungle Wood Slab"]], "input": [[3, "Jungle Wood Planks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Jungle Wood Stairs"]], "input": [[6, "Jungle Wood Planks"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Lapis Lazuli", "input": ["furnace fuel", "Lapis Lazuli Ore"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Lapis Lazuli Block", "input": [[9, "Lapis Lazuli"]], - "tools": "Crafting Table" - }, { - "output": "Lapis Lazuli Block", - "input": [[9, "Lapis Lazuli"]], + "pattern": "000 000 000", "tools": "Crafting Table" }, { "output": "Lava Bucket", - "input": ["Bucket", "Lava Source Block"] + "input": ["Bucket", "Lava Source Block"], + "pattern": "... .1. .0." }, { "output": [[2, "Lead"]], "input": [[4, "String"], "Slimeball"], + "pattern": "00. 01. ..0", "tools": "Crafting Table" }, { "output": "Leather Boots", - "input": [[4, "Leather"]] + "input": [[4, "Leather"]], + "pattern": "... 0.0 0.0" }, { "output": "Leather Cap", - "input": [[5, "Leather"]] + "input": [[5, "Leather"]], + "pattern": "000 0.0 ..." }, { "output": "Leather Pants", - "input": [[7, "Leather"]] + "input": [[7, "Leather"]], + "pattern": "000 0.0 0.0" }, { "output": "Leather Tunic", - "input": [[8, "Leather"]] + "input": [[8, "Leather"]], + "pattern": "0.0 000 000" }, { "output": "Lever", - "input": ["Cobblestone", "Stick"] + "input": ["Cobblestone", "Stick"], + "pattern": "... .1. .0." }, { "output": [[3, "Light Blue Carpet"]], - "input": [[2, "Light Blue Wool"]] + "input": [[2, "Light Blue Wool"]], + "pattern": "... 01. ..." }, { "output": "Light Blue Dye", - "input": "Blue Orchid" + "input": "Blue Orchid", + "pattern": "... .0. ..." }, { "output": [[2, "Light Blue Dye"]], - "input": ["Bone Meal", "Lapis Lazuli"] + "input": ["Bone Meal", "Lapis Lazuli"], + "pattern": "... .0. .1." }, { "output": "Light Blue Stained Clay", "input": [[8, "Hardened Clay"], "Light Blue Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Light Blue Stained Glass"]], "input": [[8, "Glass"], "Light Blue Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Light Blue Stained Glass Pane"]], "input": [[6, "Light Blue Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Light Blue Wool", - "input": ["Light Blue Dye", "Wool"] + "input": ["Light Blue Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": [[3, "Light Gray Carpet"]], - "input": [[2, "Light Gray Wool"]] + "input": [[2, "Light Gray Wool"]], + "pattern": "... 01. ..." }, { "output": "Light Gray Dye", - "input": "White Tulip" + "input": "White Tulip", + "pattern": "... .0. ..." }, { "output": "Light Gray Dye", - "input": "Azure Bluet" + "input": "Azure Bluet", + "pattern": "... .0. ..." }, { "output": "Light Gray Dye", - "input": "Oxeye Daisy" + "input": "Oxeye Daisy", + "pattern": "... .0. ..." }, { "output": [[3, "Light Gray Dye"]], - "input": [[2, "Bone Meal"], "Ink Sac"] + "input": [[2, "Bone Meal"], "Ink Sac"], + "pattern": "... 010 ..." }, { "output": [[2, "Light Gray Dye"]], - "input": ["Bone Meal", "Gray Dye"] + "input": ["Bone Meal", "Gray Dye"], + "pattern": "... .0. .1." }, { "output": "Light Gray Stained Clay", "input": [[8, "Hardened Clay"], "Light Gray Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Light Gray Stained Glass"]], "input": [[8, "Glass"], "Light Gray Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Light Gray Stained Glass Pane"]], "input": [[6, "Light Gray Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Light Gray Wool", - "input": ["Light Gray Dye", "Wool"] + "input": ["Light Gray Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": [[3, "Lime Carpet"]], - "input": [[2, "Lime Wool"]] + "input": [[2, "Lime Wool"]], + "pattern": "... 01. ..." }, { "output": [[2, "Lime Dye"]], - "input": ["Bone Meal", "Cactus Green"] + "input": ["Bone Meal", "Cactus Green"], + "pattern": "... .0. .1." }, { "output": "Lime Stained Clay", "input": [[8, "Hardened Clay"], "Lime Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Lime Stained Glass"]], "input": [[8, "Glass"], "Lime Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Lime Stained Glass Pane"]], "input": [[6, "Lime Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Lime Wool", - "input": ["Lime Dye", "Wool"] + "input": ["Lime Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": [[3, "Magenta Carpet"]], - "input": [[2, "Magenta Wool"]] + "input": [[2, "Magenta Wool"]], + "pattern": "... .1. .0." }, { "output": "Magenta Dye", - "input": "Allium" + "input": "Allium", + "pattern": "... .0. ..." }, { "output": [[4, "Magenta Dye"]], - "input": [[2, "Rose Red"], "Bone Meal", "Lapis Lazuli"] + "input": [[2, "Rose Red"], "Bone Meal", "Lapis Lazuli"], + "pattern": "00. 12. ..." }, { "output": [[3, "Magenta Dye"]], - "input": ["Lapis Lazuli", "Pink Dye", "Rose Red"] + "input": ["Lapis Lazuli", "Pink Dye", "Rose Red"], + "pattern": "... 012" }, { "output": [[2, "Magenta Dye"]], - "input": ["Pink Dye", "Purple Dye"] + "input": ["Pink Dye", "Purple Dye"], + "pattern": "... .0. .1." }, { "output": "Magenta Stained Clay", "input": [[8, "Hardened Clay"], "Magenta Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Magenta Stained Glass"]], "input": [[8, "Glass"], "Magenta Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Magenta Stained Glass Pane"]], "input": [[6, "Magenta Stained Glass"]], + "pattern": "... 000", "tools": "Crafting Table" }, { "output": "Magenta Wool", - "input": ["Magenta Dye", "Wool"] + "input": ["Magenta Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": "Magma Cream", - "input": ["Blaze Powder", "Slimeball"] + "input": ["Blaze Powder", "Slimeball"], + "pattern": "... .0. .1." }, { "output": [[2, "Magneta Dye"]], - "input": "Lilac" + "input": "Lilac", + "pattern": "... .0. ..." }, { "output": "Melon (block)", "input": [[9, "Melon"]], + "pattern": "000 000 000", "tools": "Crafting Table" }, { "output": "Melon Seeds", - "input": "Melon" + "input": "Melon", + "pattern": "... .0. ..." }, { "output": "Milk", "input": "Bucket", + "pattern": "... .0. ...", "tools": "Cow" }, { "output": "Minecart", "input": [[5, "Iron Ingot"]], + "pattern": "... 0.0 000", "tools": "Crafting Table" }, { "output": "Minecart with Chest", - "input": ["Chest", "Minecart"] + "input": ["Chest", "Minecart"], + "pattern": "... .0. .1." }, { "output": "Minecart with Furnace", - "input": ["Furnace", "Minecart"] + "input": ["Furnace", "Minecart"], + "pattern": "... .0. .1." }, { "output": "Minecart with Hopper", - "input": ["Hopper", "Minecart"] + "input": ["Hopper", "Minecart"], + "pattern": "... .0. .1." }, { "output": "Minecart with TNT", - "input": ["Minecart", "TNT"] + "input": ["Minecart", "TNT"], + "pattern": "... .1. .0." }, { "output": [[6, "Mossy Cobblestone Wall"]], "input": [[6, "Moss Stone"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": [[3, "Mundane Potion"]], "input": [[3, "Water Bottle"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Mundane Splash Potion"]], "input": [[3, "Mundane Potion"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": "Mushroom Stew", - "input": ["Bowl", "Brown Mushroom", "Red Mushroom"] + "input": ["Bowl", "Brown Mushroom", "Red Mushroom"], + "pattern": ".2. .1. .0." }, { "output": "Nether Brick (block)", - "input": [[4, "Nether Brick (item)"]] + "input": [[4, "Nether Brick (item)"]], + "pattern": "00. 00. 000" }, { "output": "Nether Brick (item)", "input": ["furnace fuel", "Netherrack"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": [[6, "Nether Brick Fence"]], "input": [[6, "Nether Brick (block)"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": [[6, "Nether Brick Slab"]], - "input": [[3, "Nether Brick (block)"]] + "input": [[3, "Nether Brick (block)"]], + "pattern": "... 000 ..." }, { "output": [[4, "Nether Brick Stairs"]], "input": [[6, "Nether Brick (block)"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Nether Quartz", "input": ["furnace fuel", "Nether Quartz Ore"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": "Note Block", "input": [[8, "Oak Wood Planks"], "Redstone"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[4, "Oak Wood Planks"]], - "input": "Oak Wood" + "input": "Oak Wood", + "pattern": "... .0. ..." }, { "output": [[6, "Oak Wood Slab"]], "input": [[3, "Oak Wood Planks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Oak Wood Stairs"]], - "input": [[6, "Oak Wood Planks"]] + "input": [[6, "Oak Wood Planks"]], + "pattern": "0.. 00. 000" }, { "output": [[3, "Orange Carpet"]], - "input": [[2, "Orange Wool"]] + "input": [[2, "Orange Wool"]], + "pattern": "... 00. ..." }, { "output": "Orange Dye", - "input": "Orange Tulip" + "input": "Orange Tulip", + "pattern": "... .0. ..." }, { "output": [[2, "Orange Dye"]], - "input": "Rose Red" - }, { - "output": [[2, "Orange Dye"]], - "input": ["Dandelion Yellow", "Rose Red"] + "input": ["Dandelion Yellow", "Rose Red"], + "pattern": "... .0. .1." }, { "output": "Orange Stained Clay", "input": [[8, "Hardened Clay"], "Orange Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Orange Stained Glass"]], "input": [[8, "Glass"], "Orange Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Orange Stained Glass Pane"]], "input": [[6, "Orange Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Orange Wool", - "input": ["Orange Dye", "Wool"] + "input": ["Orange Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": "Painting", "input": [[8, "Stick"], "Wool"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[3, "Paper"]], - "input": [[3, "Sugar Cane"]] + "input": [[3, "Sugar Cane"]], + "pattern": "... 000 ..." }, { "output": [[2, "Pillar Quartz Block"]], - "input": [[2, "Block of Quartz"]] + "input": [[2, "Block of Quartz"]], + "pattern": "... .0. .1." }, { "output": [[3, "Pink Carpet"]], - "input": [[2, "Pink Wool"]] + "input": [[2, "Pink Wool"]], + "pattern": "... 01. ..." }, { "output": [[2, "Pink Dye"]], - "input": "Peony" + "input": "Peony", + "pattern": "... .0. ..." }, { "output": "Pink Dye", - "input": "Pink Tulip" + "input": "Pink Tulip", + "pattern": "... .0. ..." }, { "output": [[2, "Pink Dye"]], - "input": ["Bone Meal", "Rose Red"] + "input": ["Bone Meal", "Rose Red"], + "pattern": "... .0. .1." }, { "output": "Pink Stained Clay", "input": [[8, "Hardened Clay"], "Pink Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Pink Stained Glass"]], "input": [[8, "Glass"], "Pink Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Pink Stained Glass Pane"]], "input": [[6, "Pink Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Pink Wool", - "input": ["Pink Dye", "Wool"] + "input": ["Pink Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": "Piston", - "input": [[4, "Cobblestone"], [4, "Oak Wood Planks"], "Iron Ingot", "Redstone"], - "tools": "Crafting Guide" + "input": [[4, "Cobblestone"], [3, "Oak Wood Planks"], "Iron Ingot", "Redstone"], + "pattern": "111 020 030", + "tools": "Crafting Table" }, { "output": [[3, "Potion of Fire Resistance (3:00)"]], "input": [[3, "Awkward Potion"], "Magma Cream"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Fire Resistance (8:00)"]], "input": [[3, "Potion of Fire Resistance (3:00)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming"]], "input": [[3, "Potion of Poison (0:45)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming"]], "input": [[3, "Potion of Poison (2:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming"]], "input": [[3, "Potion of Water Breathing (3:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming"]], "input": [[3, "Potion of Water Breathing (8:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming"]], "input": [[3, "Potion of Healing"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming II"]], - "input": [[3, "Potion of Harming"], "Glowstone"], + "input": [[3, "Potion of Harming"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming II"]], "input": [[3, "Potion of Poison II (0:22)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Harming II"]], "input": [[3, "Potion of Healing II"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Healing"]], "input": [[3, "Awkward Potion"], "Glistering Melon"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Healing II"]], - "input": [[3, "Potion of Healing"], "Glowstone"], + "input": [[3, "Potion of Healing"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Invisibility (3:00)"]], "input": [[3, "Potion of Night Vision (3:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Invisibility (8:00)"]], "input": [[3, "Potion of Invisibility (3:00)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Invisibility (8:00)"]], "input": [[3, "Potion of Night Vision (8:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Night Vision (3:00)"]], "input": [[3, "Awkward Potion"], "Golden Carrot"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Night Vision (8:00)"]], "input": [[3, "Potion of Night Vision (3:00)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Poison (0:45)"]], "input": [[3, "Awkward Potion"], "Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Poison II (0:22)"]], - "input": [[3, "Potion of Poison (0:45)"], "Glowstone"], + "input": [[3, "Potion of Poison (0:45)"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Regeneration (0:45)"]], "input": [[3, "Awkward Potion"], "Ghast Tear"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Regeneration (2:00)"]], "input": [[3, "Potion of Regeneration (0:45)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Regeneration II (0:22)"]], - "input": [[3, "Potion of Regeneration (0:45)"], "Glowstone"], + "input": [[3, "Potion of Regeneration (0:45)"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Slowness (1:30)"]], "input": [[3, "Potion of Swiftness"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Slowness (4:00)"]], "input": [[3, "Potion of Slowness (1:30)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Slowness (4:00)"]], "input": [[3, "Potion of Fire Resistance (8:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Slowness (4:00)"]], "input": [[3, "Potion of Swiftness (8:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Strength (3:00)"]], "input": [[3, "Awkward Potion"], "Blaze Powder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Strength (8:00)"]], "input": [[3, "Potion of Strength (3:00)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Strength II (1:30)"]], - "input": [[3, "Potion of Strength (3:00)"], "Glowstone"], + "input": [[3, "Potion of Strength (3:00)"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Swiftness (3:00)"]], "input": [[3, "Awkward Potion"], "Sugar"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Swiftness (8:00)"]], "input": [[3, "Potion of Swiftness (3:00)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Swiftness II (1:30)"]], - "input": [[3, "Potion of Swiftness (3:00)"], "Glowstone"], + "input": [[3, "Potion of Swiftness (3:00)"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Water Breathing (3:00)"]], "input": [[3, "Awkward Potion"], "Pufferfish"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Water Breathing (8:00)"]], "input": [[3, "Potion of Water Breathing (3:00)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Weakness (1:30)"]], "input": [[3, "Water Bottle"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Weakness (4:00)"]], "input": [[3, "Potion of Weakness (1:30)"], "Redstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Weakness (4:00)"]], "input": [[3, "Mundane Potion"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Weakness (4:00)"]], "input": [[3, "Water Bottle"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Potion of Weakness (4:00)"]], "input": [[3, "Potion of Strength (8:00)"], "Fermented Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[6, "Powered Rail"]], "input": [[6, "Gold Ingot"], "Redstone", "Stick"], + "pattern": "0.0 020 010", "tools": "Crafting Table" }, { "output": "Pressure Plate (stone)", - "input": [[2, "Stone"]] + "input": [[2, "Stone"]], + "pattern": "... 01. ..." }, { "output": "Pressure Plate (wood)", - "input": [[2, "Oak Wood Planks"]] + "input": [[2, "Oak Wood Planks"]], + "pattern": "... 01. ..." }, { "output": "Pumpkin Pie", - "input": ["Egg", "Pumpkin", "Sugar"] + "input": ["Egg", "Pumpkin", "Sugar"], + "pattern": ".2. .0. .1." }, { "output": [[4, "Pumpkin Seeds"]], - "input": "Pumpkin" + "input": "Pumpkin", + "pattern": "... .0. ..." }, { "output": [[3, "Purple Carpet"]], - "input": [[2, "Purple Wool"]] + "input": [[2, "Purple Wool"]], + "pattern": "... 01. ..." }, { "output": [[2, "Purple Dye"]], - "input": ["Lapis Lazuli", "Rose Red"] + "input": ["Lapis Lazuli", "Rose Red"], + "pattern": "... .0. .1." }, { "output": "Purple Stained Clay", "input": [[8, "Hardened Clay"], "Purple Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Purple Stained Glass"]], "input": [[8, "Glass"], "Purple Dye"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Purple Stained Glass Pane"]], "input": [[6, "Purple Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Purple Wool", - "input": ["Purple Dye", "Wool"] + "input": ["Purple Dye", "Wool"], + "pattern": "... .1. .0." }, { "output": [[6, "Quartz Slab"]], "input": [[3, "Block of Quartz"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Quartz Stairs"]], "input": [[6, "Block of Quartz"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": [[16, "Rail"]], "input": [[6, "Iron Ingot"], "Stick"], + "pattern": "0.0 010 0.0", "tools": "Crafting Table" }, { "output": [[3, "Red Carpet"]], - "input": [[2, "Red Wool"]] + "input": [[2, "Red Wool"]], + "pattern": "... 01. ..." }, { "output": "Red Stained Clay", "input": [[8, "Hardened Clay"], "Rose Red"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Red Stained Glass"]], "input": [[8, "Glass"], "Rose Red"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Red Stained Glass Pane"]], "input": [[6, "Red Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Red Wool", - "input": ["Rose Red", "Wool"] + "input": ["Rose Red", "Wool"], + "pattern": "... .1. .0." }, { "output": "Redstone", "input": ["furnace fuel", "Redstone Ore"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": [[9, "Redstone"]], - "input": "Block of Redstone" + "input": "Block of Redstone", + "pattern": "... .0. ..." }, { "output": "Redstone Comparator", "input": [[3, "Redstone Torch"], [3, "Stone"], "Nether Quartz"], + "pattern": ".0. 010 111", "tools": "Crafting Table" }, { "output": "Redstone Lamp", "input": [[4, "Redstone"], "Glowstone"], + "pattern": "00. 00. ...", "tools": "Crafting Table" }, { "output": "Redstone Repeater", "input": [[3, "Stone"], [2, "Redstone Torch"], "Redstone"], + "pattern": "... 121 111", "tools": "Crafting Table" }, { "output": "Redstone Torch", - "input": ["Redstone", "Stick"] + "input": ["Redstone", "Stick"], + "pattern": "... .0. .1." }, { "output": [[2, "Rose Red"]], - "input": "Rose Bush" + "input": "Rose Bush", + "pattern": "... .0. ..." }, { "output": "Rose Red", - "input": "Poppy" + "input": "Poppy", + "pattern": "... .0. ..." }, { "output": "Rose Red", - "input": "Red Tulip" + "input": "Red Tulip", + "pattern": "... .0. ..." }, { "output": [[2, "Rose Red"]], - "input": "Rose" + "input": "Rose", + "pattern": "... .0. ..." }, { "output": "Rose Red", - "input": "Poppy" + "input": "Poppy", + "pattern": "... .0. ..." }, { "output": "Sandstone", - "input": [[4, "Sand"]] + "input": [[4, "Sand"]], + "pattern": "00. 00. ..." }, { "output": [[6, "Sandstone Slab"]], "input": [[3, "Sandstone"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Sandstone Stairs"]], "input": [[6, "Sandstone"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Shears", - "input": [[2, "Iron Ingot"]] + "input": [[2, "Iron Ingot"]], + "pattern": "... .0. ..0" }, { "output": "Sign", "input": [[6, "Oak Wood Planks"], "Stick"], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": [[4, "Smooth Sandstone"]], - "input": [[4, "Sandstone"]] + "input": [[4, "Sandstone"]], + "pattern": "00. 00. ..." }, { "output": "Snow (block)", - "input": [[4, "Snowball"]] + "input": [[4, "Snowball"]], + "pattern": "00. 00. ..." }, { "output": [[6, "Snow (carpet)"]], "input": [[3, "Snow (block)"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[3, "Splash Potion of Fire Resistance (2:15)"]], "input": [[3, "Potion of Fire Resistance (3:00)"], "Magma Cream"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Fire Resistance (6:00)"]], "input": [[3, "Potion of Fire Resistance (8:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Harming"]], "input": [[3, "Potion of Harming"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Harming II"]], "input": [[3, "Potion of Harming II"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Healing"]], "input": [[3, "Potion of Healing"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Healing II"]], "input": [[3, "Potion of Healing II"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Invisibility (2:15)"]], "input": [[3, "Potion of Invisibility (3:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Invisibility (6:00)"]], "input": [[3, "Potion of Invisibility (8:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Night Vision (2:15)"]], "input": [[3, "Potion of Night Vision (3:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Night Vision (6:00)"]], "input": [[3, "Potion of Night Vision (8:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Poison (0:33)"]], "input": [[3, "Potion of Poison (0:45)"], "Spider Eye"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Poison (1:30)"]], "input": [[3, "Potion of Poison (2:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Poison II (0:16)"]], "input": [[3, "Potion of Poison II (0:22)"], "Glowstone"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Regeneration (0:33)"]], "input": [[3, "Potion of Regeneration (0:45)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Regeneration (1:30)"]], "input": [[3, "Potion of Regeneration (2:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Regeneration II (0:16)"]], "input": [[3, "Potion of Regeneration II (0:22)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Slowness (1:07)"]], "input": [[3, "Potion of Slowness (1:30)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Slowness (3:00)"]], "input": [[3, "Potion of Slowness (4:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Strength (2:15)"]], "input": [[3, "Potion of Strength (3:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Strength (6:00)"]], "input": [[3, "Potion of Strength (8:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Strength II (1:07)"]], "input": [[3, "Potion of Strength II (1:30)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Swiftness (2:15)"]], "input": [[3, "Potion of Swiftness (3:00)"], "Sugar"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Swiftness (6:00)"]], "input": [[3, "Potion of Swiftness (8:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Swiftness II (1:07)"]], "input": [[3, "Potion of Swiftness II (1:30)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Water Breathing (2:15)"]], "input": [[3, "Potion of Water Breathing (3:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Water Breathing (6:00)"]], "input": [[3, "Potion of Water Breathing (8:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Weakness (1:07)"]], "input": [[3, "Potion of Weakness (1:30)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[3, "Splash Potion of Weakness (3:00)"]], "input": [[3, "Potion of Weakness (4:00)"], "Gunpowder"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[4, "Spruce Planks"]], - "input": "Spruce Log" + "input": "Spruce Log", + "pattern": "... .0. ..." }, { "output": [[6, "Spruce Wood Slab"]], "input": [[3, "Spruce Wood Planks"]], + "pattern": ".2. .0. .1.", "tools": "Crafting Table" }, { "output": [[4, "Spruce Wood Stairs"]], "input": [[6, "Spruce Wood Planks"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Steak", "input": ["furnace fuel", "Raw Beef"], + "pattern": ".1. ... .0.", "tools": "Furnace" }, { "output": [[4, "Stick"]], - "input": [[2, "Oak Wood Planks"]] + "input": [[2, "Oak Wood Planks"]], + "pattern": "... .0. .0." }, { "output": "Sticky Piston", - "input": ["Piston", "Slimeball"] + "input": ["Piston", "Slimeball"], + "pattern": "... .1. .0." }, { "output": "Stone", "input": ["Cobblestone", "furnace fuel"], + "pattern": ".0. ... .1.", "tools": "Furnace" }, { "output": "Stone Axe", "input": [[3, "Cobblestone"], [2, "Stick"]], + "pattern": "00. 01. .1.", "tools": "Crafting Table" }, { "output": [[4, "Stone Brick Stairs"]], - "input": [[6, "Stone Bricks"]] + "input": [[6, "Stone Bricks"]], + "pattern": "0.00.000" }, { "output": [[4, "Stone Bricks"]], - "input": [[4, "Stone"]] + "input": [[4, "Stone"]], + "pattern": "00. 00. ..." }, { "output": [[6, "Stone Bricks Slab"]], "input": [[3, "Stone Bricks"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": "Stone Hoe", "input": [[2, "Cobblestone"], [2, "Stick"]], + "pattern": "00. .1. .1.", "tools": "Crafting Table" }, { "output": "Stone Pickaxe", "input": [[3, "Cobblestone"], [2, "Stick"]], + "pattern": "000 .1. .1.", "tools": "Crafting Table" }, { "output": "Stone Shovel", "input": [[2, "Stick"], "Cobblestone"], + "pattern": ".1. .0. .0.", "tools": "Crafting Table" }, { "output": [[6, "Stone Slab"]], "input": [[3, "Stone"]], + "pattern": "... 000 ...", "tools": "Crafting Table" }, { "output": [[4, "Stone Stairs"]], "input": [[6, "Cobblestone"]], + "pattern": "0.. 00. 000", "tools": "Crafting Table" }, { "output": "Stone Sword", "input": [[2, "Cobblestone"], "Stick"], + "pattern": ".0. .0. .1.", "tools": "Crafting Table" }, { "output": "Sugar", - "input": "Sugar Cane" + "input": "Sugar Cane", + "pattern": "... .0. ..." }, { "output": "TNT", "input": [[5, "Gunpowder"], [4, "Sand"]], + "pattern": "010 101 010", "tools": "Crafting Table" }, { "output": [[3, "Thick Potion"]], "input": [[3, "Water Bottle"], "Glowstone Dust"], + "pattern": ".1. ... 000", "tools": "Brewing Stand" }, { "output": [[4, "Torch"]], - "input": ["Charcoal", "Stick"] + "input": ["Charcoal", "Stick"], + "pattern": "... .0. .1." }, { "output": [[4, "Torch"]], - "input": ["Coal", "Stick"] + "input": ["Coal", "Stick"], + "pattern": "... .0. .1." }, { "output": [[2, "Trapdoor"]], "input": [[6, "Oak Wood Planks"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Trapped Chest", - "input": ["Chest", "Tripwire Hook"] + "input": ["Chest", "Tripwire Hook"], + "pattern": "... .1. .0." }, { "output": [[2, "Tripwire Hook"]], "input": ["Iron Ingot", "Oak Wood Planks", "Stick"], + "pattern": ".0. .2. .1.", "tools": "Crafting Table" }, { "output": "Water Bottle", "input": "Glass Bottle", + "pattern": "... .0. ...", "tools": "Water Source Block" }, { "output": "Water Bucket", - "input": ["Bucket", "Water Source Block"] + "input": ["Bucket", "Water Source Block"], + "pattern": "... .1. .0." }, { "output": "Weighted Pressure Plate (Heavy)", - "input": [[2, "Iron Ingot"]] + "input": [[2, "Iron Ingot"]], + "pattern": "... 00. ..." }, { "output": "Weighted Pressure Plate (Light)", - "input": [[2, "Gold Ingot"]] + "input": [[2, "Gold Ingot"]], + "pattern": "...00..." }, { "output": [[9, "Wheat"]], - "input": "Hay Bale" + "input": "Hay Bale", + "pattern": "... .0. ..." }, { "output": "White Stained Clay", "input": [[8, "Hardened Clay"], "Bone Meal"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "White Stained Glass"]], "input": [[8, "Glass"], "Bone Meal"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "White Stained Glass Pane"]], "input": [[6, "White Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Wooden Axe", "input": [[3, "Oak Wood Planks"], [2, "Stick"]], + "pattern": "00. 01. .1.", "tools": "Crafting Table" }, { "output": "Wooden Button", - "input": "Oak Wood Planks" - }, { - "output": "Wooden Door", - "input": [[6, "Oak Wood Planks"]], - "tools": "Crafting Table" + "input": "Oak Wood Planks", + "pattern": "... .0. ..." }, { "output": "Wooden Hoe", "input": [[2, "Oak Wood Planks"], [2, "Stick"]], + "pattern": "00. .1. .1.", "tools": "Crafting Table" }, { "output": "Wooden Pickaxe", "input": [[3, "Oak Wood Planks"], [2, "Stick"]], + "pattern": "000 .1. .1.", "tools": "Crafting Table" }, { "output": "Wooden Shovel", "input": [[2, "Stick"], "Oak Wood Planks"], + "pattern": ".1. .0. .0.", "tools": "Crafting Table" }, { "output": "Wooden Sword", "input": [[2, "Oak Wood Planks"], "Stick"], + "pattern": ".0. .0. .1.", "tools": "Crafting Table" }, { "output": "Wool", - "input": [[4, "String"]] + "input": [[4, "String"]], + "pattern": "00. 00. 000" }, { "output": [[3, "Yellow Carpet"]], - "input": [[2, "Yellow Wool"]] + "input": [[2, "Yellow Wool"]], + "pattern": "... 00. ..." }, { "output": "Yellow Stained Clay", "input": [[8, "Hardened Clay"], "Dandelion Yellow"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[8, "Yellow Stained Glass"]], "input": [[8, "Glass"], "Dandelion Yellow"], + "pattern": "000 010 000", "tools": "Crafting Table" }, { "output": [[16, "Yellow Stained Glass Pane"]], "input": [[6, "Yellow Stained Glass"]], + "pattern": "... 000 000", "tools": "Crafting Table" }, { "output": "Yellow Wool", - "input": ["Dandelion Yellow", "Wool"] + "input": ["Dandelion Yellow", "Wool"], + "pattern": "... .0. .1." } ] } \ No newline at end of file diff --git a/src/scripts/controllers/image_loader.coffee b/src/scripts/controllers/image_loader.coffee index de2f3fc7c..d16dd5d86 100644 --- a/src/scripts/controllers/image_loader.coffee +++ b/src/scripts/controllers/image_loader.coffee @@ -14,7 +14,7 @@ module.exports = class ImageLoader constructor: (options={})-> options.defaultUrl ?= '' options.onLoading ?= -> @hide() - options.onLoad ?= -> @fadeIn Duration.fast + options.onLoad ?= -> @show() @defaultUrl = options.defaultUrl @onLoading = options.onLoading diff --git a/src/scripts/models/mod_version_parser.coffee b/src/scripts/models/mod_version_parser.coffee index 697f07430..d25fa8842 100644 --- a/src/scripts/models/mod_version_parser.coffee +++ b/src/scripts/models/mod_version_parser.coffee @@ -113,11 +113,14 @@ module.exports.V1 = class V1 if not data.input? then throw new Error "#{@_errorLocation} is missing input" data.tools ?= [] - output = @_parseStackList data.output, field:'output', canBeEmpty:false - input = @_parseStackList data.input, field:'input', canBeEmpty:true - tools = @_parseStackList data.tools, field:'tools', canBeEmpty:true + attributes = + item: item + output: @_parseStackList data.output, field:'output', canBeEmpty:false + input: @_parseStackList data.input, field:'input', canBeEmpty:true + tools: @_parseStackList data.tools, field:'tools', canBeEmpty:true + attributes.pattern = data.pattern if data.pattern? - recipe = new Recipe item:item, input:input, output:output, tools:tools + recipe = new Recipe attributes item.addRecipe recipe return recipe @@ -201,6 +204,12 @@ module.exports.V1 = class V1 result.push ' "input": ' @_unparseStackList recipe.input, result + if recipe.pattern is recipe._computeShapelessPattern(recipe.input) + result.push ',\n' + result.push ' "pattern": "' + result.push recipe.pattern + result.push '"' + if recipe.tools.length > 0 result.push ',\n' result.push ' "tools": ' diff --git a/src/scripts/models/recipe.coffee b/src/scripts/models/recipe.coffee index 7fde69733..11f79c993 100644 --- a/src/scripts/models/recipe.coffee +++ b/src/scripts/models/recipe.coffee @@ -16,7 +16,7 @@ module.exports = class Recipe extends BaseModel if not attributes.input? then throw new Error 'attributes.input is required' if not attributes.output? then throw new Error 'attributes.output is required' - attributes.pattern ?= @_computeShapelessPattern attributes.input + attributes.pattern = @_parsePattern attributes.pattern, attributes.input attributes.tools ?= [] super attributes, options @@ -25,7 +25,8 @@ module.exports = class Recipe extends BaseModel # Public Methods ############################################################################### getItemSlugAt: (index)-> - patternDigit = @pattern[index] + trueIndex = 0:0, 1:1, 2:2, 3:4, 4:5, 5:6, 6:8, 7:9, 8:10 + patternDigit = @pattern[trueIndex[index]] return null unless patternDigit? return null unless patternDigit.match /[0-9]/ @@ -84,10 +85,24 @@ module.exports = class Recipe extends BaseModel # Private Methods ############################################################################## + _parsePattern: (pattern, input)-> + pattern ?= '' + pattern = pattern.replace /\ /g, '' + + if pattern.length > 0 + pattern = pattern.replace /[^0-9]/g, '.' + else + pattern = @_computeShapelessPattern input + + pattern = pattern.replace /(...)(...)(...)/, '$1 $2 $3' + return pattern + _computeShapelessPattern: (input)-> - result = [] - for i in [0...input.length] - stack = input[i] - for j in [0...stack.quantity] - result.push "#{i}" - return result.join '' + result = '728506314' + + total = _.reduce input, ((total, stack)-> total + stack.quantity), 0 + + for i in [total...9] + result = result.replace "#{i}", '.' + + return result diff --git a/src/scripts/underscore_mixins.coffee b/src/scripts/underscore_mixins.coffee index 1d19f70ed..7974e66e1 100644 --- a/src/scripts/underscore_mixins.coffee +++ b/src/scripts/underscore_mixins.coffee @@ -13,4 +13,6 @@ _.mixin result = text.toLowerCase() result = result.replace /[^a-zA-Z0-9_]/g, '_' result = result.replace /__+/, '_' + result = result.replace /^_/, '' + result = result.replace /_$/, '' return result diff --git a/src/templates/crafting_table.jade b/src/templates/crafting_table.jade index 5da6a719a..acf877173 100644 --- a/src/templates/crafting_table.jade +++ b/src/templates/crafting_table.jade @@ -15,4 +15,6 @@ .input table.view__crafting_grid .tool: p + .output + .next