From a7ee0ad84775871a2467aa88b94f356be897e354 Mon Sep 17 00:00:00 2001 From: Rafael Soares Date: Fri, 27 Mar 2020 20:49:51 -0300 Subject: [PATCH 1/2] Make Magic Silk recipe use ore_dict for string Currently, the recipe requires string to be a Vanilla string, which might cause problems in packs with different methods for obtaining strings (eg: Mystical World's Silk Thread from silkworms). This PR makes it compatible with Ore Dictionary, so the recipe accepts any type of string. --- .../assets/ebwizardry/recipes/magic_silk.json | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/main/resources/assets/ebwizardry/recipes/magic_silk.json b/src/main/resources/assets/ebwizardry/recipes/magic_silk.json index 033a85e4..14b99e23 100644 --- a/src/main/resources/assets/ebwizardry/recipes/magic_silk.json +++ b/src/main/resources/assets/ebwizardry/recipes/magic_silk.json @@ -7,45 +7,46 @@ ], "key": { "x": { - "item": "minecraft:string" + "type": "forge:ore_dict", + "ore": "string" }, "y": [ { - "item": "ebwizardry:magic_crystal", - "data": 0 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 1 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 2 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 3 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 4 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 5 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 6 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 7 - } + "item": "ebwizardry:magic_crystal", + "data": 0 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 1 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 2 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 3 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 4 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 5 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 6 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 7 + } ] }, "result": { "item": "ebwizardry:magic_silk", "count": 2 } -} \ No newline at end of file +} From 7c2e786d0bd89cffcc7239fdf161dbc5ce5fbe5b Mon Sep 17 00:00:00 2001 From: Rafael Soares Date: Fri, 27 Mar 2020 20:53:25 -0300 Subject: [PATCH 2/2] Remove whitespace changes --- .../assets/ebwizardry/recipes/magic_silk.json | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/resources/assets/ebwizardry/recipes/magic_silk.json b/src/main/resources/assets/ebwizardry/recipes/magic_silk.json index 14b99e23..0e759257 100644 --- a/src/main/resources/assets/ebwizardry/recipes/magic_silk.json +++ b/src/main/resources/assets/ebwizardry/recipes/magic_silk.json @@ -12,37 +12,37 @@ }, "y": [ { - "item": "ebwizardry:magic_crystal", - "data": 0 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 1 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 2 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 3 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 4 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 5 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 6 - }, - { - "item": "ebwizardry:magic_crystal", - "data": 7 - } + "item": "ebwizardry:magic_crystal", + "data": 0 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 1 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 2 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 3 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 4 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 5 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 6 + }, + { + "item": "ebwizardry:magic_crystal", + "data": 7 + } ] }, "result": {