From bb2eab0bed1f198b9bbaca02f38833f255a49a5d Mon Sep 17 00:00:00 2001 From: SquidDev Date: Thu, 15 Mar 2018 17:34:58 +0000 Subject: [PATCH] Use the ore dictionary for upgrade recipes See #517 for motivation --- .../computercraft/recipes/advanced_computer_upgrade.json | 2 +- .../recipes/advanced_pocket_computer_upgrade.json | 2 +- .../assets/computercraft/recipes/advanced_turtle_upgrade.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/computercraft/recipes/advanced_computer_upgrade.json b/src/main/resources/assets/computercraft/recipes/advanced_computer_upgrade.json index 2ee91e82d..417aecd50 100644 --- a/src/main/resources/assets/computercraft/recipes/advanced_computer_upgrade.json +++ b/src/main/resources/assets/computercraft/recipes/advanced_computer_upgrade.json @@ -6,7 +6,7 @@ "# #" ], "key": { - "#": { "item": "minecraft:gold_ingot" }, + "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, "C": { "type": "computercraft:computer", "item": "computercraft:computer", "family": "Normal" } }, "family": "Advanced", diff --git a/src/main/resources/assets/computercraft/recipes/advanced_pocket_computer_upgrade.json b/src/main/resources/assets/computercraft/recipes/advanced_pocket_computer_upgrade.json index 4476c45e4..2528451b0 100644 --- a/src/main/resources/assets/computercraft/recipes/advanced_pocket_computer_upgrade.json +++ b/src/main/resources/assets/computercraft/recipes/advanced_pocket_computer_upgrade.json @@ -6,7 +6,7 @@ "# #" ], "key": { - "#": { "item": "minecraft:gold_ingot" }, + "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, "C": { "item": "computercraft:pocket_computer", "data": 0 } }, "family": "Advanced", diff --git a/src/main/resources/assets/computercraft/recipes/advanced_turtle_upgrade.json b/src/main/resources/assets/computercraft/recipes/advanced_turtle_upgrade.json index 6ef583aa3..15791665d 100644 --- a/src/main/resources/assets/computercraft/recipes/advanced_turtle_upgrade.json +++ b/src/main/resources/assets/computercraft/recipes/advanced_turtle_upgrade.json @@ -6,8 +6,8 @@ " B " ], "key": { - "#": { "item": "minecraft:gold_ingot" }, - "B": { "item": "minecraft:gold_block" }, + "#": { "type": "forge:ore_dict", "ore": "ingotGold" }, + "B": { "type": "forge:ore_dict", "ore": "blockGold" }, "C": [ { "type": "computercraft:computer", "item": "computercraft:turtle", "family": "Normal" }, { "item": "computercraft:turtle_expanded", "data": 0 }