diff --git a/index.toml b/index.toml index cea77e2..389cdfb 100644 --- a/index.toml +++ b/index.toml @@ -217,5 +217,5 @@ metafile = true [[files]] file = "world/datapacks/waystones-recipes.pw.toml" -hash = "d24f9aebc44f21848c73e84d41eab17d4d19f89c31c4e5dff340757c2b6f4271" +hash = "691938b34c33a2a8f8632617e59ec7ca96a547ed3d1ff2913e988c29897972c0" metafile = true diff --git a/pack.toml b/pack.toml index a65500e..931597c 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "e057c8fc79586ddd3815ab0adb58688e3d6a4998ca81ccbda5f173a5f18cd269" +hash = "46f2e883754b2ae8ddc44b347f4c02a59311600db0eb19e5b292adade9c30337" [versions] fabric = "0.16.10" diff --git a/waystones-recipes.zip b/waystones-recipes.zip index a180918..c389136 100644 Binary files a/waystones-recipes.zip and b/waystones-recipes.zip differ diff --git a/waystones-recipes/data/crafting/recipes/black_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/black_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/black_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/black_portstone.json index 3b31e8f..fe16a4b 100644 --- a/waystones-recipes/data/crafting/recipes/black_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/black_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:black_portstone" + "item": "waystones:black_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/black_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/black_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/black_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/black_sharestone.json index fa8dab2..6039333 100644 --- a/waystones-recipes/data/crafting/recipes/black_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/black_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/black", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:black_sharestone" + "item": "waystones:black_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/blackstone_waystone.json b/waystones-recipes/data/waystones-recipes/recipes/blackstone_waystone.json similarity index 74% rename from waystones-recipes/data/crafting/recipes/blackstone_waystone.json rename to waystones-recipes/data/waystones-recipes/recipes/blackstone_waystone.json index fc7d2e0..b3c5d19 100644 --- a/waystones-recipes/data/crafting/recipes/blackstone_waystone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/blackstone_waystone.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:blackstone", "W": "minecraft:nether_star" }, @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:blackstone_waystone" + "item": "waystones:blackstone_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/blank_scroll.json b/waystones-recipes/data/waystones-recipes/recipes/blank_scroll.json similarity index 86% rename from waystones-recipes/data/crafting/recipes/blank_scroll.json rename to waystones-recipes/data/waystones-recipes/recipes/blank_scroll.json index bed5744..d085766 100644 --- a/waystones-recipes/data/crafting/recipes/blank_scroll.json +++ b/waystones-recipes/data/waystones-recipes/recipes/blank_scroll.json @@ -12,6 +12,6 @@ ], "result": { "count": 3, - "id": "waystones:blank_scroll" + "item": "waystones:blank_scroll" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/blue_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/blue_portstone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/blue_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/blue_portstone.json index 544021e..faa06e5 100644 --- a/waystones-recipes/data/crafting/recipes/blue_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/blue_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:blue_portstone" + "item": "waystones:blue_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/blue_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/blue_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/blue_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/blue_sharestone.json index 59913bd..6649679 100644 --- a/waystones-recipes/data/crafting/recipes/blue_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/blue_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/blue", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:blue_sharestone" + "item": "waystones:blue_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/brown_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/brown_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/brown_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/brown_portstone.json index a339764..f9fa479 100644 --- a/waystones-recipes/data/crafting/recipes/brown_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/brown_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:brown_portstone" + "item": "waystones:brown_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/brown_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/brown_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/brown_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/brown_sharestone.json index e5335c9..c0a434e 100644 --- a/waystones-recipes/data/crafting/recipes/brown_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/brown_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/brown", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:brown_sharestone" + "item": "waystones:brown_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/cyan_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/cyan_portstone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/cyan_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/cyan_portstone.json index 4fd6f37..daec159 100644 --- a/waystones-recipes/data/crafting/recipes/cyan_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/cyan_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:cyan_portstone" + "item": "waystones:cyan_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/cyan_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/cyan_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/cyan_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/cyan_sharestone.json index c84accd..3170799 100644 --- a/waystones-recipes/data/crafting/recipes/cyan_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/cyan_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/cyan", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:cyan_sharestone" + "item": "waystones:cyan_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/deepslate_shard.json b/waystones-recipes/data/waystones-recipes/recipes/deepslate_shard.json similarity index 80% rename from waystones-recipes/data/crafting/recipes/deepslate_shard.json rename to waystones-recipes/data/waystones-recipes/recipes/deepslate_shard.json index 6fc8b3c..1b3e395 100644 --- a/waystones-recipes/data/crafting/recipes/deepslate_shard.json +++ b/waystones-recipes/data/waystones-recipes/recipes/deepslate_shard.json @@ -7,6 +7,6 @@ ], "result": { "count": 1, - "id": "waystones:deepslate_shard" + "item": "waystones:deepslate_shard" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/deepslate_waystone.json b/waystones-recipes/data/waystones-recipes/recipes/deepslate_waystone.json similarity index 74% rename from waystones-recipes/data/crafting/recipes/deepslate_waystone.json rename to waystones-recipes/data/waystones-recipes/recipes/deepslate_waystone.json index d95a882..1e4824c 100644 --- a/waystones-recipes/data/crafting/recipes/deepslate_waystone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/deepslate_waystone.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:deepslate", "W": "minecraft:nether_star" }, @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:deepslate_waystone" + "item": "waystones:deepslate_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/dormant_shard.json b/waystones-recipes/data/waystones-recipes/recipes/dormant_shard.json similarity index 83% rename from waystones-recipes/data/crafting/recipes/dormant_shard.json rename to waystones-recipes/data/waystones-recipes/recipes/dormant_shard.json index 9bd1c3c..6246db1 100644 --- a/waystones-recipes/data/crafting/recipes/dormant_shard.json +++ b/waystones-recipes/data/waystones-recipes/recipes/dormant_shard.json @@ -8,6 +8,6 @@ ], "result": { "count": 1, - "id": "waystones:dormant_shard" + "item": "waystones:dormant_shard" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/end_stone_waystone.json b/waystones-recipes/data/waystones-recipes/recipes/end_stone_waystone.json similarity index 75% rename from waystones-recipes/data/crafting/recipes/end_stone_waystone.json rename to waystones-recipes/data/waystones-recipes/recipes/end_stone_waystone.json index d19b709..e1993e3 100644 --- a/waystones-recipes/data/crafting/recipes/end_stone_waystone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/end_stone_waystone.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:end_stone_bricks", "W": "minecraft:nether_star" }, @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:end_stone_waystone" + "item": "waystones:end_stone_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/gray_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/gray_portstone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/gray_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/gray_portstone.json index 71b463f..0e2ff83 100644 --- a/waystones-recipes/data/crafting/recipes/gray_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/gray_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:gray_portstone" + "item": "waystones:gray_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/gray_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/gray_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/gray_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/gray_sharestone.json index 6069283..8246601 100644 --- a/waystones-recipes/data/crafting/recipes/gray_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/gray_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/gray", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:gray_sharestone" + "item": "waystones:gray_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/green_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/green_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/green_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/green_portstone.json index 85be8f3..cd36d9b 100644 --- a/waystones-recipes/data/crafting/recipes/green_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/green_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:green_portstone" + "item": "waystones:green_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/green_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/green_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/green_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/green_sharestone.json index 862bae6..55bfe5a 100644 --- a/waystones-recipes/data/crafting/recipes/green_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/green_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/green", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:green_sharestone" + "item": "waystones:green_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/light_blue_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/light_blue_portstone.json similarity index 86% rename from waystones-recipes/data/crafting/recipes/light_blue_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/light_blue_portstone.json index 6d5f5bd..6405894 100644 --- a/waystones-recipes/data/crafting/recipes/light_blue_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/light_blue_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:light_blue_portstone" + "item": "waystones:light_blue_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/light_blue_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/light_blue_sharestone.json similarity index 76% rename from waystones-recipes/data/crafting/recipes/light_blue_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/light_blue_sharestone.json index dfbc086..742ce5b 100644 --- a/waystones-recipes/data/crafting/recipes/light_blue_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/light_blue_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/light_blue", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:light_blue_sharestone" + "item": "waystones:light_blue_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/light_gray_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/light_gray_portstone.json similarity index 86% rename from waystones-recipes/data/crafting/recipes/light_gray_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/light_gray_portstone.json index 149d207..ba3efe2 100644 --- a/waystones-recipes/data/crafting/recipes/light_gray_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/light_gray_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:light_gray_portstone" + "item": "waystones:light_gray_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/light_gray_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/light_gray_sharestone.json similarity index 76% rename from waystones-recipes/data/crafting/recipes/light_gray_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/light_gray_sharestone.json index 902b7d1..b6c34b9 100644 --- a/waystones-recipes/data/crafting/recipes/light_gray_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/light_gray_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/light_gray", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:light_gray_sharestone" + "item": "waystones:light_gray_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/lime_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/lime_portstone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/lime_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/lime_portstone.json index 14614c3..a1c63f0 100644 --- a/waystones-recipes/data/crafting/recipes/lime_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/lime_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:lime_portstone" + "item": "waystones:lime_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/lime_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/lime_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/lime_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/lime_sharestone.json index 35fd648..a2f067f 100644 --- a/waystones-recipes/data/crafting/recipes/lime_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/lime_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/lime", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:lime_sharestone" + "item": "waystones:lime_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/magenta_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/magenta_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/magenta_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/magenta_portstone.json index 0743977..7a13912 100644 --- a/waystones-recipes/data/crafting/recipes/magenta_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/magenta_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:magenta_portstone" + "item": "waystones:magenta_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/magenta_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/magenta_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/magenta_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/magenta_sharestone.json index b3cc48b..6ce3111 100644 --- a/waystones-recipes/data/crafting/recipes/magenta_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/magenta_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/magenta", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:magenta_sharestone" + "item": "waystones:magenta_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/mossy_waystone.json b/waystones-recipes/data/waystones-recipes/recipes/mossy_waystone.json similarity index 76% rename from waystones-recipes/data/crafting/recipes/mossy_waystone.json rename to waystones-recipes/data/waystones-recipes/recipes/mossy_waystone.json index ec22ce8..d8c7d6c 100644 --- a/waystones-recipes/data/crafting/recipes/mossy_waystone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/mossy_waystone.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:mossy_stone_bricks", "W": "minecraft:nether_star" }, @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:mossy_waystone" + "item": "waystones:mossy_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/mossy_waystone_from_moss_blocks.json b/waystones-recipes/data/waystones-recipes/recipes/mossy_waystone_from_moss_blocks.json similarity index 85% rename from waystones-recipes/data/crafting/recipes/mossy_waystone_from_moss_blocks.json rename to waystones-recipes/data/waystones-recipes/recipes/mossy_waystone_from_moss_blocks.json index d883c75..3cc741b 100644 --- a/waystones-recipes/data/crafting/recipes/mossy_waystone_from_moss_blocks.json +++ b/waystones-recipes/data/waystones-recipes/recipes/mossy_waystone_from_moss_blocks.json @@ -9,6 +9,6 @@ ], "result": { "count": 1, - "id": "waystones:mossy_waystone" + "item": "waystones:mossy_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/mossy_waystone_from_vines.json b/waystones-recipes/data/waystones-recipes/recipes/mossy_waystone_from_vines.json similarity index 84% rename from waystones-recipes/data/crafting/recipes/mossy_waystone_from_vines.json rename to waystones-recipes/data/waystones-recipes/recipes/mossy_waystone_from_vines.json index dc4023c..ac33483 100644 --- a/waystones-recipes/data/crafting/recipes/mossy_waystone_from_vines.json +++ b/waystones-recipes/data/waystones-recipes/recipes/mossy_waystone_from_vines.json @@ -9,6 +9,6 @@ ], "result": { "count": 1, - "id": "waystones:mossy_waystone" + "item": "waystones:mossy_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/orange_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/orange_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/orange_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/orange_portstone.json index 928185e..4f9b6f3 100644 --- a/waystones-recipes/data/crafting/recipes/orange_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/orange_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:orange_portstone" + "item": "waystones:orange_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/orange_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/orange_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/orange_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/orange_sharestone.json index 6b423a5..a50455f 100644 --- a/waystones-recipes/data/crafting/recipes/orange_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/orange_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/orange", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:orange_sharestone" + "item": "waystones:orange_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/pink_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/pink_portstone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/pink_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/pink_portstone.json index e840ad8..82ab364 100644 --- a/waystones-recipes/data/crafting/recipes/pink_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/pink_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:pink_portstone" + "item": "waystones:pink_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/pink_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/pink_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/pink_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/pink_sharestone.json index ee0a970..f611ce3 100644 --- a/waystones-recipes/data/crafting/recipes/pink_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/pink_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/pink", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:pink_sharestone" + "item": "waystones:pink_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/purple_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/purple_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/purple_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/purple_portstone.json index 2550055..a22ff2e 100644 --- a/waystones-recipes/data/crafting/recipes/purple_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/purple_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:purple_portstone" + "item": "waystones:purple_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/purple_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/purple_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/purple_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/purple_sharestone.json index 2442871..76a8ff1 100644 --- a/waystones-recipes/data/crafting/recipes/purple_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/purple_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/purple", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:purple_sharestone" + "item": "waystones:purple_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/red_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/red_portstone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/red_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/red_portstone.json index e95fa65..e75214c 100644 --- a/waystones-recipes/data/crafting/recipes/red_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/red_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:red_portstone" + "item": "waystones:red_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/red_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/red_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/red_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/red_sharestone.json index 8839cd7..60a8f2c 100644 --- a/waystones-recipes/data/crafting/recipes/red_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/red_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/red", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:red_sharestone" + "item": "waystones:red_sharestone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/return_scroll.json b/waystones-recipes/data/waystones-recipes/recipes/return_scroll.json similarity index 85% rename from waystones-recipes/data/crafting/recipes/return_scroll.json rename to waystones-recipes/data/waystones-recipes/recipes/return_scroll.json index b24c676..83869f7 100644 --- a/waystones-recipes/data/crafting/recipes/return_scroll.json +++ b/waystones-recipes/data/waystones-recipes/recipes/return_scroll.json @@ -12,6 +12,6 @@ ], "result": { "count": 3, - "id": "waystones:return_scroll" + "item": "waystones:return_scroll" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/sandy_waystone.json b/waystones-recipes/data/waystones-recipes/recipes/sandy_waystone.json similarity index 76% rename from waystones-recipes/data/crafting/recipes/sandy_waystone.json rename to waystones-recipes/data/waystones-recipes/recipes/sandy_waystone.json index af47c59..c8d99c9 100644 --- a/waystones-recipes/data/crafting/recipes/sandy_waystone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/sandy_waystone.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:chiseled_sandstone", "W": "minecraft:nether_star" }, @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:sandy_waystone" + "item": "waystones:sandy_waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/warp_dust.json b/waystones-recipes/data/waystones-recipes/recipes/warp_dust.json similarity index 84% rename from waystones-recipes/data/crafting/recipes/warp_dust.json rename to waystones-recipes/data/waystones-recipes/recipes/warp_dust.json index 27f7985..1d1ffd3 100644 --- a/waystones-recipes/data/crafting/recipes/warp_dust.json +++ b/waystones-recipes/data/waystones-recipes/recipes/warp_dust.json @@ -7,6 +7,6 @@ ], "result": { "count": 4, - "id": "waystones:warp_dust" + "item": "waystones:warp_dust" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/warp_plate.json b/waystones-recipes/data/waystones-recipes/recipes/warp_plate.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/warp_plate.json rename to waystones-recipes/data/waystones-recipes/recipes/warp_plate.json index bbf9ae1..c14403f 100644 --- a/waystones-recipes/data/crafting/recipes/warp_plate.json +++ b/waystones-recipes/data/waystones-recipes/recipes/warp_plate.json @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:warp_plate" + "item": "waystones:warp_plate" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/warp_scroll.json b/waystones-recipes/data/waystones-recipes/recipes/warp_scroll.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/warp_scroll.json rename to waystones-recipes/data/waystones-recipes/recipes/warp_scroll.json index 2db394b..56180d8 100644 --- a/waystones-recipes/data/crafting/recipes/warp_scroll.json +++ b/waystones-recipes/data/waystones-recipes/recipes/warp_scroll.json @@ -14,6 +14,6 @@ ], "result": { "count": 3, - "id": "waystones:warp_scroll" + "item": "waystones:warp_scroll" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/warp_stone.json b/waystones-recipes/data/waystones-recipes/recipes/warp_stone.json similarity index 88% rename from waystones-recipes/data/crafting/recipes/warp_stone.json rename to waystones-recipes/data/waystones-recipes/recipes/warp_stone.json index a21ae74..14ce913 100644 --- a/waystones-recipes/data/crafting/recipes/warp_stone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/warp_stone.json @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "minecraft:nether_star" + "item": "minecraft:nether_star" } } diff --git a/waystones-recipes/data/crafting/recipes/waystone.json b/waystones-recipes/data/waystones-recipes/recipes/waystone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/waystone.json rename to waystones-recipes/data/waystones-recipes/recipes/waystone.json index 24dc357..6d62531 100644 --- a/waystones-recipes/data/crafting/recipes/waystone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/waystone.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -13,6 +13,6 @@ ], "result": { "count": 1, - "id": "waystones:waystone" + "item": "waystones:waystone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/white_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/white_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/white_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/white_portstone.json index 16d9934..11ebc5e 100644 --- a/waystones-recipes/data/crafting/recipes/white_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/white_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:white_portstone" + "item": "waystones:white_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/yellow_portstone.json b/waystones-recipes/data/waystones-recipes/recipes/yellow_portstone.json similarity index 87% rename from waystones-recipes/data/crafting/recipes/yellow_portstone.json rename to waystones-recipes/data/waystones-recipes/recipes/yellow_portstone.json index 024c195..c59130d 100644 --- a/waystones-recipes/data/crafting/recipes/yellow_portstone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/yellow_portstone.json @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:yellow_portstone" + "item": "waystones:yellow_portstone" } } \ No newline at end of file diff --git a/waystones-recipes/data/crafting/recipes/yellow_sharestone.json b/waystones-recipes/data/waystones-recipes/recipes/yellow_sharestone.json similarity index 77% rename from waystones-recipes/data/crafting/recipes/yellow_sharestone.json rename to waystones-recipes/data/waystones-recipes/recipes/yellow_sharestone.json index 9e3875d..a8b079a 100644 --- a/waystones-recipes/data/crafting/recipes/yellow_sharestone.json +++ b/waystones-recipes/data/waystones-recipes/recipes/yellow_sharestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "D": "#c:dyes/yellow", - "O": "minecraft:obsidian", + "O": "minecraft:obsitemian", "S": "minecraft:stone_bricks", "W": "minecraft:nether_star" }, @@ -14,6 +14,6 @@ ], "result": { "count": 1, - "id": "waystones:yellow_sharestone" + "item": "waystones:yellow_sharestone" } } \ No newline at end of file diff --git a/world/datapacks/waystones-recipes.pw.toml b/world/datapacks/waystones-recipes.pw.toml index 56cb5c4..9dd2d7b 100644 --- a/world/datapacks/waystones-recipes.pw.toml +++ b/world/datapacks/waystones-recipes.pw.toml @@ -6,4 +6,4 @@ side = "server" url = "https://git.ailur.dev/arzumify/ailuropack/raw/branch/main/waystones-recipes.zip" hash-format = "sha256" -hash = "89d0c08e18ccf01ee6dcbafa63b0145a7fc427ec41504585450fad7fd3cdb8e7" +hash = "d9d22fe457016b084a71ef65a6dacaf36e980155857da8775a7aaed7bab65a0a"