From dd620cc16869b2eae415cf03d92dbc553710f970 Mon Sep 17 00:00:00 2001
From: Arzumify <jliwin98@danwin1210.de>
Date: Mon, 10 Mar 2025 00:47:23 +0000
Subject: [PATCH] Finally, please fix the datapack

---
 index.toml                                    |   2 +-
 pack.toml                                     |   2 +-
 waystones-recipes.zip                         | Bin 19085 -> 20025 bytes
 .../recipes/black_portstone.json              |   2 +-
 .../recipes/black_sharestone.json             |   4 ++--
 .../recipes/blackstone_waystone.json          |   4 ++--
 .../recipes/blank_scroll.json                 |   2 +-
 .../recipes/blue_portstone.json               |   2 +-
 .../recipes/blue_sharestone.json              |   4 ++--
 .../recipes/brown_portstone.json              |   2 +-
 .../recipes/brown_sharestone.json             |   4 ++--
 .../recipes/cyan_portstone.json               |   2 +-
 .../recipes/cyan_sharestone.json              |   4 ++--
 .../recipes/deepslate_shard.json              |   2 +-
 .../recipes/deepslate_waystone.json           |   4 ++--
 .../recipes/dormant_shard.json                |   2 +-
 .../recipes/end_stone_waystone.json           |   4 ++--
 .../recipes/gray_portstone.json               |   2 +-
 .../recipes/gray_sharestone.json              |   4 ++--
 .../recipes/green_portstone.json              |   2 +-
 .../recipes/green_sharestone.json             |   4 ++--
 .../recipes/light_blue_portstone.json         |   2 +-
 .../recipes/light_blue_sharestone.json        |   4 ++--
 .../recipes/light_gray_portstone.json         |   2 +-
 .../recipes/light_gray_sharestone.json        |   4 ++--
 .../recipes/lime_portstone.json               |   2 +-
 .../recipes/lime_sharestone.json              |   4 ++--
 .../recipes/magenta_portstone.json            |   2 +-
 .../recipes/magenta_sharestone.json           |   4 ++--
 .../recipes/mossy_waystone.json               |   4 ++--
 .../mossy_waystone_from_moss_blocks.json      |   2 +-
 .../recipes/mossy_waystone_from_vines.json    |   2 +-
 .../recipes/orange_portstone.json             |   2 +-
 .../recipes/orange_sharestone.json            |   4 ++--
 .../recipes/pink_portstone.json               |   2 +-
 .../recipes/pink_sharestone.json              |   4 ++--
 .../recipes/purple_portstone.json             |   2 +-
 .../recipes/purple_sharestone.json            |   4 ++--
 .../recipes/red_portstone.json                |   2 +-
 .../recipes/red_sharestone.json               |   4 ++--
 .../recipes/return_scroll.json                |   2 +-
 .../recipes/sandy_waystone.json               |   4 ++--
 .../recipes/warp_dust.json                    |   2 +-
 .../recipes/warp_plate.json                   |   2 +-
 .../recipes/warp_scroll.json                  |   2 +-
 .../recipes/warp_stone.json                   |   2 +-
 .../recipes/waystone.json                     |   4 ++--
 .../recipes/white_portstone.json              |   2 +-
 .../recipes/yellow_portstone.json             |   2 +-
 .../recipes/yellow_sharestone.json            |   4 ++--
 world/datapacks/waystones-recipes.pw.toml     |   2 +-
 51 files changed, 71 insertions(+), 71 deletions(-)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/black_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/black_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/blackstone_waystone.json (74%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/blank_scroll.json (86%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/blue_portstone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/blue_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/brown_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/brown_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/cyan_portstone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/cyan_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/deepslate_shard.json (80%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/deepslate_waystone.json (74%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/dormant_shard.json (83%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/end_stone_waystone.json (75%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/gray_portstone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/gray_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/green_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/green_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/light_blue_portstone.json (86%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/light_blue_sharestone.json (76%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/light_gray_portstone.json (86%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/light_gray_sharestone.json (76%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/lime_portstone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/lime_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/magenta_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/magenta_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/mossy_waystone.json (76%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/mossy_waystone_from_moss_blocks.json (85%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/mossy_waystone_from_vines.json (84%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/orange_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/orange_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/pink_portstone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/pink_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/purple_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/purple_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/red_portstone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/red_sharestone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/return_scroll.json (85%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/sandy_waystone.json (76%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/warp_dust.json (84%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/warp_plate.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/warp_scroll.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/warp_stone.json (88%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/waystone.json (77%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/white_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/yellow_portstone.json (87%)
 rename waystones-recipes/data/{crafting => waystones-recipes}/recipes/yellow_sharestone.json (77%)

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 a180918fc9ad3a51f288f219d00c073819569703..c38913629ae4127145de2fe7332c1fa01a0f2681 100644
GIT binary patch
literal 20025
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
T@gQVVpC73d=zr`kK)(AQnIFTV

literal 19085
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

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"