diff --git a/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 b/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 index c79da8ed..8c139505 100644 --- a/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 +++ b/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 @@ -1,25 +1,21 @@ -// 1.19.2 2023-05-22T13:16:04.251517675 Item Models: hexcasting +// 1.19.2 2023-05-23T13:13:41.108322225 Item Models: hexcasting 9af2754cb1e53eeaa85618cf92651b4878cf62b1 assets/hexcasting/models/block/quenched_allay_0.json de4ff723b4332d4e26bd01f74e0485e28c9a2178 assets/hexcasting/models/block/quenched_allay_1.json 4c29163e07f3a903017e38a9cc102f4b37db20b1 assets/hexcasting/models/block/quenched_allay_2.json 487d34cd8e70b3e468337228b74af5c1b4d14c53 assets/hexcasting/models/block/quenched_allay_3.json f2156b3a7041cf99891b528393db64c6b9ca1a4f assets/hexcasting/models/item/abacus.json -c0af5573a4acb5eeacf49ab309d32b6f90ea8a5d assets/hexcasting/models/item/acacia_staff.json 19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json 8c735feff09d46d00ed681311f46f61a50cfdc9b assets/hexcasting/models/item/amethyst_dust.json d1b0892de9d751e7bebc763e6407d5285363c851 assets/hexcasting/models/item/artifact.json 7eb3eb776e70eb616c12ada500b9d1d6a3249a6a assets/hexcasting/models/item/artifact_filled.json 82e3be7bbdad92d2b4c728be54d9d2f2809a0ac2 assets/hexcasting/models/item/battery.json -ac7a4b95db8bde9da23dd4fa76d8086a67e166f8 assets/hexcasting/models/item/birch_staff.json ec7c3a51882a432185fdbb6a449e66165b6a4c4c assets/hexcasting/models/item/charged_amethyst.json -d614c0fd8acb1c18b4211b090d438326d74507f8 assets/hexcasting/models/item/cherry_staff.json +3ed3e3d86dcbc29d2e6fb59b9c6a7e455e9a3332 assets/hexcasting/models/item/cherry_staff.json c64ed609ece68994ce23dd2809145040bce13579 assets/hexcasting/models/item/conjured.json c64ed609ece68994ce23dd2809145040bce13579 assets/hexcasting/models/item/conjured_block.json c8da4227db3c80e3e2e7f2fb2ae2649656429d68 assets/hexcasting/models/item/creative_unlocker.json -b3f3fae3237d9f65d631fe3a6608ed76d9e0034d assets/hexcasting/models/item/crimson_staff.json e47acd1d6ef29a3e1941afb1b212bd40b963cb72 assets/hexcasting/models/item/cypher.json 2db55347092ad6bc9e58bc968e88a3b6c5fd77c1 assets/hexcasting/models/item/cypher_filled.json -202de3e9a1bb7cd2ac2781937f4d03afe3947195 assets/hexcasting/models/item/dark_oak_staff.json c6523de66cbfae3a1e6361c635cc693a0a089bb3 assets/hexcasting/models/item/default_colorizer.json 113c51af571a92009f5f687a82e10bc5ce97b010 assets/hexcasting/models/item/dye_colorizer_black.json b5a04716775ba2e1b137abc513025b2f1065e5d1 assets/hexcasting/models/item/dye_colorizer_blue.json @@ -42,7 +38,6 @@ c9faada6299f388afc2d2798843d2b45159950d1 assets/hexcasting/models/item/edified_d 7f22e012a844cc2c5e30b0fcbdc2e7e4afac1c40 assets/hexcasting/models/item/edified_log.json 6b2c9d4aca0c869d7e18707c22b00c14e1d30f0c assets/hexcasting/models/item/edified_pressure_plate.json 31b4d60ff15a6d6de7aecb6feeba25a366bba2fd assets/hexcasting/models/item/edified_slab.json -a03d8c4cd52afb51668450f0b47ef278bb75ebec assets/hexcasting/models/item/edified_staff.json 2584421c2e9e1cdf22a703018b54cf449613d7d9 assets/hexcasting/models/item/edified_stairs.json ae58c5b7c304d33cbde60caf44a4c4ee4ec1a633 assets/hexcasting/models/item/edified_trapdoor.json 084183e4351973c8165f6f459c0f0dba2463d957 assets/hexcasting/models/item/edified_wood.json @@ -50,13 +45,9 @@ ae58c5b7c304d33cbde60caf44a4c4ee4ec1a633 assets/hexcasting/models/item/edified_t 947d1539d88f9d6fd0afcdf831f4327356d19baf assets/hexcasting/models/item/focus_filled.json cb2d973af25a2ec07e6094ecc106c896a06918dc assets/hexcasting/models/item/focus_sealed.json 6ec61fea7d8c49cc0c45b64857fd926451b4845f assets/hexcasting/models/item/jeweler_hammer.json -aab75291c6d8889394ab154cd8cfeed7d1cfe41f assets/hexcasting/models/item/jungle_staff.json abfc028c974a02780aed3d7a5859352503bbd920 assets/hexcasting/models/item/lens.json a34a6d777ae265c7e49c8bb23c15f04359236544 assets/hexcasting/models/item/lore_fragment.json -853408e94e104cd8a3ccbb1ec909f9e6bc9638df assets/hexcasting/models/item/mangrove_staff.json -7a73fc99460cdff11c717b165f2d5c69a7f96fb6 assets/hexcasting/models/item/mindsplice_staff.json -41d0396eae3b5511c513b33a186a8a76d3f89a3e assets/hexcasting/models/item/oak_staff.json -38d1dc73c49d185b86c098b13611bf3ec07b255c assets/hexcasting/models/item/old_staff.json +a3e134b79977545049da01671f3a1bd636d14789 assets/hexcasting/models/item/old_staff.json 82fa0a2bb17e40c0b3f826e97b2e95445ec24ab8 assets/hexcasting/models/item/patchouli_book.json d69d10e6cb967b98b3294cc86174182c671de671 assets/hexcasting/models/item/phial_large_0.json 9b7805bec9481956b0ccc6c65dd8e02d3b3cdf54 assets/hexcasting/models/item/phial_large_1.json @@ -95,7 +86,6 @@ a8859c93236b88f9ed46a4957f5723965ce04e03 assets/hexcasting/models/item/quenched_ aef7d4b759bcc8a1d5b886b8a0170657e447a8d8 assets/hexcasting/models/item/quenched_shard_1.json 4a08374ef00de51381df9659488cb305e7c8674f assets/hexcasting/models/item/quenched_shard_2.json 181aac0f66e5c3937f49da3f5d577f1c8045c635 assets/hexcasting/models/item/quenched_shard_3.json -628df1d43bb959bd7424253d2cf367947e147155 assets/hexcasting/models/item/quenched_staff.json 1ac1d158da25a8f8ec4b8771445d1ec9d42e9519 assets/hexcasting/models/item/scroll.json ae2a8b6eb8a4ef17926e20c6982bc01120ff32b7 assets/hexcasting/models/item/scroll_ancient_large.json 7478e4b91169a3ab9def5af8662db9696eb33a34 assets/hexcasting/models/item/scroll_ancient_medium.json @@ -111,22 +101,22 @@ e6452f95b60240e0067769d7f32a0b9fa7718a1b assets/hexcasting/models/item/slate_wri 986674763b45e0f9381f9f34a708082e5230652a assets/hexcasting/models/item/spellbook.json f962c13ab9e299885387cee35b16006651821e81 assets/hexcasting/models/item/spellbook_filled.json c29e6e7b2168eeeb13b1fc3e93ffc3e0c9bd11ce assets/hexcasting/models/item/spellbook_sealed.json -171cc4644ba9df07d79d08b06c482cf7c4c9e873 assets/hexcasting/models/item/spruce_staff.json -bc9eb7f95297e2bb149e494f0775756115e64a9a assets/hexcasting/models/item/staves/acacia_staff.json -2630ef5f184146ff8b065b35f99c93dee1d00b7a assets/hexcasting/models/item/staves/birch_staff.json -7c6048daa8b44274c59c0a68e4f09c28bf392360 assets/hexcasting/models/item/staves/crimson_staff.json -f60d0f4b2bf3444d2c64c31c657c14807550ad78 assets/hexcasting/models/item/staves/dark_oak_staff.json -f07ad95cfa2d343da533f79f57ff221a4cf6564f assets/hexcasting/models/item/staves/edified_staff.json -ca5212811eca37971aa5a8f123035a67875b56fa assets/hexcasting/models/item/staves/jungle_staff.json -146becaeb49e669b74fb7eebeeafb495e6c97445 assets/hexcasting/models/item/staves/mangrove_staff.json -4b3a52a61e717732ea59b9361050e7479394930d assets/hexcasting/models/item/staves/mindsplice_staff.json -9fabea1952b1796f4734376893bb85b7222afd73 assets/hexcasting/models/item/staves/oak_staff.json -65bbc32202a58cdae91165e059e53bcfb2c54e10 assets/hexcasting/models/item/staves/quenched_0.json -9d8d276d077fc9ee355d4af5b62d5f63087ed6e1 assets/hexcasting/models/item/staves/quenched_1.json -ff1f37ac81e58185d9ea63d1ef75558e30f2e193 assets/hexcasting/models/item/staves/quenched_2.json -5cb3a83a9e601d4955e0c5456c621c4ac3f3d76e assets/hexcasting/models/item/staves/quenched_3.json -7720f7df1bde35d90afc943b59a87bd245136284 assets/hexcasting/models/item/staves/spruce_staff.json -3663976f033f1c9d132150c0e9427d793b7c8570 assets/hexcasting/models/item/staves/warped_staff.json +f791313aa7bb01b418676ffaeeb09286ca9bddff assets/hexcasting/models/item/staff/acacia.json +19acf04c62128275b8fb468e89a30ab94d6e5a1a assets/hexcasting/models/item/staff/birch.json +244ba74a82a188df6fd258affcdd4b1a7320e617 assets/hexcasting/models/item/staff/crimson.json +ee609f36641d4689512b54aa343eafd1d53881e6 assets/hexcasting/models/item/staff/dark_oak.json +eb9d51207fddad95d375ccbe0f96df12893312d0 assets/hexcasting/models/item/staff/edified.json +99e1283ee4ba1baccd452e909bf61417b7f2f57a assets/hexcasting/models/item/staff/jungle.json +529b269c10e8da7af7974cf1eb539af30dbe9766 assets/hexcasting/models/item/staff/mangrove.json +ede4e45b2744ec8b457f8964708d80fe9f4711db assets/hexcasting/models/item/staff/mindsplice.json +3ae310c995e8211b212babc2b4ed1a4b6185a383 assets/hexcasting/models/item/staff/oak.json +6ced9d423830b4a095ecb1076f3d89fa831f24fd assets/hexcasting/models/item/staff/quenched.json +898635b56d406e3be71bf87e2e2a7953388c6d3e assets/hexcasting/models/item/staff/quenched_0.json +781f2aec9c3d1d74ef44706ad76782ea4c5c7064 assets/hexcasting/models/item/staff/quenched_1.json +2d3fe60a6bab47692fc9fb32c76ff7b0c44a731f assets/hexcasting/models/item/staff/quenched_2.json +91e45480e12c73a1d3c6f0970b813de3bc8a7df7 assets/hexcasting/models/item/staff/quenched_3.json +49d928184c2e6624b0b217615d54b1d08da133ff assets/hexcasting/models/item/staff/spruce.json +09100a64a4c1e14dc2078fc1060122b0a52ca497 assets/hexcasting/models/item/staff/warped.json d6ebc87cb0fa6f86bee3a4eade7329ebb0cf2d38 assets/hexcasting/models/item/stripped_edified_log.json ea3f18f75776022127f3a108119e3f7a5c211c0f assets/hexcasting/models/item/stripped_edified_wood.json 0a100b64e77394606018320bbc5752a546fe0af4 assets/hexcasting/models/item/sub_sandwich.json @@ -135,4 +125,14 @@ ea3f18f75776022127f3a108119e3f7a5c211c0f assets/hexcasting/models/item/stripped_ 5f4831d11d8f45b037a6f48e12d2e794ada7b961 assets/hexcasting/models/item/trinket.json 946970e74b8d3c76c15191f494bc1f3d7e36aa43 assets/hexcasting/models/item/trinket_filled.json c6523de66cbfae3a1e6361c635cc693a0a089bb3 assets/hexcasting/models/item/uuid_colorizer.json -99de51b1596247aa3e5225d6199cbcdc9792c509 assets/hexcasting/models/item/warped_staff.json +c0af5573a4acb5eeacf49ab309d32b6f90ea8a5d assets/hexcasting/models/staff/acacia.json +ac7a4b95db8bde9da23dd4fa76d8086a67e166f8 assets/hexcasting/models/staff/birch.json +b3f3fae3237d9f65d631fe3a6608ed76d9e0034d assets/hexcasting/models/staff/crimson.json +202de3e9a1bb7cd2ac2781937f4d03afe3947195 assets/hexcasting/models/staff/dark_oak.json +a03d8c4cd52afb51668450f0b47ef278bb75ebec assets/hexcasting/models/staff/edified.json +aab75291c6d8889394ab154cd8cfeed7d1cfe41f assets/hexcasting/models/staff/jungle.json +853408e94e104cd8a3ccbb1ec909f9e6bc9638df assets/hexcasting/models/staff/mangrove.json +7a73fc99460cdff11c717b165f2d5c69a7f96fb6 assets/hexcasting/models/staff/mindsplice.json +41d0396eae3b5511c513b33a186a8a76d3f89a3e assets/hexcasting/models/staff/oak.json +171cc4644ba9df07d79d08b06c482cf7c4c9e873 assets/hexcasting/models/staff/spruce.json +99de51b1596247aa3e5225d6199cbcdc9792c509 assets/hexcasting/models/staff/warped.json diff --git a/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 b/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 index 3876a6dd..b9160e4c 100644 --- a/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 +++ b/Common/src/generated/resources/.cache/d2fe5b6fab5fdc7ee7ca336c062752306bdf6128 @@ -1,4 +1,4 @@ -// 1.19.2 2023-05-23T12:25:03.187149224 Block States: hexcasting +// 1.19.2 2023-05-23T13:06:30.179893298 Block States: hexcasting 901e38574bdaa40ea4a0f6e773a88a95d9c03e55 assets/hexcasting/blockstates/akashic_bookshelf.json 32a77ef668198002563d68be35a24fa93c8d454a assets/hexcasting/blockstates/akashic_connector.json 85080ce0a0387583a839e4788517d675a1a35e24 assets/hexcasting/blockstates/akashic_record.json @@ -184,15 +184,15 @@ d0eb15cbb5d10fdf43d421d89b4018ed60d352e2 assets/hexcasting/models/item/amethyst_ d4a109488c27fc5d60e9054cd1485f1982040ff3 assets/hexcasting/models/item/ancient_scroll_paper_lantern.json 7c2b9b5296ba5e3c261bb237555e7d4082ad9303 assets/hexcasting/models/item/aventurine_edified_leaves.json 50b0a55c712887ceb02bc835a1111cf855c11b6e assets/hexcasting/models/item/citrine_edified_leaves.json -7f762c5dfcd009b91e0bb4b375f7006aacd54dd5 assets/hexcasting/models/item/directrix/empty.json -bfecdf6b0d21f05c7d4700ffa18b706a1b88a660 assets/hexcasting/models/item/directrix/redstone.json +c24d9c5ec6c7f3212ea814ecd40e56bdc94c22a8 assets/hexcasting/models/item/directrix/empty.json +c84399ca55a1ac9b37ed4b8153b4469fa5ed9c5a assets/hexcasting/models/item/directrix/redstone.json 96e1cd457414bddbddda1383564c6a566808f958 assets/hexcasting/models/item/edified_panel.json 82bac5442c940fb74e1ad068a9c8df1d0e10d959 assets/hexcasting/models/item/edified_planks.json 3e55be12a83ab041f8e269ad4e40454e32e05421 assets/hexcasting/models/item/edified_tile.json -7346c00f5e94d46a77ea24d152c9589b1c3c9ffa assets/hexcasting/models/item/impetus/empty.json -5d7949217b7b3b95a06d70ecbf32f31d8f6440f8 assets/hexcasting/models/item/impetus/look.json -c3b67849c2b401b3d174ae0c91e0c0a4af523f07 assets/hexcasting/models/item/impetus/redstone.json -a4cc1bad18b80081d12f0bb5777ae2b85512a7d6 assets/hexcasting/models/item/impetus/rightclick.json +486c1fad6dd0bf76f160d157439e6d4add950ff8 assets/hexcasting/models/item/impetus/empty.json +cbe5bc7148b9e1c1cf5c4517801da664aa39efb8 assets/hexcasting/models/item/impetus/look.json +37ae2de56929989d8c44ba0d72e1623c2056c397 assets/hexcasting/models/item/impetus/redstone.json +e7f590cfc681aa7d19c56df325c95c5fbed01bc5 assets/hexcasting/models/item/impetus/rightclick.json 769dcfb4a504e4dcd28a43cf603a18c66f57e594 assets/hexcasting/models/item/scroll_paper.json 222e40e5754f5cb5a04321c4ed4cee27748c9224 assets/hexcasting/models/item/scroll_paper_lantern.json 145db42b0d90bdb4fd82f5a7eea229be4c0f9675 assets/hexcasting/models/item/slate_block.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/cherry_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/cherry_staff.json index f9007c1a..1fb63985 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/cherry_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/cherry_staff.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/cherry" + "layer0": "hexcasting:item/staff/cherry" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/directrix/empty.json b/Common/src/generated/resources/assets/hexcasting/models/item/directrix/empty.json index c49687ca..98be3ef4 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/directrix/empty.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/directrix/empty.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/circle/directrix/empty/dim_north" + "parent": "hexcasting:block/circle/directrix/empty/dim_east" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/directrix/redstone.json b/Common/src/generated/resources/assets/hexcasting/models/item/directrix/redstone.json index 1b4bba2a..e2b947d5 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/directrix/redstone.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/directrix/redstone.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/circle/directrix/redstone/lit_unpowered_north" + "parent": "hexcasting:block/circle/directrix/redstone/lit_unpowered_east" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/empty.json b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/empty.json index 4c30062c..68e7192d 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/empty.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/empty.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/circle/impetus/empty/dim_north" + "parent": "hexcasting:block/circle/impetus/empty/dim_east" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/look.json b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/look.json index f34367ba..73f69303 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/look.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/look.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/circle/impetus/look/lit_north" + "parent": "hexcasting:block/circle/impetus/look/lit_east" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/redstone.json b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/redstone.json index 39643a68..523b5343 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/redstone.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/redstone.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/circle/impetus/redstone/lit_north" + "parent": "hexcasting:block/circle/impetus/redstone/lit_east" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/rightclick.json b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/rightclick.json index 95c47bcf..38123217 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/impetus/rightclick.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/impetus/rightclick.json @@ -1,3 +1,3 @@ { - "parent": "hexcasting:block/circle/impetus/rightclick/lit_north" + "parent": "hexcasting:block/circle/impetus/rightclick/lit_east" } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/old_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/old_staff.json index 0eb89ae6..f40e6b8a 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/old_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/old_staff.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/old" + "layer0": "hexcasting:item/staff/old" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/birch_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/acacia.json similarity index 59% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/birch_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/acacia.json index 8c70a14f..ea1bd514 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/birch_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/acacia.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/birch" + "layer0": "hexcasting:item/staff/acacia" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/jungle_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/birch.json similarity index 58% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/jungle_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/birch.json index 7db0fa3b..c56b3772 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/jungle_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/birch.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/jungle" + "layer0": "hexcasting:item/staff/birch" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/acacia_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/crimson.json similarity index 58% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/acacia_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/crimson.json index eba2f796..fa68214a 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/acacia_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/crimson.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/acacia" + "layer0": "hexcasting:item/staff/crimson" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/edified_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/dark_oak.json similarity index 58% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/edified_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/dark_oak.json index 7dac11d5..ef89b141 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/edified_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/dark_oak.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/edified" + "layer0": "hexcasting:item/staff/dark_oak" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/edified.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/edified.json new file mode 100644 index 00000000..2ecbbaa4 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/edified.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/edified" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/jungle.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/jungle.json new file mode 100644 index 00000000..81fc631e --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/jungle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/jungle" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/crimson_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/mangrove.json similarity index 58% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/crimson_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/mangrove.json index a7dcb3c5..1d055a89 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/crimson_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/mangrove.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/crimson" + "layer0": "hexcasting:item/staff/mangrove" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/dark_oak_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/mindsplice.json similarity index 57% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/dark_oak_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/mindsplice.json index de362840..a2a679a5 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/dark_oak_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/mindsplice.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/dark_oak" + "layer0": "hexcasting:item/staff/mindsplice" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/oak_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/oak.json similarity index 60% rename from Common/src/generated/resources/assets/hexcasting/models/item/staves/oak_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/oak.json index 119e4d02..c9a35a19 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/oak_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/oak.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "hexcasting:item/staves/oak" + "layer0": "hexcasting:item/staff/oak" } } \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/quenched_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched.json similarity index 61% rename from Common/src/generated/resources/assets/hexcasting/models/item/quenched_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched.json index 110d202d..16e58585 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/quenched_staff.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched.json @@ -1,25 +1,25 @@ { "overrides": [ { - "model": "hexcasting:item/staves/quenched_0", + "model": "hexcasting:item/staff/quenched_0", "predicate": { "hexcasting:variant": 0.0 } }, { - "model": "hexcasting:item/staves/quenched_1", + "model": "hexcasting:item/staff/quenched_1", "predicate": { "hexcasting:variant": 1.0 } }, { - "model": "hexcasting:item/staves/quenched_2", + "model": "hexcasting:item/staff/quenched_2", "predicate": { "hexcasting:variant": 2.0 } }, { - "model": "hexcasting:item/staves/quenched_3", + "model": "hexcasting:item/staff/quenched_3", "predicate": { "hexcasting:variant": 3.0 } diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_0.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_0.json new file mode 100644 index 00000000..d34dbbfe --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/quenched_0" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_1.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_1.json new file mode 100644 index 00000000..b3b4d494 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/quenched_1" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_2.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_2.json new file mode 100644 index 00000000..9d34fae3 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/quenched_2" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_3.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_3.json new file mode 100644 index 00000000..61a55746 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/quenched_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/quenched_3" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/spruce.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/spruce.json new file mode 100644 index 00000000..aa60185a --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/spruce.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/spruce" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staff/warped.json b/Common/src/generated/resources/assets/hexcasting/models/item/staff/warped.json new file mode 100644 index 00000000..4a157768 --- /dev/null +++ b/Common/src/generated/resources/assets/hexcasting/models/item/staff/warped.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld_rod", + "textures": { + "layer0": "hexcasting:item/staff/warped" + } +} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/mangrove_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/mangrove_staff.json deleted file mode 100644 index 12bd5ed2..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/mangrove_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/mangrove" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/mindsplice_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/mindsplice_staff.json deleted file mode 100644 index 7883e2cc..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/mindsplice_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/mindsplice" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_0.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_0.json deleted file mode 100644 index b0632368..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/quenched_0" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_1.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_1.json deleted file mode 100644 index 9b0bec82..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/quenched_1" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_2.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_2.json deleted file mode 100644 index c2f3494d..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/quenched_2" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_3.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_3.json deleted file mode 100644 index 53be4b0b..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/quenched_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/quenched_3" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/spruce_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/spruce_staff.json deleted file mode 100644 index 482a3ec1..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/spruce_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/spruce" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/staves/warped_staff.json b/Common/src/generated/resources/assets/hexcasting/models/item/staves/warped_staff.json deleted file mode 100644 index ff1bb343..00000000 --- a/Common/src/generated/resources/assets/hexcasting/models/item/staves/warped_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "hexcasting:item/staves/warped" - } -} \ No newline at end of file diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/acacia_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/acacia.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/acacia_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/acacia.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/birch_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/birch.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/birch_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/birch.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/crimson_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/crimson.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/crimson_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/crimson.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/dark_oak_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/dark_oak.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/dark_oak_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/dark_oak.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/edified_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/edified.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/edified_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/edified.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/jungle_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/jungle.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/jungle_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/jungle.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/mangrove_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/mangrove.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/mangrove_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/mangrove.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/mindsplice_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/mindsplice.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/mindsplice_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/mindsplice.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/oak_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/oak.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/oak_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/oak.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/spruce_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/spruce.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/spruce_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/spruce.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/warped_staff.json b/Common/src/generated/resources/assets/hexcasting/models/staff/warped.json similarity index 100% rename from Common/src/generated/resources/assets/hexcasting/models/item/warped_staff.json rename to Common/src/generated/resources/assets/hexcasting/models/staff/warped.json diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java index 40494a8c..82c7c919 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexItems.java @@ -4,7 +4,6 @@ import at.petrak.hexcasting.common.items.ItemJewelerHammer; import at.petrak.hexcasting.common.items.ItemLens; import at.petrak.hexcasting.common.items.ItemLoreFragment; import at.petrak.hexcasting.common.items.ItemStaff; -import at.petrak.hexcasting.common.items.armor.ItemRobes; import at.petrak.hexcasting.common.items.colorizer.ItemAmethystAndCopperColorizer; import at.petrak.hexcasting.common.items.colorizer.ItemDyeColorizer; import at.petrak.hexcasting.common.items.colorizer.ItemPrideColorizer; @@ -40,19 +39,19 @@ public class HexItems { public static final Item QUENCHED_SHARD = make("quenched_allay_shard", new Item(props())); - public static final ItemStaff STAFF_OAK = make("oak_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_SPRUCE = make("spruce_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_BIRCH = make("birch_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_JUNGLE = make("jungle_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_ACACIA = make("acacia_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_DARK_OAK = make("dark_oak_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_CRIMSON = make("crimson_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_WARPED = make("warped_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_MANGROVE = make("mangrove_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_EDIFIED = make("edified_staff", new ItemStaff(unstackable())); - public static final ItemStaff STAFF_QUENCHED = make("quenched_staff", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_OAK = make("staff/oak", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_SPRUCE = make("staff/spruce", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_BIRCH = make("staff/birch", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_JUNGLE = make("staff/jungle", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_ACACIA = make("staff/acacia", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_DARK_OAK = make("staff/dark_oak", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_CRIMSON = make("staff/crimson", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_WARPED = make("staff/warped", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_MANGROVE = make("staff/mangrove", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_EDIFIED = make("staff/edified", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_QUENCHED = make("staff/quenched", new ItemStaff(unstackable())); // mindsplice staffaratus - public static final ItemStaff STAFF_MINDSPLICE = make("mindsplice_staff", new ItemStaff(unstackable())); + public static final ItemStaff STAFF_MINDSPLICE = make("staff/mindsplice", new ItemStaff(unstackable())); public static final ItemLens SCRYING_LENS = make("lens", new ItemLens( IXplatAbstractions.INSTANCE.addEquipSlotFabric(EquipmentSlot.HEAD) @@ -100,9 +99,6 @@ public class HexItems { public static final Item DEFAULT_COLORIZER = make("default_colorizer", new ItemAmethystAndCopperColorizer(unstackable())); - public static final ItemRobes ARMOR_HOOD = make("robes", - new ItemRobes(EquipmentSlot.HEAD, unstackable())); - // BUFF SANDVICH public static final Item SUBMARINE_SANDWICH = make("sub_sandwich", new Item(props().food(new FoodProperties.Builder().nutrition(14).saturationMod(1.2f).build()))); diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/acacia.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/acacia.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/acacia.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/acacia.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/birch.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/birch.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/birch.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/birch.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/cherry.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/cherry.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/cherry.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/cherry.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/crimson.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/crimson.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/crimson.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/crimson.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/dark_oak.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/dark_oak.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/dark_oak.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/dark_oak.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/edified.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/edified.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/edified.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/edified.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/jungle.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/jungle.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/jungle.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/jungle.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/mangrove.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/mangrove.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/mangrove.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/mangrove.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/mindsplice.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/mindsplice.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/mindsplice.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/mindsplice.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/oak.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/oak.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/oak.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/oak.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/old.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/old.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/old.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/old.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_0.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_0.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_0.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_0.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_1.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_1.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_1.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_1.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_2.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_2.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_2.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_2.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_3.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_3.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/quenched_3.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/quenched_3.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/spruce.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/spruce.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/spruce.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/spruce.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/item/staves/warped.png b/Common/src/main/resources/assets/hexcasting/textures/item/staff/warped.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/item/staves/warped.png rename to Common/src/main/resources/assets/hexcasting/textures/item/staff/warped.png diff --git a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index 0f0e45c5..eec14844 100644 --- a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,5 +1,5 @@ -// 1.19.2 2023-05-15T11:53:35.150137932 Tags for minecraft:item -b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/items/impeti.json +// 1.19.2 2023-05-23T13:17:48.578356605 Tags for minecraft:item +bdb90cee0e88e02f0b98f12d5dd212adfaca9afd data/hexcasting/tags/items/impeti.json 5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json @@ -7,14 +7,14 @@ e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_plan fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/doors.json 37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/items/wooden_pressure_plates.json 38d781b60c5c37dc025d4c7e9ec5aa680f2a5835 data/c/tags/items/gems.json -11f4078527c89587b6cd87f4089fc7e0436708bf data/hexcasting/tags/items/staves.json +cbfa3891e0615c5083b9e149da0153039f425601 data/hexcasting/tags/items/staves.json 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/items/logs_that_burn.json 20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/items/wooden_buttons.json 24145229528668829a1bcecf18a6377ebd07ccf8 data/hexcasting/tags/items/grants_root_advancement.json 684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/items/edified_logs.json e186f43ed06770e698c886691f91b2c6acdb5a2a data/hexcasting/tags/items/seal_materials.json 5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/items/leaves.json -9818dcd28edc496bc434b4f7b6b9cc27658d545e data/hexcasting/tags/items/directrices.json +e56043c42174104e0f9cb1cf40c58005c42d5e62 data/hexcasting/tags/items/directrices.json 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/items/logs.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/slabs.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/wooden_slabs.json diff --git a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index d655a1e1..bd820929 100644 --- a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,14 +1,14 @@ -// 1.19.2 2023-05-15T11:53:35.151604475 LootTables -dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json +// 1.19.2 2023-05-23T13:17:48.57103705 LootTables +16e227c78c666f686426e69940755484120a6e5a data/hexcasting/loot_tables/blocks/impetus/rightclick.json 2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json -cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data/hexcasting/loot_tables/blocks/directrix_redstone.json 47f8f9442a6f072f04709551eb0b997233731310 data/hexcasting/loot_tables/blocks/edified_button.json 4bd736b9d96bb5a0f0b18cb423566bf0ec63f530 data/hexcasting/loot_tables/blocks/scroll_paper.json +53d9b15a35d6f7805e8e22594fb4807d3435978d data/hexcasting/loot_tables/blocks/impetus/empty.json 8c81bd237a36b4f3dfb3ef174f455f1edd606b74 data/hexcasting/loot_tables/blocks/edified_planks.json 6e4bc6364e7e1cc97f1ad1127608a0b95e4d156f data/hexcasting/loot_tables/blocks/stripped_edified_wood.json -d97f573d03712b4d677e3a0a22ab6a000b1db060 data/hexcasting/loot_tables/blocks/impetus_rightclick.json 5432a6fece51aa2120ff28eb3044d43f45ac2c8c data/hexcasting/loot_tables/blocks/citrine_edified_leaves.json d640fa26a044349d1f989a8afc6af9e8f3a520ba data/hexcasting/loot_tables/blocks/ancient_scroll_paper_lantern.json +64fd1f80f3478c9ebeba74ea0d1e2bcba4d0ef70 data/hexcasting/loot_tables/blocks/directrix/redstone.json a3ca7f9427bd57a6033f241754d49425251cc091 data/hexcasting/loot_tables/blocks/scroll_paper_lantern.json 2a9a51aed541bb1ede76c34271e1262fc7bcd300 data/hexcasting/loot_tables/blocks/edified_stairs.json 201bbf7adff979ff8cb087e1798da5a2a31eed09 data/hexcasting/loot_tables/blocks/akashic_connector.json @@ -18,20 +18,20 @@ e329c8ad61d61ad9be91d6ab4c36d57c05990e0c data/hexcasting/loot_tables/blocks/amet 5da5b504c400c052ee8b03cf88e78dc567456ef8 data/hexcasting/loot_tables/blocks/amethyst_sconce.json d21fdf6326f7a9958df22224e5e34489d63e013d data/hexcasting/loot_tables/blocks/edified_door.json 5596975fb09fab7f74ec06af9f2b854cf198a775 data/hexcasting/loot_tables/blocks/slate_block.json -90f8f97b941408ed89d01b69e1fccf5f2a35e2bc data/hexcasting/loot_tables/blocks/impetus_look.json a39e834a389257f05d72d2fa2ea43c22a6066bb5 data/hexcasting/loot_tables/blocks/amethyst_edified_leaves.json e17ca4b3e84c4fb6dadfee273e6040cf15724014 data/hexcasting/loot_tables/inject/amethyst_cluster.json -f99e241d651abe7f9234301508bc805deba179ad data/hexcasting/loot_tables/blocks/empty_impetus.json 14b3c20c41228c7e6cc6341abe738fdb4b776ec4 data/hexcasting/loot_tables/blocks/aventurine_edified_leaves.json 543b9a1b5f81ae468f08ed055b9f086d5d2c3278 data/hexcasting/loot_tables/blocks/edified_slab.json -c8dd063aa3fe320f9f4518736d4ae97ba2c93a79 data/hexcasting/loot_tables/blocks/impetus_storedplayer.json +4842b7eb473d221f8ae617333e69127330771ff5 data/hexcasting/loot_tables/blocks/directrix/empty.json 16498092b43c43a4a7617ba91bcfcc13b87d9a7e data/hexcasting/loot_tables/blocks/akashic_record.json d51eabb3875bdf6d31db635e15db10cb25e8bcc5 data/hexcasting/loot_tables/blocks/edified_panel.json 5ab3568a18745879cf60b2febd2c650b3f8cdb52 data/hexcasting/loot_tables/blocks/edified_pressure_plate.json +5e267178e808ab112e6c2dfb03ded38c257ba42b data/hexcasting/loot_tables/blocks/impetus/look.json 457b355c6a5e1b2ee4ddda37a39084ceef3546d7 data/hexcasting/loot_tables/blocks/stripped_edified_log.json b7f7af68760b51d0c438f5c6039f1cd7157fa452 data/hexcasting/loot_tables/blocks/ancient_scroll_paper.json 2a38344306b3ee7245c271f4af339544bc4abab8 data/hexcasting/loot_tables/blocks/edified_wood.json 9ee4259b51cccd4582fb2e52ab9f64e92af857bb data/hexcasting/loot_tables/blocks/edified_log.json +8b2f859e36933bf2de0220fc03f2f2f123d9ac66 data/hexcasting/loot_tables/blocks/impetus/redstone.json c089d3d230ae5354f2a9953f65bba77b6e26d976 data/hexcasting/loot_tables/blocks/edified_trapdoor.json 745b510161cfff804b115f566ad6b50e0cb492d1 data/hexcasting/loot_tables/blocks/slate.json 33ac65cb8351f73958f6d1cb9a5dacfe53d4a2a7 data/hexcasting/loot_tables/blocks/quenched_allay.json diff --git a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 index eb42c74e..71f4e2b6 100644 --- a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -1,8 +1,8 @@ -// 1.19.2 2023-05-15T11:53:35.15100543 Tags for minecraft:block +// 1.19.2 2023-05-23T13:17:48.579043096 Tags for minecraft:block c72a147bc65d26424df199388969ebd11119aed3 data/hexcasting/tags/blocks/brainswept_circle_components.json 357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json 20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/buttons.json -2044a90007e0e25b8d973c936476ac9ae8bc4c5b data/minecraft/tags/blocks/mineable/pickaxe.json +6f1192c21b1b01886982c3c3295a19750024ab70 data/minecraft/tags/blocks/mineable/pickaxe.json d5a3405be832907cb12fd9d1f423e297fe8e3e66 data/minecraft/tags/blocks/mineable/axe.json 5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/mineable/hoe.json 684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs_that_burn.json @@ -18,9 +18,9 @@ fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/wooden_doors 684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/blocks/edified_logs.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/slabs.json e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/blocks/planks.json -b61c62d136132d63889fccca2055c5f7e9b25112 data/hexcasting/tags/blocks/impeti.json +bdb90cee0e88e02f0b98f12d5dd212adfaca9afd data/hexcasting/tags/blocks/impeti.json 281cb08b9b68ef049820c4f3f36b40820044681e data/minecraft/tags/blocks/stairs.json -9818dcd28edc496bc434b4f7b6b9cc27658d545e data/hexcasting/tags/blocks/directrices.json +e56043c42174104e0f9cb1cf40c58005c42d5e62 data/hexcasting/tags/blocks/directrices.json 37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/pressure_plates.json fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/doors.json 5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/wooden_slabs.json diff --git a/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 index 0151864e..5f711a7b 100644 --- a/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 +++ b/Fabric/src/generated/resources/.cache/844611d4af49e23072b8a888c8e73c6c5d8c0768 @@ -1,4 +1,4 @@ -// 1.19.2 2023-05-15T11:53:35.150772984 Tags for hexcasting:action +// 1.19.2 2023-05-23T13:17:48.577885702 Tags for hexcasting:action e366245dfca2a595ffbdc20dfeea404935076a6e data/hexcasting/tags/action/per_world_pattern.json e366245dfca2a595ffbdc20dfeea404935076a6e data/hexcasting/tags/action/requires_enlightenment.json e366245dfca2a595ffbdc20dfeea404935076a6e data/hexcasting/tags/action/can_start_enlighten.json diff --git a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 8c52355c..98e36e9c 100644 --- a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,11 +1,12 @@ -// 1.19.2 2023-05-15T11:53:35.140657884 Recipes +// 1.19.2 2023-05-23T13:17:48.579853983 Recipes +83c23cf481b467a457da980c45700cba0d50f379 data/hexcasting/recipes/staff/mangrove.json 9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json 04569ccadfd99f203b0485d0c3e877209290f2b3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_pink.json 2a9d4a0f3618abf9e9b8699b318a984d2c836913 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json -e8933b048f77673c0d278b238be2a41e76c5fa88 data/hexcasting/recipes/quenched_staff.json 1b510d32bad1a51ad6795fb8e7702d34c8c8cfbe data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_green.json d73e5d8fec4d3f7d15888bd292f4ad9c1b37cac5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ageing_scroll_paper_lantern.json b54339a9e990419e4820491001c4cbdb7aa9fddb data/hexcasting/recipes/artifact.json +397141048c60f76966f748f475438c153e6f3ec5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/quenched.json bfca15c4ef7bea4704d062c3ab690e23887e55b0 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll.json 768d70365c56ef1fbad089d3e3fd68548f964227 data/hexcasting/recipes/dye_colorizer_black.json dfb42a8b723b37df5c8888bdef86a1be35f2de72 data/hexcasting/recipes/pride_colorizer_bisexual.json @@ -16,7 +17,6 @@ dfc171097bdd8a8f280e6787ea999286deda643e data/hexcasting/advancements/recipes/he e6ba57745f6841c2dcb537ada2475e880ea25186 data/hexcasting/recipes/dye_colorizer_green.json a3c7f19df257ee07f0894708b48438fdf3b14a47 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_black.json 15608e5929da4801fc933e79a9e37419ce60e18d data/hexcasting/advancements/recipes/brainsweep/brainsweep/budding_amethyst.json -a776209b64fea520f6a2fff9f1623e7086939dd9 data/hexcasting/recipes/jungle_staff.json 2b16fb3f6b4e4e31c5c507e6c0535bd12c7c63a1 data/hexcasting/recipes/dye_colorizer_brown.json be7ceaf2b55525f06178fb09070dfeeef8da1c65 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_transgender.json e0609202271e402d8ae58e4f8eaf11dcdda10a9e data/hexcasting/recipes/brainsweep/akashic_record.json @@ -30,9 +30,10 @@ ad390fe854110e60aec4c805f7bb5fed45b4e5d1 data/hexcasting/advancements/recipes/he ebfa29e0a62a629afbe18681e09cc7be95a3529e data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_yellow.json 5ba498c4c19f74cbb456385bccda96d4a8d1d1cc data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate_block.json 2aa2e5c268ae440238eaf4cea20011b0c8f81a49 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demiboy.json +46225844c682fbd4caea9fd54ece091ac894fa35 data/hexcasting/recipes/directrix/empty.json 326925a948aeb17aabafbc25ed2562a257796d29 data/hexcasting/recipes/dye_colorizer_yellow.json 9f55e6ff1f2633e4ad390868e7952b700e5309a4 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_rightclick.json -8293ffbca8a83c19bdb4684a6f8676791b5f0884 data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json +3259c40c852e4fd3752a780972d648a13e7dbc54 data/hexcasting/recipes/staff/oak.json 4440b41499c9c32e297dc184c39da010ff82ac5e data/hexcasting/advancements/recipes/hexcasting.creative_tab/uuid_colorizer.json 5a90084c03d6e8424872870c8b65f4771b447f03 data/hexcasting/recipes/brainsweep/budding_amethyst.json 638c534059597cebb9dc1e927c76a2809ddbfd42 data/hexcasting/recipes/akashic_connector.json @@ -51,19 +52,16 @@ b62b3b67e6a105e1eb47d04c2ededd8d408df7b7 data/hexcasting/advancements/recipes/he 4692127dbfe21eab57a6e33b214a3661cf3e6d0f data/hexcasting/recipes/pride_colorizer_demiboy.json 9f2c8e96930991decc2968f1e11978b034ef80b6 data/hexcasting/recipes/decompose_quenched_shard/charged.json 36c97b8de7a0b67256e8966eca289a865cb85df5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_bisexual.json -cba5ffa7cd89116aba040956f4a85073cedd39cf data/hexcasting/recipes/mangrove_staff.json e52dbfc2d86bb3e87ff554fc8d5f0d43b7ff334a data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_gray.json b6d6716724729f0530a524f92d7e4646455de344 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_red.json bd3e10b3d468e48e72ad060b9eb0b9f8f4057bf1 data/hexcasting/recipes/ageing_scroll_paper_lantern.json 446b5adea918e25bb93959fe381e4c8f3fe789f5 data/hexcasting/recipes/scroll.json -0cb3e2e6e0be9f53811f24ad43bf711d07560210 data/hexcasting/advancements/recipes/hexcasting.creative_tab/acacia_staff.json -c7d28ccf9df6fc46aa142c2e7b176cc0cb5ea62b data/hexcasting/recipes/empty_impetus.json +3d8e206f5be9677c90c7406da6363840fa0390d7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/directrix/empty.json 73d8339dc7ba1d305df09cd52037597d4ffaea2a data/hexcasting/recipes/decompose_quenched_shard/dust.json +fed011870fa91ddff7e5b6e01fff94fe41c7a1c7 data/hexcasting/recipes/staff/birch.json c93cecd3f883e57f3cce7ad3d6aad44000ed541c data/hexcasting/recipes/ancient_scroll_paper.json 12d9ec588869179a8e8a1f4bce718175d57e4a71 data/create/recipes/crushing/amethyst_block.json ab26481b45a7f463e2225b9a04d24a1b4d84daef data/hexcasting/recipes/abacus.json -38e7b64a4a15f1ce496f8c156d7262426f98fbcc data/hexcasting/recipes/acacia_staff.json -6a9a89cfa34732437996431a9c885332cf714449 data/hexcasting/advancements/recipes/hexcasting.creative_tab/mangrove_staff.json 7c7888ba95d1e2e8620a916df546a2b06b592d37 data/hexcasting/recipes/edified_planks.json 0859373b9e60e80f3c8b0962a3bc94903af43d36 data/hexcasting/recipes/stripped_edified_wood.json e687ceab424098d586f0b67a34fe65bee1f4dfca data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_blue.json @@ -75,35 +73,38 @@ e3416c3e103fe206cbaa352eb5011f81ccfc6aca data/hexcasting/recipes/slate.json bb42a28d7b19f8f8057630f0d2e99b371e93126a data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_light_blue.json 2fa8ff79780daaa523fe9f04a8fa15c186f055c2 data/hexcasting/recipes/dye_colorizer_purple.json dc0fb37084974cf396264d046fa6708338eb0879 data/hexcasting/recipes/pride_colorizer_transgender.json -f0852056a692d776bf537c821f3d166c2be88bd8 data/hexcasting/recipes/spruce_staff.json b185eee3dc066959c2699284eeed8c5c5de80d33 data/hexcasting/recipes/trinket.json 65246cf025a3300dacf9235db546178e83c863e9 data/hexcasting/recipes/pride_colorizer_lesbian.json b7d75dcd88e5091ff44eec236531a56e82c7bd91 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_aroace.json 13ca24f9f87a6b34f7717e5c326291079e6db96f data/hexcasting/recipes/sub_sandwich.json 90088535c8e4d0beb0725878314c49ac8deb373b data/hexcasting/recipes/amethyst_dust_packing.json 220f4dc7c8f857092bcb85b5ccf8936237ededa4 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_sconce.json +17374a383b0b4dce901fb38d88ccff1346ac9fa5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mangrove.json f0849d723141b9f02798d474da6594f78755dd51 data/hexcasting/recipes/amethyst_tiles.json b7250840982952fc23c8b32b77517744329d8d2d data/hexcasting/recipes/spellbook.json -494a76b3cebcd7b0b37c3f2e655d37b3c7fb762b data/hexcasting/advancements/recipes/hexcasting.creative_tab/spruce_staff.json +97e338e43d683d46aa9f0eb0c08c76d2809b258c data/hexcasting/recipes/impetus/empty.json 83ec93ac94401b356fbee3d6464f52f151edeac4 data/hexcasting/advancements/recipes/hexcasting.creative_tab/spellbook.json -9d4594ac55f0221fff91bc0a48f54e890edd3596 data/hexcasting/recipes/dark_oak_staff.json 0efcdb6cd338f382c823e8599e298322a0080dae data/hexcasting/recipes/edified_panel.json 527f52ec902b9f456099bebe066b15533fe8cffd data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_pressure_plate.json d7f93550b7c25b963eaf34d4d2ab9d9871830983 data/hexcasting/recipes/dye_colorizer_cyan.json 9c8503715195c4cb2e2d9a1abe4f94df7bb9f4b5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/stonecutting/amethyst_tiles.json e91b58b8a52d0d69e13102fbf743aab8be177924 data/hexcasting/recipes/pride_colorizer_genderfluid.json +d9e2d4f2faf56bf5a3abf4e957c7e1f82e46f57b data/hexcasting/recipes/staff/quenched.json 122ca20f3a77c1267e4b8c755e9cd66e56734547 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_genderqueer.json +d09792f3f2519e8af205389f4747e33f616c9e8a data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mindsplice.json fc7fe64799c10482c01aaf467c6447503d3ffb70 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_storedplayer.json aa4a00864f1b22835612fe60a4715250f3ab2126 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_panel.json d75bc1009064769735d46e7f4f32c65d10a470e3 data/hexcasting/recipes/pride_colorizer_asexual.json 50f5bf4d8a499f87fa2211489624c11cc90a95a6 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_stairs.json 390c7a6d359e3022fda950ddbf6a3cff0a75561b data/hexcasting/recipes/focus.json db105c67babb1ffc1bcad53ed1c98d7eb2fee4b1 data/hexcasting/recipes/pride_colorizer_plural.json +551369c1dfd6d4503c88d4a63c2bae140539c945 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/acacia.json bc91b7e096d8a0033916101f21fa43c06b343e86 data/hexcasting/recipes/dye_colorizer_red.json 04d5ceb50171bf1575b4c0145c4acbbc414a6390 data/hexcasting/advancements/recipes/hexcasting.creative_tab/cypher.json 323ccf5637e08024ae3984d1dd3585e6af0fd14c data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demigirl.json 045e4eeefde52c09fd5bc24b8fcbe2a4e81f8bdb data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_intersex.json -3db193fa4246ffa5bbfa45ce901bbfaeada0a942 data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_impetus.json +807edf75b76bef4f5ef22d037de21d4e6d7d2f54 data/hexcasting/advancements/recipes/hexcasting.creative_tab/impetus/empty.json +5653da25f6fe1244e30abe749e33c354b9a8a667 data/hexcasting/recipes/staff/mindsplice.json 858dada9c41974f5aa80c66423bf371c9e176a53 data/hexcasting/recipes/pride_colorizer_demigirl.json bb0f91c534c888d1cff8793b49986dce236c7b2d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_white.json 0101f5c24d8beedcc884ce87b052ad4f6884ddc4 data/hexcasting/recipes/akashic_bookshelf.json @@ -113,31 +114,34 @@ ef5a19ab2710fd0ce836d767588fe6a54a528a48 data/hexcasting/recipes/dye_colorizer_w 229931adf8d62f659de5950d711afd24fb5aa535 data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json 1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json d684142c75bee35e6035d1829e271704d4ccdff3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_lesbian.json -7fc1a033a4c628c72539e8b4941b488234f57045 data/hexcasting/recipes/mindsplice_staff.json -4ffed306e5f640054a6f269ae0e548388f087996 data/hexcasting/recipes/warped_staff.json -f45428f892d2064fafa29ea644eea21354e2e322 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json +7650a2ed4780224220fb1f81084761a6ab650ec2 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/warped.json +7600e25d3d7c94fb90c4e8c24c1da826ffd4ab20 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/edified.json 8715e71c2fb59ee458ce217040c9a8dd0db04789 data/hexcasting/advancements/recipes/hexcasting.creative_tab/lens.json 86d3a071eaec779167ca51dafaedde0e705cfb70 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_asexual.json +e24ed853072fcf54c4e8c0c6bced49f788b37a2a data/hexcasting/recipes/staff/acacia.json 74fced4c5dc2ea10b4946201ae020d16a1cb9c0e data/hexcasting/advancements/recipes/misc/decompose_quenched_shard/shard.json 3608f0ec056f2c5d29a9a89305218497fd2c4383 data/hexcasting/recipes/stonecutting/amethyst_tiles.json 260f89eb21b360ea8b7fdbd23f9977d03ab57149 data/hexcasting/recipes/ancient_scroll_paper_lantern.json +37e2b9bec182b938d98ecfa47a3f46fc526c3135 data/hexcasting/recipes/staff/dark_oak.json 62bfad9dc29406a9807ea33f866cbdfca32e7d0a data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_dust_unpacking.json +d1c157fd9953eeb78c6444b7946db648aef45765 data/hexcasting/recipes/staff/jungle.json 4cc110d5ce9831c0072cc2c4fd8f1a6196f42331 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ancient_scroll_paper_lantern.json 1315f615ebc6593829bd86318d8eb45c2de68876 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_button.json b21f6cbf11e23eac313d68805428cc0da55edb83 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json ae2c6392cc0ec104c4e3019e1824a1e7f811f1de data/hexcasting/advancements/recipes/hexcasting.creative_tab/abacus.json cc89232d202eec019f584e8c5cc044deee76036b data/hexcasting/recipes/amethyst_sconce.json 48b6d3429e3536a85f3a0e9585a7d252ae0d57a3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/jeweler_hammer.json +fdbe409e796b610c89b1bddf11a11410d5982b80 data/hexcasting/recipes/staff/edified.json bc100b94798f0b456877b42a5fc9aee7c4f25218 data/hexcasting/recipes/dye_colorizer_magenta.json 85ea4913eb07d67a976891e48a32d20879f31eaa data/hexcasting/recipes/dye_colorizer_light_gray.json 7caa7a8d9f8b0859f9507376bb715bdbe4b3fb56 data/hexcasting/recipes/dye_colorizer_blue.json f8e027860b2505a7217d1264c5d0b6f7feea0679 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_door.json 63da3af421dfb38283d750eb3b9761f42e95fb91 data/hexcasting/advancements/recipes/hexcasting.creative_tab/stripped_edified_wood.json -24984d728a5c05967c58be9c0dc1c59e986602e6 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +a366ea3750adc0d336ab8f318c40baed3f9c3eb7 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +9d282bddcddd88ebfa6d35a4c348783cfd1c6460 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/oak.json 6e6c73a93e0e06ff399d95e40baf4e06f3a25a0a data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate_block_from_slates.json 3662834d6e0bac03aba28f0f9d9f07f511492118 data/hexcasting/recipes/lens.json -336465276c06fc59be003ccad3d6fc121fa438f5 data/hexcasting/recipes/edified_staff.json -1086a6e3f284fc3b575ee3a21d2b13d0bc62d2bb data/hexcasting/recipes/brainsweep/impetus_rightclick.json +ed5c690324e3d9b55599f00f078ae225072a2e7f data/hexcasting/recipes/brainsweep/impetus_rightclick.json f91ab1d68c575970ef48ad499ec92057a8ee7b2e data/hexcasting/recipes/cypher.json f138f70998ced6042dfcf6850901801aecba31c0 data/hexcasting/recipes/default_colorizer.json a331f4ce9b8d3565cbb154af4d63279f1e2c7a41 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json @@ -147,13 +151,13 @@ ceab17c3df28bb48bc9d99097051c601f5b981f5 data/hexcasting/advancements/recipes/he d603560d9bbe0bd3e9c0ca5cd502fe874337599e data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_light_gray.json 0ee8d29cb06065a55017a8fc50576193107f958d data/hexcasting/recipes/dynamicseal_focus.json 1468a014f6fedc4736989fa9a5a0faeb14ee0cd1 data/hexcasting/advancements/recipes/hexcasting.creative_tab/decompose_quenched_shard/dust.json -8c49c1c022cee20fb2a44046425b48cd0e6659af data/hexcasting/advancements/recipes/hexcasting.creative_tab/birch_staff.json -12e1ba1ec29bf0eadf1210d2307fab35e9685085 data/hexcasting/recipes/empty_directrix.json 898319b3a4ee7a8d7bd7a4af0313593561ed657e data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_paper.json 64f509c0496204d39c38a4a64a1fbe0f84b9e5ae data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_magenta.json a16ce751797baf92c3dd3f125b564e789aeec260 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_planks.json +be370c3c9e859a6038157b092bee66aac05120b1 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/jungle.json +8b9e179b47f986b067bd5cdc58553edfbdfb478f data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/spruce.json 7df149b266e4f7925defd3b017163698070dbcb9 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_medium.json -dc2a9bf96ca9d04ea6bdeb32249322530b5e1cbf data/hexcasting/advancements/recipes/hexcasting.creative_tab/warped_staff.json +b31f78089700a592a1b1f152520c6f33c8b3c935 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/dark_oak.json 1ba5dada44ad7c008756f0e8e7adfe30e2520239 data/hexcasting/recipes/dye_colorizer_lime.json b494dc17959c76857f25368eb845e58e4f8bca92 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json 4bff4a59e32c6d1d99bc3a8abd16cd88c51a8e73 data/hexcasting/recipes/dye_colorizer_orange.json @@ -166,41 +170,37 @@ b494dc17959c76857f25368eb845e58e4f8bca92 data/hexcasting/recipes/compat/farmersd 99ebed784d731042da34187b829e1b9560cbebb2 data/hexcasting/advancements/recipes/hexcasting.creative_tab/akashic_bookshelf.json 5627128775e24fb6281a0576a931cfa88a909bc0 data/hexcasting/recipes/slate_block_from_slates.json 6aa3e7825025d055a70a58acd4fd48eef0480721 data/hexcasting/recipes/edified_wood.json -783c691f24bc4259ba5da014133763dce26ee4bd data/hexcasting/recipes/crimson_staff.json 6479526ac6b8732814ea3feb97e877896c17f7b7 data/hexcasting/recipes/edified_trapdoor.json 6641b22c79fa29fab15d414afecabd3aa7402b38 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_paper_lantern.json 3ae790bef91b6ae57ed7e3e792740ea059875293 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_cyan.json f0a77ba758e649d0c16a8e2d9964d18f95a544f4 data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate.json f9e4d9171ffc6a125d9899f1867398acf8037b27 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_agender.json +e9fbc36102ab1badb047e45fc51ef3b36dc5d3b1 data/hexcasting/recipes/staff/spruce.json 2e943ea3077aa46f16d78c04ab417677fc326e78 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_small.json 0d08dab8c9700c7b5b32ad35e7b665a2e3c2cdc7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/artifact.json -01f8281d0b4b1fa7116989c9a01d71a3312d8d11 data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_directrix.json 202e70722198141d5dd961bb087a25873e4928af data/hexcasting/recipes/edified_stairs.json b640608755649a8bde55a434016b14522fa6d2e0 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_wood.json d323e21de69d0606d1fac03fa8820e5857e4e1f1 data/hexcasting/recipes/dynamicseal_spellbook.json 08c200b6d3a3aacb434112aacab9851e7d5f6083 data/hexcasting/recipes/scroll_small.json +4a663515d51f23abbcfeb76a8cb7e7fd43c345c9 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/birch.json 5902d75cd2474604f2bb1067187ba574eb1e15fc data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json 07902912a9ca6f8da48ed579ec318bb760d4f8df data/hexcasting/recipes/pride_colorizer_nonbinary.json -7a51e934846a0d7fe00a808cfa22fd85da67fe9d data/hexcasting/recipes/brainsweep/impetus_look.json -01fe458d83b9f196b59407d2099b70f93656fc71 data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json +d4784d97bd71889a57461c6006f2bfe536b91789 data/hexcasting/recipes/staff/crimson.json +4e7d9780689ac1412f2d37107928a59c3e6bf711 data/hexcasting/recipes/brainsweep/impetus_look.json 1407fa19f33b98ad0f125a0cba0cf8388b1441e5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/decompose_quenched_shard/charged.json a184ee70962538e4f8641c707d6dca8796ca36e7 data/hexcasting/recipes/edified_slab.json 22ff2d626da7f5fdc1411b4df75a6fc6a0e52df7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_slab.json -3de6a907c45a97e163caf043292bb693af58e453 data/hexcasting/advancements/recipes/hexcasting.creative_tab/crimson_staff.json 563d6b480a6ebf1c200c2ca7cd62ed305cbf9710 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_lime.json b7fc41f8cfd83a0d138290251d63bb6cc04e0f9a data/hexcasting/recipes/edified_pressure_plate.json -3c552071e6b3cfd4932b8f1e8d8b91aae8ead99d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dark_oak_staff.json -a58f37bc66e65c1ac00ba7dbc4d9a7b902f42aad data/hexcasting/advancements/recipes/hexcasting.creative_tab/oak_staff.json 13d03da2cfee5c29e5432806189e18eeefb76e11 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_gay.json fc0476880c79cf4458dd5b24f77fc980b02534d2 data/hexcasting/recipes/edified_button.json -6f5ee50706640e9be82810e22388fc7b2bce13b1 data/hexcasting/recipes/birch_staff.json e35c89ccc099c511c9ab321a7490d35f2e8c9353 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_dust_packing.json -3127e275f4dc31d80a21f9119fcebc527e821caa data/hexcasting/recipes/brainsweep/directrix_redstone.json -735a7d770f23a02dc4ae93644e7f4c44a32e313a data/hexcasting/recipes/oak_staff.json +b16ff5314d457bc7e9e224e102d1e04ce3a62361 data/hexcasting/recipes/brainsweep/directrix_redstone.json 36c3ea4547b49c7553e7024192d5ddf6f2163422 data/hexcasting/recipes/scroll_paper_lantern.json 79ebc61817f6ef529c385fe3ed3ff9edb0761f96 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_genderfluid.json 5ffea2f9ccbb855ab3f5aca9cb572f57f26619ae data/hexcasting/recipes/amethyst_dust_unpacking.json c9c2b33afc4b5de1f10df08d901312ee1ded1c5e data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_pansexual.json +c0e5b6c1f556996ca01f196b1c0c51c0c398f100 data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/crimson.json +e5f82ced7d6345521c07261d1ce89c0bd2c8d47b data/hexcasting/recipes/staff/warped.json fa49dab810cff4f827d2662a93fc3439a8e99cba data/hexcasting/recipes/pride_colorizer_genderqueer.json 25df58c8b78028142c47deb060768d4fbfe2c38e data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_nonbinary.json -182c2b5dd406c80ed957e1b43d554cce1b212d28 data/hexcasting/advancements/recipes/hexcasting.creative_tab/jungle_staff.json diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_directrix.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/directrix/empty.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_directrix.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/directrix/empty.json index 4d17b106..a2bf27ff 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_directrix.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/directrix/empty.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:empty_directrix" + "recipe": "hexcasting:directrix/empty" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:empty_directrix" + "hexcasting:directrix/empty" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_impetus.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/impetus/empty.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_impetus.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/impetus/empty.json index bafe9654..ef33e434 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_impetus.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/impetus/empty.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:empty_impetus" + "recipe": "hexcasting:impetus/empty" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:empty_impetus" + "hexcasting:impetus/empty" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mangrove_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mangrove_staff.json deleted file mode 100644 index 44132129..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mangrove_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:mangrove_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:mangrove_staff" - ] - } -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json deleted file mode 100644 index 268f94e3..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/mindsplice_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:mindsplice_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:mindsplice_staff" - ] - } -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json deleted file mode 100644 index f26d8ab8..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/quenched_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:quenched_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:quenched_staff" - ] - } -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/spruce_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/spruce_staff.json deleted file mode 100644 index 98121ef0..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/spruce_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:spruce_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:spruce_staff" - ] - } -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/jungle_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/acacia.json similarity index 87% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/jungle_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/acacia.json index 685f906e..098eabab 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/jungle_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/acacia.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:jungle_staff" + "recipe": "hexcasting:staff/acacia" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:jungle_staff" + "hexcasting:staff/acacia" ] } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/birch_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/birch.json similarity index 87% rename from Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/birch_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/birch.json index 90ba4043..2ea82c05 100644 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/birch_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/birch.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:birch_staff" + "recipe": "hexcasting:staff/birch" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:birch_staff" + "hexcasting:staff/birch" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/crimson.json similarity index 87% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/crimson.json index 13f03bde..25e7462a 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/crimson.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:edified_staff" + "recipe": "hexcasting:staff/crimson" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:edified_staff" + "hexcasting:staff/crimson" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/dark_oak_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/dark_oak.json similarity index 86% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/dark_oak_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/dark_oak.json index 07c5115d..1067f2d3 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/dark_oak_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/dark_oak.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:dark_oak_staff" + "recipe": "hexcasting:staff/dark_oak" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:dark_oak_staff" + "hexcasting:staff/dark_oak" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/crimson_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/edified.json similarity index 87% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/crimson_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/edified.json index e09e9060..1e95b569 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/crimson_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/edified.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:crimson_staff" + "recipe": "hexcasting:staff/edified" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:crimson_staff" + "hexcasting:staff/edified" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/acacia_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/jungle.json similarity index 87% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/acacia_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/jungle.json index bd0eadcb..d02acdbb 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/acacia_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/jungle.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:acacia_staff" + "recipe": "hexcasting:staff/jungle" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:acacia_staff" + "hexcasting:staff/jungle" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mangrove.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mangrove.json new file mode 100644 index 00000000..ee26ce62 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mangrove.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/mangrove" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/mangrove" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mindsplice.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mindsplice.json new file mode 100644 index 00000000..a2df5d01 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/mindsplice.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/mindsplice" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/mindsplice" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/oak_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/oak.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/oak_staff.json rename to Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/oak.json index f5158d35..6c1f7195 100644 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/oak_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/oak.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:oak_staff" + "recipe": "hexcasting:staff/oak" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:oak_staff" + "hexcasting:staff/oak" ] } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/quenched.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/quenched.json new file mode 100644 index 00000000..68edbeae --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/quenched.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/quenched" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/quenched" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/spruce.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/spruce.json new file mode 100644 index 00000000..cedea2ad --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/spruce.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/spruce" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/spruce" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/warped.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/warped.json new file mode 100644 index 00000000..53b09f93 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/staff/warped.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/warped" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/warped" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/warped_staff.json b/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/warped_staff.json deleted file mode 100644 index d230832c..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/warped_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:warped_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:warped_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_directrix.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/empty.json similarity index 80% rename from Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_directrix.json rename to Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/empty.json index 7eb7b3f4..f2ad892f 100644 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_directrix.json +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/empty.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:empty_directrix" + "name": "hexcasting:directrix/empty" } ], "rolls": 1.0 diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix_redstone.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/redstone.json similarity index 79% rename from Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix_redstone.json rename to Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/redstone.json index 29374dda..5325cf83 100644 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix_redstone.json +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/redstone.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:directrix_redstone" + "name": "hexcasting:directrix/redstone" } ], "rolls": 1.0 diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_impetus.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/empty.json similarity index 80% rename from Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_impetus.json rename to Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/empty.json index c7b9e071..0622d49d 100644 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_impetus.json +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/empty.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:empty_impetus" + "name": "hexcasting:impetus/empty" } ], "rolls": 1.0 diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_look.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/look.json similarity index 81% rename from Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_look.json rename to Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/look.json index 3e2dd6e0..7ba73cd0 100644 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_look.json +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/look.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:impetus_look" + "name": "hexcasting:impetus/look" } ], "rolls": 1.0 diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/redstone.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/redstone.json new file mode 100644 index 00000000..0d5fe703 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/redstone.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "hexcasting:impetus/redstone" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/rightclick.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/rightclick.json new file mode 100644 index 00000000..769fc1b6 --- /dev/null +++ b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/rightclick.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "hexcasting:impetus/rightclick" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_rightclick.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_rightclick.json deleted file mode 100644 index 12867f61..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_rightclick.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "hexcasting:impetus_rightclick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_storedplayer.json b/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_storedplayer.json deleted file mode 100644 index 46e4d67e..00000000 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_storedplayer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "hexcasting:impetus_storedplayer" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json index 614ea5a6..3cfe40b7 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_directrix" + "block": "hexcasting:directrix/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "mason" }, "result": { - "name": "hexcasting:directrix_redstone", + "name": "hexcasting:directrix/redstone", "properties": { "energized": "false", "facing": "north", diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json index 882d44e4..d253e454 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_impetus" + "block": "hexcasting:impetus/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "toolsmith" }, "result": { - "name": "hexcasting:impetus_look", + "name": "hexcasting:impetus/look", "properties": { "energized": "false", "facing": "north" diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json index 36366977..5a106bd8 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_impetus" + "block": "hexcasting:impetus/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "toolsmith" }, "result": { - "name": "hexcasting:impetus_rightclick", + "name": "hexcasting:impetus/rightclick", "properties": { "energized": "false", "facing": "north" diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json index 8529689e..1bef4d46 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_impetus" + "block": "hexcasting:impetus/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "cleric" }, "result": { - "name": "hexcasting:impetus_storedplayer", + "name": "hexcasting:impetus/redstone", "properties": { "energized": "false", "facing": "north", diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/empty_directrix.json b/Fabric/src/generated/resources/data/hexcasting/recipes/directrix/empty.json similarity index 89% rename from Fabric/src/generated/resources/data/hexcasting/recipes/empty_directrix.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/directrix/empty.json index da63211b..0f436822 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/empty_directrix.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/directrix/empty.json @@ -20,6 +20,6 @@ "SSC" ], "result": { - "item": "hexcasting:empty_directrix" + "item": "hexcasting:directrix/empty" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/empty_impetus.json b/Fabric/src/generated/resources/data/hexcasting/recipes/impetus/empty.json similarity index 90% rename from Fabric/src/generated/resources/data/hexcasting/recipes/empty_impetus.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/impetus/empty.json index b317a509..72b729eb 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/empty_impetus.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/impetus/empty.json @@ -20,6 +20,6 @@ "SSP" ], "result": { - "item": "hexcasting:empty_impetus" + "item": "hexcasting:impetus/empty" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/acacia_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/acacia.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/acacia_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/acacia.json index e73359c0..14619205 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/acacia_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/acacia.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:acacia_staff" + "item": "hexcasting:staff/acacia" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/birch_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/birch.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/birch_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/birch.json index 9f9d5490..42193e67 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/birch_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/birch.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:birch_staff" + "item": "hexcasting:staff/birch" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/crimson_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/crimson.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/crimson_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/crimson.json index a4024bde..f9977c79 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/crimson_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/crimson.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:crimson_staff" + "item": "hexcasting:staff/crimson" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/dark_oak_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/dark_oak.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/dark_oak_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/dark_oak.json index 2d82b6fa..9617adca 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/dark_oak_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/dark_oak.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:dark_oak_staff" + "item": "hexcasting:staff/dark_oak" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/edified_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/edified.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/edified_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/edified.json index 1bb274a8..131f11c5 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/edified_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/edified.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:edified_staff" + "item": "hexcasting:staff/edified" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/jungle_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/jungle.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/jungle_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/jungle.json index 09474e48..674b3643 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/jungle_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/jungle.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:jungle_staff" + "item": "hexcasting:staff/jungle" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/mangrove_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/mangrove.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/mangrove_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/mangrove.json index 38467cb1..688a5090 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/mangrove_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/mangrove.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:mangrove_staff" + "item": "hexcasting:staff/mangrove" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/mindsplice.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/mindsplice.json index 3491512f..090773d7 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/mindsplice.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:mindsplice_staff" + "item": "hexcasting:staff/mindsplice" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/oak_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/oak.json similarity index 89% rename from Fabric/src/generated/resources/data/hexcasting/recipes/oak_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/oak.json index 6a140931..cda58ec1 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/oak_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/oak.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:oak_staff" + "item": "hexcasting:staff/oak" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/quenched.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/quenched.json index c3d5af82..25c56ed3 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/quenched_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/quenched.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:quenched_staff" + "item": "hexcasting:staff/quenched" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/spruce_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/spruce.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/spruce_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/spruce.json index f8a4473b..d17a1147 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/spruce_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/spruce.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:spruce_staff" + "item": "hexcasting:staff/spruce" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/warped_staff.json b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/warped.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/warped_staff.json rename to Fabric/src/generated/resources/data/hexcasting/recipes/staff/warped.json index 55c22242..1e53c460 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/warped_staff.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/staff/warped.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:warped_staff" + "item": "hexcasting:staff/warped" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json index db72fe85..a44aa5e4 100644 --- a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json +++ b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/directrices.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "hexcasting:directrix_redstone" + "hexcasting:directrix/redstone" ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json index 49f7389b..05550672 100644 --- a/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json +++ b/Fabric/src/generated/resources/data/hexcasting/tags/blocks/impeti.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "hexcasting:impetus_look", - "hexcasting:impetus_rightclick", - "hexcasting:impetus_storedplayer" + "hexcasting:impetus/look", + "hexcasting:impetus/rightclick", + "hexcasting:impetus/redstone" ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json b/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json index db72fe85..a44aa5e4 100644 --- a/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json +++ b/Fabric/src/generated/resources/data/hexcasting/tags/items/directrices.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "hexcasting:directrix_redstone" + "hexcasting:directrix/redstone" ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json b/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json index 49f7389b..05550672 100644 --- a/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json +++ b/Fabric/src/generated/resources/data/hexcasting/tags/items/impeti.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "hexcasting:impetus_look", - "hexcasting:impetus_rightclick", - "hexcasting:impetus_storedplayer" + "hexcasting:impetus/look", + "hexcasting:impetus/rightclick", + "hexcasting:impetus/redstone" ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/tags/items/staves.json b/Fabric/src/generated/resources/data/hexcasting/tags/items/staves.json index 8a35e442..49df6e4a 100644 --- a/Fabric/src/generated/resources/data/hexcasting/tags/items/staves.json +++ b/Fabric/src/generated/resources/data/hexcasting/tags/items/staves.json @@ -1,17 +1,17 @@ { "replace": false, "values": [ - "hexcasting:edified_staff", - "hexcasting:oak_staff", - "hexcasting:spruce_staff", - "hexcasting:birch_staff", - "hexcasting:jungle_staff", - "hexcasting:acacia_staff", - "hexcasting:dark_oak_staff", - "hexcasting:crimson_staff", - "hexcasting:warped_staff", - "hexcasting:mangrove_staff", - "hexcasting:quenched_staff", - "hexcasting:mindsplice_staff" + "hexcasting:staff/edified", + "hexcasting:staff/oak", + "hexcasting:staff/spruce", + "hexcasting:staff/birch", + "hexcasting:staff/jungle", + "hexcasting:staff/acacia", + "hexcasting:staff/dark_oak", + "hexcasting:staff/crimson", + "hexcasting:staff/warped", + "hexcasting:staff/mangrove", + "hexcasting:staff/quenched", + "hexcasting:staff/mindsplice" ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/Fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 420fce5c..0eb6b7b5 100644 --- a/Fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/Fabric/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -3,12 +3,12 @@ "values": [ "hexcasting:slate_block", "hexcasting:slate", - "hexcasting:empty_directrix", - "hexcasting:directrix_redstone", - "hexcasting:empty_impetus", - "hexcasting:impetus_rightclick", - "hexcasting:impetus_look", - "hexcasting:impetus_storedplayer", + "hexcasting:directrix/empty", + "hexcasting:directrix/redstone", + "hexcasting:impetus/empty", + "hexcasting:impetus/rightclick", + "hexcasting:impetus/look", + "hexcasting:impetus/redstone", "hexcasting:amethyst_tiles", "hexcasting:amethyst_sconce", "hexcasting:quenched_allay" diff --git a/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index 83cd26d5..a997729c 100644 --- a/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,15 +1,15 @@ -// 1.19.2 2023-02-18T11:42:13.01822805 Tags for minecraft:item +// 1.19.2 2023-05-23T13:15:17.291274688 Tags for minecraft:item 2f5c5bd21580004c998765215166adaa72e0d96b data/forge/tags/items/dusts/amethyst.json 873bab891e0827973ebfe9fedd352c95778d7fbe data/forge/tags/items/gems.json c5aac196bf97183b43d794c6aac8e206f4b71e37 data/hexcasting/tags/items/brainswept_circle_components.json -918a356b647d2670172763517ab9f885d3b9451b data/hexcasting/tags/items/directrices.json +5baa4c7098d80a4868ebc95858a0d86a570d2fe3 data/hexcasting/tags/items/directrices.json 42c76a43081acfb0194e2cee6de18104fb0ba5ad data/hexcasting/tags/items/edified_logs.json 86828f8056bfdfdd2aff10d7a9dbc6c269c25b8a data/hexcasting/tags/items/edified_planks.json 03bd3a58ae7367d6a21eb3acbbd70fe65a41b8f6 data/hexcasting/tags/items/grants_root_advancement.json -3cc7c170b3faa415a1ab41e6ddf6d6f085c62e66 data/hexcasting/tags/items/impeti.json +7f71f33b0bc9fde24deef080ab64707df38adfd6 data/hexcasting/tags/items/impeti.json 7f7d5f6cc9b5cfb39d240fc901c4ae2d2037ec14 data/hexcasting/tags/items/phial_base.json d878c230cd5cb1b54fbe6e53f3ef71379d080c6f data/hexcasting/tags/items/seal_materials.json -65b4d296017084143261adc617b727749ed7eba4 data/hexcasting/tags/items/staves.json +5cc8bac77dddad65de1a1cc9c07b46bb1eab01b9 data/hexcasting/tags/items/staves.json 841dfbe4970e9167b205e5aa2b0f0936c6b9af60 data/minecraft/tags/items/buttons.json cba96d2ff28087e7fd9807e5e80104f3befc2512 data/minecraft/tags/items/doors.json 6312e44ef31d2401dddbd46c4d3eda03da6e2db3 data/minecraft/tags/items/leaves.json diff --git a/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index a90bb288..34270281 100644 --- a/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/Forge/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,4 +1,4 @@ -// 1.19.2 2023-02-18T11:42:13.019002411 LootTables +// 1.19.2 2023-05-23T13:15:17.297050959 LootTables 3b1e2f738c4906371a4cdecf24253ad94ae66320 data/hexcasting/loot_tables/blocks/akashic_bookshelf.json 201bbf7adff979ff8cb087e1798da5a2a31eed09 data/hexcasting/loot_tables/blocks/akashic_connector.json 16498092b43c43a4a7617ba91bcfcc13b87d9a7e data/hexcasting/loot_tables/blocks/akashic_record.json @@ -10,7 +10,8 @@ b7f7af68760b51d0c438f5c6039f1cd7157fa452 data/hexcasting/loot_tables/blocks/anci d640fa26a044349d1f989a8afc6af9e8f3a520ba data/hexcasting/loot_tables/blocks/ancient_scroll_paper_lantern.json 2b286f98afbe5d97c7639d450c9814f0362916e3 data/hexcasting/loot_tables/blocks/aventurine_edified_leaves.json 093bdd825801109aa8a06ea64a46e5d76c47d267 data/hexcasting/loot_tables/blocks/citrine_edified_leaves.json -cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data/hexcasting/loot_tables/blocks/directrix_redstone.json +4842b7eb473d221f8ae617333e69127330771ff5 data/hexcasting/loot_tables/blocks/directrix/empty.json +64fd1f80f3478c9ebeba74ea0d1e2bcba4d0ef70 data/hexcasting/loot_tables/blocks/directrix/redstone.json 47f8f9442a6f072f04709551eb0b997233731310 data/hexcasting/loot_tables/blocks/edified_button.json d21fdf6326f7a9958df22224e5e34489d63e013d data/hexcasting/loot_tables/blocks/edified_door.json 9ee4259b51cccd4582fb2e52ab9f64e92af857bb data/hexcasting/loot_tables/blocks/edified_log.json @@ -22,11 +23,10 @@ d51eabb3875bdf6d31db635e15db10cb25e8bcc5 data/hexcasting/loot_tables/blocks/edif 2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json c089d3d230ae5354f2a9953f65bba77b6e26d976 data/hexcasting/loot_tables/blocks/edified_trapdoor.json 2a38344306b3ee7245c271f4af339544bc4abab8 data/hexcasting/loot_tables/blocks/edified_wood.json -dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json -f99e241d651abe7f9234301508bc805deba179ad data/hexcasting/loot_tables/blocks/empty_impetus.json -90f8f97b941408ed89d01b69e1fccf5f2a35e2bc data/hexcasting/loot_tables/blocks/impetus_look.json -d97f573d03712b4d677e3a0a22ab6a000b1db060 data/hexcasting/loot_tables/blocks/impetus_rightclick.json -c8dd063aa3fe320f9f4518736d4ae97ba2c93a79 data/hexcasting/loot_tables/blocks/impetus_storedplayer.json +53d9b15a35d6f7805e8e22594fb4807d3435978d data/hexcasting/loot_tables/blocks/impetus/empty.json +5e267178e808ab112e6c2dfb03ded38c257ba42b data/hexcasting/loot_tables/blocks/impetus/look.json +8b2f859e36933bf2de0220fc03f2f2f123d9ac66 data/hexcasting/loot_tables/blocks/impetus/redstone.json +16e227c78c666f686426e69940755484120a6e5a data/hexcasting/loot_tables/blocks/impetus/rightclick.json 33ac65cb8351f73958f6d1cb9a5dacfe53d4a2a7 data/hexcasting/loot_tables/blocks/quenched_allay.json 4bd736b9d96bb5a0f0b18cb423566bf0ec63f530 data/hexcasting/loot_tables/blocks/scroll_paper.json a3ca7f9427bd57a6033f241754d49425251cc091 data/hexcasting/loot_tables/blocks/scroll_paper_lantern.json diff --git a/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 index b895e11c..eeedf46e 100644 --- a/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ b/Forge/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -1,9 +1,9 @@ -// 1.19.2 2023-02-18T11:42:13.017468146 Tags for minecraft:block +// 1.19.2 2023-05-23T13:15:17.297944258 Tags for minecraft:block c5aac196bf97183b43d794c6aac8e206f4b71e37 data/hexcasting/tags/blocks/brainswept_circle_components.json -918a356b647d2670172763517ab9f885d3b9451b data/hexcasting/tags/blocks/directrices.json +5baa4c7098d80a4868ebc95858a0d86a570d2fe3 data/hexcasting/tags/blocks/directrices.json 42c76a43081acfb0194e2cee6de18104fb0ba5ad data/hexcasting/tags/blocks/edified_logs.json 86828f8056bfdfdd2aff10d7a9dbc6c269c25b8a data/hexcasting/tags/blocks/edified_planks.json -3cc7c170b3faa415a1ab41e6ddf6d6f085c62e66 data/hexcasting/tags/blocks/impeti.json +7f71f33b0bc9fde24deef080ab64707df38adfd6 data/hexcasting/tags/blocks/impeti.json 841dfbe4970e9167b205e5aa2b0f0936c6b9af60 data/minecraft/tags/blocks/buttons.json 136977a539664f25ea6f762ca8c2ee72d430cc49 data/minecraft/tags/blocks/crystal_sound_blocks.json cba96d2ff28087e7fd9807e5e80104f3befc2512 data/minecraft/tags/blocks/doors.json @@ -12,7 +12,7 @@ cba96d2ff28087e7fd9807e5e80104f3befc2512 data/minecraft/tags/blocks/doors.json 42c76a43081acfb0194e2cee6de18104fb0ba5ad data/minecraft/tags/blocks/logs_that_burn.json 102621940be9f729e9b0e14ae08e784efac89381 data/minecraft/tags/blocks/mineable/axe.json 6312e44ef31d2401dddbd46c4d3eda03da6e2db3 data/minecraft/tags/blocks/mineable/hoe.json -3782c7408d0d53cdf3954d2be0b72c099489d4f7 data/minecraft/tags/blocks/mineable/pickaxe.json +625a4ef0b778155b33bdbf64d792b08142c65f18 data/minecraft/tags/blocks/mineable/pickaxe.json abfa06b8189660656acf8f7cdccc3844fb40600f data/minecraft/tags/blocks/mineable/shovel.json 86828f8056bfdfdd2aff10d7a9dbc6c269c25b8a data/minecraft/tags/blocks/planks.json ee24953b8f5d4742f03c57842a3588618bbc5a0a data/minecraft/tags/blocks/pressure_plates.json diff --git a/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 2014957f..aee72ebb 100644 --- a/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.19.2 2023-04-27T15:18:55.496498244 Recipes +// 1.19.2 2023-05-23T13:15:17.293598087 Recipes 29056d8bbc023668564ee81f4eb8b2a11411cf4a data/create/recipes/crushing/amethyst_block.json 5bb0b70967a422bfd88c01fa1af64e9b98781fd1 data/create/recipes/crushing/amethyst_cluster.json 229931adf8d62f659de5950d711afd24fb5aa535 data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json @@ -9,7 +9,6 @@ f48c2df6c0981b959c2e1b0bf8ecc4739b2e034f data/hexcasting/advancements/recipes/br fc7fe64799c10482c01aaf467c6447503d3ffb70 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_storedplayer.json 880972f7bac76d6b460d968d0d83a2f25a0e3172 data/hexcasting/advancements/recipes/brainsweep/brainsweep/quench_allay.json ae2c6392cc0ec104c4e3019e1824a1e7f811f1de data/hexcasting/advancements/recipes/hexcasting/abacus.json -0cb3e2e6e0be9f53811f24ad43bf711d07560210 data/hexcasting/advancements/recipes/hexcasting/acacia_staff.json d73e5d8fec4d3f7d15888bd292f4ad9c1b37cac5 data/hexcasting/advancements/recipes/hexcasting/ageing_scroll_paper_lantern.json 99ebed784d731042da34187b829e1b9560cbebb2 data/hexcasting/advancements/recipes/hexcasting/akashic_bookshelf.json ceab17c3df28bb48bc9d99097051c601f5b981f5 data/hexcasting/advancements/recipes/hexcasting/akashic_connector.json @@ -20,13 +19,11 @@ ad390fe854110e60aec4c805f7bb5fed45b4e5d1 data/hexcasting/advancements/recipes/he b62b3b67e6a105e1eb47d04c2ededd8d408df7b7 data/hexcasting/advancements/recipes/hexcasting/ancient_scroll_paper.json 4cc110d5ce9831c0072cc2c4fd8f1a6196f42331 data/hexcasting/advancements/recipes/hexcasting/ancient_scroll_paper_lantern.json 0d08dab8c9700c7b5b32ad35e7b665a2e3c2cdc7 data/hexcasting/advancements/recipes/hexcasting/artifact.json -8c49c1c022cee20fb2a44046425b48cd0e6659af data/hexcasting/advancements/recipes/hexcasting/birch_staff.json -3de6a907c45a97e163caf043292bb693af58e453 data/hexcasting/advancements/recipes/hexcasting/crimson_staff.json 04d5ceb50171bf1575b4c0145c4acbbc414a6390 data/hexcasting/advancements/recipes/hexcasting/cypher.json -3c552071e6b3cfd4932b8f1e8d8b91aae8ead99d data/hexcasting/advancements/recipes/hexcasting/dark_oak_staff.json 1407fa19f33b98ad0f125a0cba0cf8388b1441e5 data/hexcasting/advancements/recipes/hexcasting/decompose_quenched_shard/charged.json 1468a014f6fedc4736989fa9a5a0faeb14ee0cd1 data/hexcasting/advancements/recipes/hexcasting/decompose_quenched_shard/dust.json 5f89f1a6eef256066bd9c45121003c1f4c3776dd data/hexcasting/advancements/recipes/hexcasting/default_colorizer.json +3d8e206f5be9677c90c7406da6363840fa0390d7 data/hexcasting/advancements/recipes/hexcasting/directrix/empty.json a3c7f19df257ee07f0894708b48438fdf3b14a47 data/hexcasting/advancements/recipes/hexcasting/dye_colorizer_black.json e687ceab424098d586f0b67a34fe65bee1f4dfca data/hexcasting/advancements/recipes/hexcasting/dye_colorizer_blue.json 1b210391768fede639b29ae6fc5adf2b8b4e64c6 data/hexcasting/advancements/recipes/hexcasting/dye_colorizer_brown.json @@ -49,21 +46,15 @@ aa4a00864f1b22835612fe60a4715250f3ab2126 data/hexcasting/advancements/recipes/he a16ce751797baf92c3dd3f125b564e789aeec260 data/hexcasting/advancements/recipes/hexcasting/edified_planks.json 527f52ec902b9f456099bebe066b15533fe8cffd data/hexcasting/advancements/recipes/hexcasting/edified_pressure_plate.json 22ff2d626da7f5fdc1411b4df75a6fc6a0e52df7 data/hexcasting/advancements/recipes/hexcasting/edified_slab.json -f45428f892d2064fafa29ea644eea21354e2e322 data/hexcasting/advancements/recipes/hexcasting/edified_staff.json 50f5bf4d8a499f87fa2211489624c11cc90a95a6 data/hexcasting/advancements/recipes/hexcasting/edified_stairs.json 0ed898da60aa78cd526ff4ae0524359891dbd976 data/hexcasting/advancements/recipes/hexcasting/edified_tile.json f75c21d35b926a2303d60115a297c387790bbbd9 data/hexcasting/advancements/recipes/hexcasting/edified_trapdoor.json b640608755649a8bde55a434016b14522fa6d2e0 data/hexcasting/advancements/recipes/hexcasting/edified_wood.json -01f8281d0b4b1fa7116989c9a01d71a3312d8d11 data/hexcasting/advancements/recipes/hexcasting/empty_directrix.json -3db193fa4246ffa5bbfa45ce901bbfaeada0a942 data/hexcasting/advancements/recipes/hexcasting/empty_impetus.json dfc171097bdd8a8f280e6787ea999286deda643e data/hexcasting/advancements/recipes/hexcasting/focus.json b21a84886b937a4c4e72a674f265dccb21411ab9 data/hexcasting/advancements/recipes/hexcasting/focus_rotated.json +807edf75b76bef4f5ef22d037de21d4e6d7d2f54 data/hexcasting/advancements/recipes/hexcasting/impetus/empty.json 48b6d3429e3536a85f3a0e9585a7d252ae0d57a3 data/hexcasting/advancements/recipes/hexcasting/jeweler_hammer.json -182c2b5dd406c80ed957e1b43d554cce1b212d28 data/hexcasting/advancements/recipes/hexcasting/jungle_staff.json 8715e71c2fb59ee458ce217040c9a8dd0db04789 data/hexcasting/advancements/recipes/hexcasting/lens.json -6a9a89cfa34732437996431a9c885332cf714449 data/hexcasting/advancements/recipes/hexcasting/mangrove_staff.json -01fe458d83b9f196b59407d2099b70f93656fc71 data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json -a58f37bc66e65c1ac00ba7dbc4d9a7b902f42aad data/hexcasting/advancements/recipes/hexcasting/oak_staff.json f9e4d9171ffc6a125d9899f1867398acf8037b27 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_agender.json b7d75dcd88e5091ff44eec236531a56e82c7bd91 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_aroace.json 6e692bdb7e797c1d0fffb5fcc90c5a3b28e4aaff data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_aromantic.json @@ -80,7 +71,6 @@ d684142c75bee35e6035d1829e271704d4ccdff3 data/hexcasting/advancements/recipes/he c9c2b33afc4b5de1f10df08d901312ee1ded1c5e data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_pansexual.json cd22886924e7aaeb62e8f7da0747cc950af9dc32 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_plural.json be7ceaf2b55525f06178fb09070dfeeef8da1c65 data/hexcasting/advancements/recipes/hexcasting/pride_colorizer_transgender.json -8293ffbca8a83c19bdb4684a6f8676791b5f0884 data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json bfca15c4ef7bea4704d062c3ab690e23887e55b0 data/hexcasting/advancements/recipes/hexcasting/scroll.json 7df149b266e4f7925defd3b017163698070dbcb9 data/hexcasting/advancements/recipes/hexcasting/scroll_medium.json 898319b3a4ee7a8d7bd7a4af0313593561ed657e data/hexcasting/advancements/recipes/hexcasting/scroll_paper.json @@ -90,17 +80,26 @@ f0a77ba758e649d0c16a8e2d9964d18f95a544f4 data/hexcasting/advancements/recipes/he 5ba498c4c19f74cbb456385bccda96d4a8d1d1cc data/hexcasting/advancements/recipes/hexcasting/slate_block.json 6e6c73a93e0e06ff399d95e40baf4e06f3a25a0a data/hexcasting/advancements/recipes/hexcasting/slate_block_from_slates.json 83ec93ac94401b356fbee3d6464f52f151edeac4 data/hexcasting/advancements/recipes/hexcasting/spellbook.json -494a76b3cebcd7b0b37c3f2e655d37b3c7fb762b data/hexcasting/advancements/recipes/hexcasting/spruce_staff.json +551369c1dfd6d4503c88d4a63c2bae140539c945 data/hexcasting/advancements/recipes/hexcasting/staff/acacia.json +4a663515d51f23abbcfeb76a8cb7e7fd43c345c9 data/hexcasting/advancements/recipes/hexcasting/staff/birch.json +c0e5b6c1f556996ca01f196b1c0c51c0c398f100 data/hexcasting/advancements/recipes/hexcasting/staff/crimson.json +b31f78089700a592a1b1f152520c6f33c8b3c935 data/hexcasting/advancements/recipes/hexcasting/staff/dark_oak.json +7600e25d3d7c94fb90c4e8c24c1da826ffd4ab20 data/hexcasting/advancements/recipes/hexcasting/staff/edified.json +be370c3c9e859a6038157b092bee66aac05120b1 data/hexcasting/advancements/recipes/hexcasting/staff/jungle.json +17374a383b0b4dce901fb38d88ccff1346ac9fa5 data/hexcasting/advancements/recipes/hexcasting/staff/mangrove.json +d09792f3f2519e8af205389f4747e33f616c9e8a data/hexcasting/advancements/recipes/hexcasting/staff/mindsplice.json +9d282bddcddd88ebfa6d35a4c348783cfd1c6460 data/hexcasting/advancements/recipes/hexcasting/staff/oak.json +397141048c60f76966f748f475438c153e6f3ec5 data/hexcasting/advancements/recipes/hexcasting/staff/quenched.json +8b9e179b47f986b067bd5cdc58553edfbdfb478f data/hexcasting/advancements/recipes/hexcasting/staff/spruce.json +7650a2ed4780224220fb1f81084761a6ab650ec2 data/hexcasting/advancements/recipes/hexcasting/staff/warped.json 9c8503715195c4cb2e2d9a1abe4f94df7bb9f4b5 data/hexcasting/advancements/recipes/hexcasting/stonecutting/amethyst_tiles.json 63da3af421dfb38283d750eb3b9761f42e95fb91 data/hexcasting/advancements/recipes/hexcasting/stripped_edified_wood.json e0e49c8a9977fe2b0619179b11a4379b5b19ace9 data/hexcasting/advancements/recipes/hexcasting/sub_sandwich.json 2589d3a202f24b2f4f78d90ee3e3ad7961eea023 data/hexcasting/advancements/recipes/hexcasting/thought_knot.json 993a613fabd0ee1005bde11ebe92f8046351ba9e data/hexcasting/advancements/recipes/hexcasting/trinket.json 4440b41499c9c32e297dc184c39da010ff82ac5e data/hexcasting/advancements/recipes/hexcasting/uuid_colorizer.json -dc2a9bf96ca9d04ea6bdeb32249322530b5e1cbf data/hexcasting/advancements/recipes/hexcasting/warped_staff.json 74fced4c5dc2ea10b4946201ae020d16a1cb9c0e data/hexcasting/advancements/recipes/misc/decompose_quenched_shard/shard.json ab26481b45a7f463e2225b9a04d24a1b4d84daef data/hexcasting/recipes/abacus.json -38e7b64a4a15f1ce496f8c156d7262426f98fbcc data/hexcasting/recipes/acacia_staff.json d2e2b8e86799546638fd3ff90b04acb98732e9f5 data/hexcasting/recipes/ageing_scroll_paper_lantern.json 0101f5c24d8beedcc884ce87b052ad4f6884ddc4 data/hexcasting/recipes/akashic_bookshelf.json 638c534059597cebb9dc1e927c76a2809ddbfd42 data/hexcasting/recipes/akashic_connector.json @@ -111,26 +110,24 @@ f0849d723141b9f02798d474da6594f78755dd51 data/hexcasting/recipes/amethyst_tiles. 4949a21f83a5a7ceff4884c99e2136b9a9c7f200 data/hexcasting/recipes/ancient_scroll_paper.json 260f89eb21b360ea8b7fdbd23f9977d03ab57149 data/hexcasting/recipes/ancient_scroll_paper_lantern.json 1880b1519b100f2185ed27a9bfd8f98e83fa728f data/hexcasting/recipes/artifact.json -6f5ee50706640e9be82810e22388fc7b2bce13b1 data/hexcasting/recipes/birch_staff.json e0609202271e402d8ae58e4f8eaf11dcdda10a9e data/hexcasting/recipes/brainsweep/akashic_record.json 5a90084c03d6e8424872870c8b65f4771b447f03 data/hexcasting/recipes/brainsweep/budding_amethyst.json -3127e275f4dc31d80a21f9119fcebc527e821caa data/hexcasting/recipes/brainsweep/directrix_redstone.json -7a51e934846a0d7fe00a808cfa22fd85da67fe9d data/hexcasting/recipes/brainsweep/impetus_look.json -1086a6e3f284fc3b575ee3a21d2b13d0bc62d2bb data/hexcasting/recipes/brainsweep/impetus_rightclick.json -24984d728a5c05967c58be9c0dc1c59e986602e6 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +b16ff5314d457bc7e9e224e102d1e04ce3a62361 data/hexcasting/recipes/brainsweep/directrix_redstone.json +4e7d9780689ac1412f2d37107928a59c3e6bf711 data/hexcasting/recipes/brainsweep/impetus_look.json +ed5c690324e3d9b55599f00f078ae225072a2e7f data/hexcasting/recipes/brainsweep/impetus_rightclick.json +a366ea3750adc0d336ab8f318c40baed3f9c3eb7 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json 2aa7d74e29a7c5ee4f1b8835cf7c6109eed81d77 data/hexcasting/recipes/brainsweep/quench_allay.json c4e770cfd4d855d5b4fdc66e424d58621302f51a data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json 64ee84a9bce988bacde0911d05d0f3834e0b1ae7 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json f398f4a10736f967482dd1d254d37c7ba9e67bb0 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json 2f945718621cc2a5c1065fe9fb15c3cbe5bad761 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json 4c9a73932167ebd1dcc1edf154ea6e5212ee4b52 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json -783c691f24bc4259ba5da014133763dce26ee4bd data/hexcasting/recipes/crimson_staff.json 95fac4883f95c2ce0fc42fc9ce164df95e81d99f data/hexcasting/recipes/cypher.json -9d4594ac55f0221fff91bc0a48f54e890edd3596 data/hexcasting/recipes/dark_oak_staff.json 9f2c8e96930991decc2968f1e11978b034ef80b6 data/hexcasting/recipes/decompose_quenched_shard/charged.json 73d8339dc7ba1d305df09cd52037597d4ffaea2a data/hexcasting/recipes/decompose_quenched_shard/dust.json 7feebaa04946fc765add8bd6560c0c0b5eca464d data/hexcasting/recipes/decompose_quenched_shard/shard.json f138f70998ced6042dfcf6850901801aecba31c0 data/hexcasting/recipes/default_colorizer.json +46225844c682fbd4caea9fd54ece091ac894fa35 data/hexcasting/recipes/directrix/empty.json 768d70365c56ef1fbad089d3e3fd68548f964227 data/hexcasting/recipes/dye_colorizer_black.json 7caa7a8d9f8b0859f9507376bb715bdbe4b3fb56 data/hexcasting/recipes/dye_colorizer_blue.json 2b16fb3f6b4e4e31c5c507e6c0535bd12c7c63a1 data/hexcasting/recipes/dye_colorizer_brown.json @@ -155,21 +152,15 @@ fc0476880c79cf4458dd5b24f77fc980b02534d2 data/hexcasting/recipes/edified_button. 7c7888ba95d1e2e8620a916df546a2b06b592d37 data/hexcasting/recipes/edified_planks.json b7fc41f8cfd83a0d138290251d63bb6cc04e0f9a data/hexcasting/recipes/edified_pressure_plate.json a184ee70962538e4f8641c707d6dca8796ca36e7 data/hexcasting/recipes/edified_slab.json -336465276c06fc59be003ccad3d6fc121fa438f5 data/hexcasting/recipes/edified_staff.json 202e70722198141d5dd961bb087a25873e4928af data/hexcasting/recipes/edified_stairs.json 3b83dd1c1aa1bcc58e6512bca75c3a6a3b7482b3 data/hexcasting/recipes/edified_tile.json 6479526ac6b8732814ea3feb97e877896c17f7b7 data/hexcasting/recipes/edified_trapdoor.json 6aa3e7825025d055a70a58acd4fd48eef0480721 data/hexcasting/recipes/edified_wood.json -12e1ba1ec29bf0eadf1210d2307fab35e9685085 data/hexcasting/recipes/empty_directrix.json -c7d28ccf9df6fc46aa142c2e7b176cc0cb5ea62b data/hexcasting/recipes/empty_impetus.json b8145fb8e02d64d1f098ab915f11541c418bb6e3 data/hexcasting/recipes/focus.json 1b1918b442ac43eec34e29f53506380a84809977 data/hexcasting/recipes/focus_rotated.json +97e338e43d683d46aa9f0eb0c08c76d2809b258c data/hexcasting/recipes/impetus/empty.json f124395483d1ae0e10b7db2b1828f1a4e269a88c data/hexcasting/recipes/jeweler_hammer.json -a776209b64fea520f6a2fff9f1623e7086939dd9 data/hexcasting/recipes/jungle_staff.json 3662834d6e0bac03aba28f0f9d9f07f511492118 data/hexcasting/recipes/lens.json -cba5ffa7cd89116aba040956f4a85073cedd39cf data/hexcasting/recipes/mangrove_staff.json -7fc1a033a4c628c72539e8b4941b488234f57045 data/hexcasting/recipes/mindsplice_staff.json -735a7d770f23a02dc4ae93644e7f4c44a32e313a data/hexcasting/recipes/oak_staff.json ce0cd4d73792c30dcec2eea306bff44b28cb237f data/hexcasting/recipes/pride_colorizer_agender.json 17aa26ce6bc9941d1477dee99e514fd66be7f664 data/hexcasting/recipes/pride_colorizer_aroace.json aa6c75e8834d47b0a144dac7b6448cbaecb7df44 data/hexcasting/recipes/pride_colorizer_aromantic.json @@ -186,7 +177,6 @@ fa49dab810cff4f827d2662a93fc3439a8e99cba data/hexcasting/recipes/pride_colorizer 1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json db105c67babb1ffc1bcad53ed1c98d7eb2fee4b1 data/hexcasting/recipes/pride_colorizer_plural.json dc0fb37084974cf396264d046fa6708338eb0879 data/hexcasting/recipes/pride_colorizer_transgender.json -e8933b048f77673c0d278b238be2a41e76c5fa88 data/hexcasting/recipes/quenched_staff.json 446b5adea918e25bb93959fe381e4c8f3fe789f5 data/hexcasting/recipes/scroll.json 2e02e371ed43f72f101588ce4fa6e7ac8b5ef471 data/hexcasting/recipes/scroll_medium.json 6978ff90efdd067940caccdd29437d2aefd0fe1f data/hexcasting/recipes/scroll_paper.json @@ -196,11 +186,21 @@ e3416c3e103fe206cbaa352eb5011f81ccfc6aca data/hexcasting/recipes/slate.json 0b8a01eab5d4ce90974c6c53b6d397f8e9398385 data/hexcasting/recipes/slate_block.json 5627128775e24fb6281a0576a931cfa88a909bc0 data/hexcasting/recipes/slate_block_from_slates.json 1a67f430ef84f4f368bc23ab81a3abb191c7aa3e data/hexcasting/recipes/spellbook.json -f0852056a692d776bf537c821f3d166c2be88bd8 data/hexcasting/recipes/spruce_staff.json +e24ed853072fcf54c4e8c0c6bced49f788b37a2a data/hexcasting/recipes/staff/acacia.json +fed011870fa91ddff7e5b6e01fff94fe41c7a1c7 data/hexcasting/recipes/staff/birch.json +d4784d97bd71889a57461c6006f2bfe536b91789 data/hexcasting/recipes/staff/crimson.json +37e2b9bec182b938d98ecfa47a3f46fc526c3135 data/hexcasting/recipes/staff/dark_oak.json +fdbe409e796b610c89b1bddf11a11410d5982b80 data/hexcasting/recipes/staff/edified.json +d1c157fd9953eeb78c6444b7946db648aef45765 data/hexcasting/recipes/staff/jungle.json +83c23cf481b467a457da980c45700cba0d50f379 data/hexcasting/recipes/staff/mangrove.json +5653da25f6fe1244e30abe749e33c354b9a8a667 data/hexcasting/recipes/staff/mindsplice.json +3259c40c852e4fd3752a780972d648a13e7dbc54 data/hexcasting/recipes/staff/oak.json +d9e2d4f2faf56bf5a3abf4e957c7e1f82e46f57b data/hexcasting/recipes/staff/quenched.json +e9fbc36102ab1badb047e45fc51ef3b36dc5d3b1 data/hexcasting/recipes/staff/spruce.json +e5f82ced7d6345521c07261d1ce89c0bd2c8d47b data/hexcasting/recipes/staff/warped.json 3608f0ec056f2c5d29a9a89305218497fd2c4383 data/hexcasting/recipes/stonecutting/amethyst_tiles.json 0859373b9e60e80f3c8b0962a3bc94903af43d36 data/hexcasting/recipes/stripped_edified_wood.json 13ca24f9f87a6b34f7717e5c326291079e6db96f data/hexcasting/recipes/sub_sandwich.json 81132fbb6784ed15721aff520964988c1d5be06b data/hexcasting/recipes/thought_knot.json 42ab683499c3b0f7ae594879490a37eb6aff9703 data/hexcasting/recipes/trinket.json 27bbddd139a5ec5b86245cd0541e8e2d9e50d9cf data/hexcasting/recipes/uuid_colorizer.json -4ffed306e5f640054a6f269ae0e548388f087996 data/hexcasting/recipes/warped_staff.json diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/acacia_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/acacia_staff.json deleted file mode 100644 index bd0eadcb..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/acacia_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:acacia_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:acacia_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/crimson_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/crimson_staff.json deleted file mode 100644 index e09e9060..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/crimson_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:crimson_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:crimson_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/dark_oak_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/dark_oak_staff.json deleted file mode 100644 index 07c5115d..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/dark_oak_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:dark_oak_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:dark_oak_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/empty_directrix.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/directrix/empty.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/empty_directrix.json rename to Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/directrix/empty.json index 4d17b106..a2bf27ff 100644 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/empty_directrix.json +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/directrix/empty.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:empty_directrix" + "recipe": "hexcasting:directrix/empty" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:empty_directrix" + "hexcasting:directrix/empty" ] } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/edified_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/edified_staff.json deleted file mode 100644 index 13f03bde..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/edified_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:edified_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:edified_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/empty_impetus.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/impetus/empty.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/empty_impetus.json rename to Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/impetus/empty.json index bafe9654..ef33e434 100644 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/empty_impetus.json +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/impetus/empty.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:empty_impetus" + "recipe": "hexcasting:impetus/empty" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:empty_impetus" + "hexcasting:impetus/empty" ] } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/jungle_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/jungle_staff.json deleted file mode 100644 index 685f906e..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/jungle_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:jungle_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:jungle_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mangrove_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mangrove_staff.json deleted file mode 100644 index 44132129..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mangrove_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:mangrove_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:mangrove_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json deleted file mode 100644 index 268f94e3..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/mindsplice_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:mindsplice_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:mindsplice_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json deleted file mode 100644 index f26d8ab8..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/quenched_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:quenched_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:quenched_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/spruce_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/spruce_staff.json deleted file mode 100644 index 98121ef0..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/spruce_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:spruce_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:spruce_staff" - ] - } -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/acacia.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/acacia.json new file mode 100644 index 00000000..098eabab --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/acacia.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/acacia" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/acacia" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/birch_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/birch.json similarity index 87% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/birch_staff.json rename to Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/birch.json index 90ba4043..2ea82c05 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/birch_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/birch.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:birch_staff" + "recipe": "hexcasting:staff/birch" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:birch_staff" + "hexcasting:staff/birch" ] } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/crimson.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/crimson.json new file mode 100644 index 00000000..25e7462a --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/crimson.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/crimson" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/crimson" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/dark_oak.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/dark_oak.json new file mode 100644 index 00000000..1067f2d3 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/dark_oak.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/dark_oak" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/dark_oak" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/edified.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/edified.json new file mode 100644 index 00000000..1e95b569 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/edified.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/edified" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/edified" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/jungle.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/jungle.json new file mode 100644 index 00000000..d02acdbb --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/jungle.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/jungle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/jungle" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/mangrove.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/mangrove.json new file mode 100644 index 00000000..ee26ce62 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/mangrove.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/mangrove" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/mangrove" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/mindsplice.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/mindsplice.json new file mode 100644 index 00000000..a2df5d01 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/mindsplice.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/mindsplice" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/mindsplice" + ] + } +} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/oak_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/oak.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/oak_staff.json rename to Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/oak.json index f5158d35..6c1f7195 100644 --- a/Fabric/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting.creative_tab/oak_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/oak.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "hexcasting:oak_staff" + "recipe": "hexcasting:staff/oak" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "hexcasting:oak_staff" + "hexcasting:staff/oak" ] } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/quenched.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/quenched.json new file mode 100644 index 00000000..68edbeae --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/quenched.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/quenched" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/quenched" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/spruce.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/spruce.json new file mode 100644 index 00000000..cedea2ad --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/spruce.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/spruce" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/spruce" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/warped.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/warped.json new file mode 100644 index 00000000..53b09f93 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/staff/warped.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": [ + "hexcasting:charged_amethyst" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "hexcasting:staff/warped" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "hexcasting:staff/warped" + ] + } +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/warped_staff.json b/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/warped_staff.json deleted file mode 100644 index d230832c..00000000 --- a/Forge/src/generated/resources/data/hexcasting/advancements/recipes/hexcasting/warped_staff.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "hexcasting:charged_amethyst" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "hexcasting:warped_staff" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "hexcasting:warped_staff" - ] - } -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_directrix.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/empty.json similarity index 80% rename from Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_directrix.json rename to Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/empty.json index 7eb7b3f4..f2ad892f 100644 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_directrix.json +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/empty.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:empty_directrix" + "name": "hexcasting:directrix/empty" } ], "rolls": 1.0 diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/redstone.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/redstone.json new file mode 100644 index 00000000..5325cf83 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix/redstone.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "hexcasting:directrix/redstone" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix_redstone.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix_redstone.json deleted file mode 100644 index 29374dda..00000000 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/directrix_redstone.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "hexcasting:directrix_redstone" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_impetus.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/empty.json similarity index 80% rename from Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_impetus.json rename to Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/empty.json index c7b9e071..0622d49d 100644 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/empty_impetus.json +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/empty.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:empty_impetus" + "name": "hexcasting:impetus/empty" } ], "rolls": 1.0 diff --git a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_look.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/look.json similarity index 81% rename from Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_look.json rename to Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/look.json index 3e2dd6e0..7ba73cd0 100644 --- a/Fabric/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_look.json +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/look.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "hexcasting:impetus_look" + "name": "hexcasting:impetus/look" } ], "rolls": 1.0 diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/redstone.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/redstone.json new file mode 100644 index 00000000..0d5fe703 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/redstone.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "hexcasting:impetus/redstone" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/rightclick.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/rightclick.json new file mode 100644 index 00000000..769fc1b6 --- /dev/null +++ b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus/rightclick.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "hexcasting:impetus/rightclick" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_rightclick.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_rightclick.json deleted file mode 100644 index 12867f61..00000000 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_rightclick.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "hexcasting:impetus_rightclick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_storedplayer.json b/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_storedplayer.json deleted file mode 100644 index 46e4d67e..00000000 --- a/Forge/src/generated/resources/data/hexcasting/loot_tables/blocks/impetus_storedplayer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "hexcasting:impetus_storedplayer" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json index 614ea5a6..3cfe40b7 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/directrix_redstone.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_directrix" + "block": "hexcasting:directrix/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "mason" }, "result": { - "name": "hexcasting:directrix_redstone", + "name": "hexcasting:directrix/redstone", "properties": { "energized": "false", "facing": "north", diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json index 882d44e4..d253e454 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_look.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_impetus" + "block": "hexcasting:impetus/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "toolsmith" }, "result": { - "name": "hexcasting:impetus_look", + "name": "hexcasting:impetus/look", "properties": { "energized": "false", "facing": "north" diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json index 36366977..5a106bd8 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_rightclick.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_impetus" + "block": "hexcasting:impetus/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "toolsmith" }, "result": { - "name": "hexcasting:impetus_rightclick", + "name": "hexcasting:impetus/rightclick", "properties": { "energized": "false", "facing": "north" diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json index 8529689e..1bef4d46 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/brainsweep/impetus_storedplayer.json @@ -2,7 +2,7 @@ "type": "hexcasting:brainsweep", "blockIn": { "type": "block", - "block": "hexcasting:empty_impetus" + "block": "hexcasting:impetus/empty" }, "cost": 1000000, "entityIn": { @@ -11,7 +11,7 @@ "profession": "cleric" }, "result": { - "name": "hexcasting:impetus_storedplayer", + "name": "hexcasting:impetus/redstone", "properties": { "energized": "false", "facing": "north", diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/empty_directrix.json b/Forge/src/generated/resources/data/hexcasting/recipes/directrix/empty.json similarity index 89% rename from Forge/src/generated/resources/data/hexcasting/recipes/empty_directrix.json rename to Forge/src/generated/resources/data/hexcasting/recipes/directrix/empty.json index da63211b..0f436822 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/empty_directrix.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/directrix/empty.json @@ -20,6 +20,6 @@ "SSC" ], "result": { - "item": "hexcasting:empty_directrix" + "item": "hexcasting:directrix/empty" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/empty_impetus.json b/Forge/src/generated/resources/data/hexcasting/recipes/impetus/empty.json similarity index 90% rename from Forge/src/generated/resources/data/hexcasting/recipes/empty_impetus.json rename to Forge/src/generated/resources/data/hexcasting/recipes/impetus/empty.json index b317a509..72b729eb 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/empty_impetus.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/impetus/empty.json @@ -20,6 +20,6 @@ "SSP" ], "result": { - "item": "hexcasting:empty_impetus" + "item": "hexcasting:impetus/empty" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/acacia_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/acacia.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/acacia_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/acacia.json index e73359c0..14619205 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/acacia_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/acacia.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:acacia_staff" + "item": "hexcasting:staff/acacia" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/birch_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/birch.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/birch_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/birch.json index 9f9d5490..42193e67 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/birch_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/birch.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:birch_staff" + "item": "hexcasting:staff/birch" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/crimson_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/crimson.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/crimson_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/crimson.json index a4024bde..f9977c79 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/crimson_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/crimson.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:crimson_staff" + "item": "hexcasting:staff/crimson" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/dark_oak_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/dark_oak.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/dark_oak_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/dark_oak.json index 2d82b6fa..9617adca 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/dark_oak_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/dark_oak.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:dark_oak_staff" + "item": "hexcasting:staff/dark_oak" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/edified_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/edified.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/edified_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/edified.json index 1bb274a8..131f11c5 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/edified_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/edified.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:edified_staff" + "item": "hexcasting:staff/edified" } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/jungle_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/jungle.json similarity index 88% rename from Fabric/src/generated/resources/data/hexcasting/recipes/jungle_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/jungle.json index 09474e48..674b3643 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/jungle_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/jungle.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:jungle_staff" + "item": "hexcasting:staff/jungle" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/mangrove_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/mangrove.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/mangrove_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/mangrove.json index 38467cb1..688a5090 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/mangrove_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/mangrove.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:mangrove_staff" + "item": "hexcasting:staff/mangrove" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/mindsplice.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/mindsplice.json index 3491512f..090773d7 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/mindsplice_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/mindsplice.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:mindsplice_staff" + "item": "hexcasting:staff/mindsplice" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/oak_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/oak.json similarity index 89% rename from Forge/src/generated/resources/data/hexcasting/recipes/oak_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/oak.json index 6a140931..cda58ec1 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/oak_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/oak.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:oak_staff" + "item": "hexcasting:staff/oak" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/quenched_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/quenched.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/quenched_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/quenched.json index c3d5af82..25c56ed3 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/quenched_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/quenched.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:quenched_staff" + "item": "hexcasting:staff/quenched" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/spruce_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/spruce.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/spruce_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/spruce.json index f8a4473b..d17a1147 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/spruce_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/spruce.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:spruce_staff" + "item": "hexcasting:staff/spruce" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/warped_staff.json b/Forge/src/generated/resources/data/hexcasting/recipes/staff/warped.json similarity index 88% rename from Forge/src/generated/resources/data/hexcasting/recipes/warped_staff.json rename to Forge/src/generated/resources/data/hexcasting/recipes/staff/warped.json index 55c22242..1e53c460 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/warped_staff.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/staff/warped.json @@ -17,6 +17,6 @@ "S " ], "result": { - "item": "hexcasting:warped_staff" + "item": "hexcasting:staff/warped" } } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json b/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json index cca1c375..8e55c1de 100644 --- a/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json +++ b/Forge/src/generated/resources/data/hexcasting/tags/blocks/directrices.json @@ -1,5 +1,5 @@ { "values": [ - "hexcasting:directrix_redstone" + "hexcasting:directrix/redstone" ] } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json b/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json index ce19ec9e..358990d5 100644 --- a/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json +++ b/Forge/src/generated/resources/data/hexcasting/tags/blocks/impeti.json @@ -1,7 +1,7 @@ { "values": [ - "hexcasting:impetus_look", - "hexcasting:impetus_rightclick", - "hexcasting:impetus_storedplayer" + "hexcasting:impetus/look", + "hexcasting:impetus/rightclick", + "hexcasting:impetus/redstone" ] } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json b/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json index cca1c375..8e55c1de 100644 --- a/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/directrices.json @@ -1,5 +1,5 @@ { "values": [ - "hexcasting:directrix_redstone" + "hexcasting:directrix/redstone" ] } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json b/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json index ce19ec9e..358990d5 100644 --- a/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/impeti.json @@ -1,7 +1,7 @@ { "values": [ - "hexcasting:impetus_look", - "hexcasting:impetus_rightclick", - "hexcasting:impetus_storedplayer" + "hexcasting:impetus/look", + "hexcasting:impetus/rightclick", + "hexcasting:impetus/redstone" ] } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json b/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json index 4504c929..f4eded19 100644 --- a/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/staves.json @@ -1,16 +1,16 @@ { "values": [ - "hexcasting:edified_staff", - "hexcasting:oak_staff", - "hexcasting:spruce_staff", - "hexcasting:birch_staff", - "hexcasting:jungle_staff", - "hexcasting:acacia_staff", - "hexcasting:dark_oak_staff", - "hexcasting:crimson_staff", - "hexcasting:warped_staff", - "hexcasting:mangrove_staff", - "hexcasting:quenched_staff", - "hexcasting:mindsplice_staff" + "hexcasting:staff/edified", + "hexcasting:staff/oak", + "hexcasting:staff/spruce", + "hexcasting:staff/birch", + "hexcasting:staff/jungle", + "hexcasting:staff/acacia", + "hexcasting:staff/dark_oak", + "hexcasting:staff/crimson", + "hexcasting:staff/warped", + "hexcasting:staff/mangrove", + "hexcasting:staff/quenched", + "hexcasting:staff/mindsplice" ] } \ No newline at end of file diff --git a/Forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/Forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index b5ed06ee..754b204e 100644 --- a/Forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/Forge/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -2,12 +2,12 @@ "values": [ "hexcasting:slate_block", "hexcasting:slate", - "hexcasting:empty_directrix", - "hexcasting:directrix_redstone", - "hexcasting:empty_impetus", - "hexcasting:impetus_rightclick", - "hexcasting:impetus_look", - "hexcasting:impetus_storedplayer", + "hexcasting:directrix/empty", + "hexcasting:directrix/redstone", + "hexcasting:impetus/empty", + "hexcasting:impetus/rightclick", + "hexcasting:impetus/look", + "hexcasting:impetus/redstone", "hexcasting:amethyst_tiles", "hexcasting:amethyst_sconce", "hexcasting:quenched_allay" diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java index 63b512fe..e87b56b4 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java @@ -77,9 +77,9 @@ public class HexItemModels extends PaucalItemModelProvider { .scale(0.4f); singleTexture("old_staff", new ResourceLocation("item/handheld_rod"), - "layer0", modLoc("item/staves/old")); + "layer0", modLoc("item/staff/old")); singleTexture("cherry_staff", new ResourceLocation("item/handheld_rod"), - "layer0", modLoc("item/staves/cherry")); + "layer0", modLoc("item/staff/cherry")); buildStaff(HexItems.STAFF_OAK, "oak"); buildStaff(HexItems.STAFF_BIRCH, "birch"); @@ -93,13 +93,14 @@ public class HexItemModels extends PaucalItemModelProvider { buildStaff(HexItems.STAFF_EDIFIED, "edified"); buildStaff(HexItems.STAFF_MINDSPLICE, "mindsplice"); - buildFourVariantGaslight(HexItems.STAFF_QUENCHED, "item/staves/quenched", (name, path) -> + // again, doesn't like paths with slashes in them, so we do it manually + buildFourVariantGaslight("item/staff/quenched", "item/staff/quenched", (name, path) -> singleTexture(path.getPath(), new ResourceLocation("item/handheld_rod"), "layer0", modLoc(path.getPath()))); - buildFourVariantGaslight(HexItems.QUENCHED_SHARD, "item/quenched_shard", (name, path) -> + buildFourVariantGaslight(getPath(HexItems.QUENCHED_SHARD), "item/quenched_shard", (name, path) -> singleTexture(path.getPath(), new ResourceLocation("item/handheld"), "layer0", modLoc(path.getPath()))); - buildFourVariantGaslight(HexBlocks.QUENCHED_ALLAY.asItem(), "block/quenched_allay", (name, path) -> + buildFourVariantGaslight(getPath(HexBlocks.QUENCHED_ALLAY), "block/quenched_allay", (name, path) -> cubeAll(path.getPath(), path)); simpleItem(modLoc("patchouli_book")); @@ -223,8 +224,8 @@ public class HexItemModels extends PaucalItemModelProvider { } private void buildStaff(Item item, String name) { - singleTexture("item/staves/" + getPath(item), new ResourceLocation("item/handheld_rod"), - "layer0", modLoc("item/staves/" + name)); + singleTexture("item/" + getPath(item), new ResourceLocation("item/handheld_rod"), + "layer0", modLoc("item/staff/" + name)); getBuilder(getPath(item)) .override() .predicate(ItemStaff.FUNNY_LEVEL_PREDICATE, 0) @@ -251,9 +252,8 @@ public class HexItemModels extends PaucalItemModelProvider { .end(); } - private void buildFourVariantGaslight(Item item, String path, + private void buildFourVariantGaslight(String name, String path, BiFunction makeModel) { - var name = getPath(item); var builder = getBuilder(name); for (int i = 0; i < BlockQuenchedAllay.VARIANTS; i++) { var textureLoc = modLoc(path + "_" + i);