From 6248922216fe9dfa94e5289e6b77c6bb1e188916 Mon Sep 17 00:00:00 2001 From: Gareth Williams Date: Sat, 13 Jul 2024 19:12:08 +0100 Subject: [PATCH] Fix fences fix #56 --- CHANGELOG.md | 5 ++ .../0b9fb7f4824fb006885bf28f54084e2475f91bcc | 78 +++++++++---------- .../recipes/building_blocks/bamboo_block.json | 11 +-- .../recipes/building_blocks/bamboo_door.json | 11 +-- .../building_blocks/bamboo_dry_block.json | 11 +-- .../building_blocks/bamboo_dry_door.json | 11 +-- .../building_blocks/bamboo_dry_fence.json | 11 +-- .../bamboo_dry_fence_gate.json | 11 +-- .../building_blocks/bamboo_dry_ladder.json | 11 +-- .../building_blocks/bamboo_dry_slab.json | 11 +-- .../building_blocks/bamboo_dry_stairs.json | 11 +-- .../building_blocks/bamboo_dry_torch.json | 11 +-- .../building_blocks/bamboo_dry_trapdoor.json | 11 +-- .../recipes/building_blocks/bamboo_fence.json | 11 +-- .../building_blocks/bamboo_fence_gate.json | 11 +-- .../building_blocks/bamboo_ladder.json | 11 +-- .../recipes/building_blocks/bamboo_slab.json | 11 +-- .../building_blocks/bamboo_stairs.json | 11 +-- .../recipes/building_blocks/bamboo_torch.json | 11 +-- .../building_blocks/bamboo_trapdoor.json | 11 +-- .../recipes/misc/dry_bamboo.json | 11 +-- .../{recipes => recipe}/bamboo_block.json | 6 +- .../{recipes => recipe}/bamboo_door.json | 6 +- .../{recipes => recipe}/bamboo_dry_block.json | 6 +- .../{recipes => recipe}/bamboo_dry_door.json | 6 +- .../{recipes => recipe}/bamboo_dry_fence.json | 6 +- .../bamboo_dry_fence_gate.json | 6 +- .../bamboo_dry_ladder.json | 6 +- .../{recipes => recipe}/bamboo_dry_slab.json | 6 +- .../bamboo_dry_stairs.json | 6 +- .../{recipes => recipe}/bamboo_dry_torch.json | 6 +- .../bamboo_dry_trapdoor.json | 6 +- .../{recipes => recipe}/bamboo_fence.json | 6 +- .../bamboo_fence_gate.json | 6 +- .../{recipes => recipe}/bamboo_ladder.json | 6 +- .../{recipes => recipe}/bamboo_slab.json | 6 +- .../{recipes => recipe}/bamboo_stairs.json | 6 +- .../{recipes => recipe}/bamboo_torch.json | 6 +- .../{recipes => recipe}/bamboo_trapdoor.json | 6 +- .../{recipes => recipe}/dry_bamboo.json | 4 +- .../tags/{blocks => block}/climbable.json | 0 .../tags/{blocks => block}/fence_gates.json | 0 .../tags/{blocks => block}/fences.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../tags/{blocks => block}/planks.json | 0 .../tags/{blocks => block}/wooden_doors.json | 0 .../tags/{blocks => block}/wooden_slabs.json | 0 .../tags/{blocks => block}/wooden_stairs.json | 0 .../{blocks => block}/wooden_trapdoors.json | 0 .../tags/{items => item}/fence_gates.json | 0 .../tags/{items => item}/fences.json | 0 .../tags/{items => item}/planks.json | 0 .../tags/{items => item}/wooden_doors.json | 0 .../tags/{items => item}/wooden_slabs.json | 0 .../tags/{items => item}/wooden_stairs.json | 0 .../{items => item}/wooden_trapdoors.json | 0 gradle.properties | 12 +-- 57 files changed, 197 insertions(+), 219 deletions(-) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_block.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_door.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_block.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_door.json (76%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_fence.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_fence_gate.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_ladder.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_slab.json (76%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_stairs.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_torch.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_dry_trapdoor.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_fence.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_fence_gate.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_ladder.json (76%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_slab.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_stairs.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_torch.json (76%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/building_blocks/bamboo_trapdoor.json (75%) rename common/src/generated/resources/data/bambooeverything/{advancements => advancement}/recipes/misc/dry_bamboo.json (76%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_block.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_door.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_block.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_door.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_fence.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_fence_gate.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_ladder.json (72%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_slab.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_stairs.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_torch.json (79%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_dry_trapdoor.json (55%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_fence.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_fence_gate.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_ladder.json (71%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_slab.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_stairs.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_torch.json (79%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/bamboo_trapdoor.json (56%) rename common/src/generated/resources/data/bambooeverything/{recipes => recipe}/dry_bamboo.json (72%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/climbable.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/fence_gates.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/fences.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/planks.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/wooden_doors.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/wooden_slabs.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/wooden_stairs.json (100%) rename common/src/main/resources/data/minecraft/tags/{blocks => block}/wooden_trapdoors.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/fence_gates.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/fences.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/planks.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/wooden_doors.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/wooden_slabs.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/wooden_stairs.json (100%) rename common/src/main/resources/data/minecraft/tags/{items => item}/wooden_trapdoors.json (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28ed737..5f0430b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## [21.0.2] + +- Fix fences not connecting +- Update fabric and neoforge versions + ## [21.0.0] - Update to 1.21 diff --git a/common/src/generated/resources/.cache/0b9fb7f4824fb006885bf28f54084e2475f91bcc b/common/src/generated/resources/.cache/0b9fb7f4824fb006885bf28f54084e2475f91bcc index 4353d5f..72155c6 100644 --- a/common/src/generated/resources/.cache/0b9fb7f4824fb006885bf28f54084e2475f91bcc +++ b/common/src/generated/resources/.cache/0b9fb7f4824fb006885bf28f54084e2475f91bcc @@ -1,39 +1,39 @@ -// 1.20.1 2023-06-14T15:43:39.5034781 Bamboo Everything/Recipes -155805a15051079dca20d6215760e46d4717685d data\bambooeverything\advancements\recipes\misc\dry_bamboo.json -857a149a5ad149290e7d64d3007cd4d2f5dc7637 data\bambooeverything\advancements\recipes\building_blocks\bamboo_block.json -a88f3d4c90be00e31e7539e4181c277322d4e4a2 data\bambooeverything\recipes\bamboo_fence_gate.json -1e446d060dc6897ddd748f9f1a7c3d609c58c513 data\bambooeverything\recipes\bamboo_dry_door.json -af616ecc5c6b0b07fd1df1dbeb29a3934b39c07c data\bambooeverything\recipes\bamboo_dry_slab.json -337c5f2e3ca6ebcf0ef120e1ab0cba777b5cd92b data\bambooeverything\recipes\bamboo_dry_fence_gate.json -85aacb222efd654edfe01ff0bce7ee65ef4e167e data\bambooeverything\recipes\bamboo_slab.json -ab74741e73461e78f9ee35710047594dd1e4ac9f data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_ladder.json -be8c0fe3e6a1616a3737442bcc970a271b8d2a3a data\bambooeverything\recipes\bamboo_trapdoor.json -c1ea1d1daf1fb7e8f94a7ed7abedd7d4549e8a6c data\bambooeverything\recipes\bamboo_dry_torch.json -6101759b31ca8e67849356b7633432fc1312f5eb data\bambooeverything\recipes\bamboo_dry_fence.json -2ad4ed59d057391e9ae5f9a7ed86bcb49b2042c5 data\bambooeverything\recipes\bamboo_block.json -81fdea8222d9f591bbb39fc83910110d6a73280c data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_block.json -2fb4770c954d7862621b73cd095bee7c6ae57280 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_slab.json -4ccf40cbb8a1d10c7f3e5963aaab91e617352684 data\bambooeverything\recipes\bamboo_dry_trapdoor.json -a494d4678723616950255e94e8ec4819097656f4 data\bambooeverything\advancements\recipes\building_blocks\bamboo_torch.json -0d753ccdfba3accbded3254b9a136781438f90d0 data\bambooeverything\advancements\recipes\building_blocks\bamboo_fence_gate.json -832a219048d5d714c04f3a44999a097afc4fe42a data\bambooeverything\recipes\bamboo_dry_block.json -6f6253e49f31637747dfa29ef9ea1ac80dbb0370 data\bambooeverything\recipes\bamboo_dry_stairs.json -29a7bacf53dbfa40cf4018bd1e5b8054a3c87412 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_stairs.json -f0ca67db40dd705bc04b7d2fb11ca71354166730 data\bambooeverything\recipes\bamboo_fence.json -c69c30fec4ec824702286df5e0cc48f9b95e1f96 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_fence.json -2a17dc35e2c9197260d752c8efe646aed878e196 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_torch.json -6853d8d5f010ce341ccb78594da909d6d56ddac5 data\bambooeverything\recipes\bamboo_torch.json -c9844eb877c3ad5acb8862b0443c14bb953252f2 data\bambooeverything\advancements\recipes\building_blocks\bamboo_slab.json -743e1a88f666384330433fb25ea373a55c3e7529 data\bambooeverything\recipes\bamboo_ladder.json -d66c6d99ca436f17fed091caf9680e3e3f963b9d data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_door.json -a895719d86b01dc59a98b708f798610763b598cf data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_trapdoor.json -3601145bc76caf49c170d8f9d42ac6201146dcba data\bambooeverything\recipes\dry_bamboo.json -85cc42917921c83192aef10dcc7c8991898eea16 data\bambooeverything\advancements\recipes\building_blocks\bamboo_trapdoor.json -9094b8193a4edce48d9d98fb7e2013e28156796e data\bambooeverything\recipes\bamboo_stairs.json -85393c737794e7e1a79a340083ff862a7c8b75e8 data\bambooeverything\advancements\recipes\building_blocks\bamboo_ladder.json -bf0b6a18ea31205e3d50f92d51ca4423a5f749b5 data\bambooeverything\advancements\recipes\building_blocks\bamboo_dry_fence_gate.json -ca270b94ee38583ec64553164ee14f6b9c16a075 data\bambooeverything\advancements\recipes\building_blocks\bamboo_door.json -ab369c8b45a08ed9be33953b6c1b55acd0503891 data\bambooeverything\recipes\bamboo_door.json -f37f49e933d5840e09336c34626d78210b0b1c11 data\bambooeverything\advancements\recipes\building_blocks\bamboo_fence.json -da6970de49afd1191947a9e77c4ca3db00301dc5 data\bambooeverything\advancements\recipes\building_blocks\bamboo_stairs.json -3c4946855525d88b831a4941b2ee7d5b507c879f data\bambooeverything\recipes\bamboo_dry_ladder.json +// 1.21 2024-07-13T18:26:31.3785665 Bamboo Everything/Recipes +8b00f0e60fc203b51d00f644ba6cb83f0fd90f07 data\bambooeverything\advancement\recipes\building_blocks\bamboo_slab.json +050c938d7b507d3344a18f2319c68839577686c2 data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_torch.json +bd416d2dffbd73a14e7d08d68ae28364e443a390 data\bambooeverything\recipe\bamboo_dry_ladder.json +6251d83b1fc036ee6ea1d1b02f34d63bf0dae5ea data\bambooeverything\recipe\bamboo_stairs.json +41ccd851481d954dab9005591c5bbc73e94c5619 data\bambooeverything\recipe\bamboo_fence_gate.json +1aee42a744eec78b6b55cd8d386a749182329432 data\bambooeverything\recipe\bamboo_dry_fence.json +2a7f7defe74a82ba610cc403384adf3c66a9b78d data\bambooeverything\advancement\recipes\building_blocks\bamboo_fence.json +d277b2137a982ee5bce508b0dbaab3acd208b7b8 data\bambooeverything\advancement\recipes\building_blocks\bamboo_ladder.json +bc2962501625992c2dae2364c0a2edb5e8156471 data\bambooeverything\advancement\recipes\building_blocks\bamboo_trapdoor.json +fcaa86443f24114494ecc7491632cb20ccf7809a data\bambooeverything\recipe\bamboo_trapdoor.json +0f67012cdd8bfb96a0886e5f9742c25c48c9d637 data\bambooeverything\advancement\recipes\misc\dry_bamboo.json +101f16d981a59244a10ac6f1234e9882a44687ee data\bambooeverything\recipe\bamboo_dry_torch.json +befe33d25e8154d180188d170b3ddc919ceb2d4b data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_stairs.json +7ca3a11c8e75e1f704958d5d4eaae304a1abf61d data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_trapdoor.json +c9593e40b74e66f2546b18d80b92b5f8009bc2a5 data\bambooeverything\recipe\bamboo_torch.json +8ff9313f1aff3cdddadeb3f0183761acf0af18f4 data\bambooeverything\recipe\bamboo_dry_fence_gate.json +890769795c70019072556b740b3acbd020188fb5 data\bambooeverything\recipe\bamboo_slab.json +2e72b0023a6a406dc88eef29a20c60ae6407465c data\bambooeverything\recipe\bamboo_fence.json +24e29366b22fe77a937f76451569403752b39eee data\bambooeverything\recipe\bamboo_door.json +40b8ed4a110a97f764692aa04d6a45161e8c56b6 data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_fence_gate.json +8f716c1529139dbcae4f56805f47116658527f2c data\bambooeverything\recipe\bamboo_ladder.json +ea386de6fb77cf11da0b2b6d50e59025bc71dabc data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_ladder.json +d45e979f066f73247ba937b2ecd2a0f5e0388de2 data\bambooeverything\recipe\bamboo_dry_block.json +5aba1444f49228d6f6a7383e3707dc4271a5555b data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_slab.json +459111f87c51fa149195d2f9780b688023328121 data\bambooeverything\recipe\bamboo_dry_door.json +31ce90aacfa775636bdc27d8127b7e4a6deb902b data\bambooeverything\recipe\bamboo_block.json +4232e671f4b71ab24003f8ad4898edc93df84e20 data\bambooeverything\advancement\recipes\building_blocks\bamboo_torch.json +456f3e11217e09af4c74154a707ea50dc4dc70bb data\bambooeverything\recipe\dry_bamboo.json +18ee9568a6f61b8fa9c5db05acecf6872c589f0a data\bambooeverything\advancement\recipes\building_blocks\bamboo_block.json +6c04828d3c10140ec0ee259c278d2f1fc98991ff data\bambooeverything\advancement\recipes\building_blocks\bamboo_stairs.json +ce5570c2f5697a737f0cb6236bc51209c1839afd data\bambooeverything\recipe\bamboo_dry_stairs.json +7f486e29b1a462a16557372bb8627c59c3fad60f data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_block.json +75eae8a3819bbfac6234c436bffd2befd9469629 data\bambooeverything\recipe\bamboo_dry_trapdoor.json +3a4bac6b2a88dd28cd60c0d952285fe6266deb6f data\bambooeverything\advancement\recipes\building_blocks\bamboo_fence_gate.json +9ea466c3fad408a9476a3f3abb09cdae8620bbb7 data\bambooeverything\recipe\bamboo_dry_slab.json +879cc691ab844f39516e5308e9717c4af0d21a8c data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_fence.json +c83a8180b7f47cb4bce7f61626c0b26b48b40157 data\bambooeverything\advancement\recipes\building_blocks\bamboo_dry_door.json +74099a6236eaec077469d0c09785af7210454015 data\bambooeverything\advancement\recipes\building_blocks\bamboo_door.json diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_block.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_block.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_block.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_block.json index 747a6b1..3eed3f9 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_block.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_block" - ] + "items": "minecraft:bamboo_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_door.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_door.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_door.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_door.json index 3a98176..3bbc3a1 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_door.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_door.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_door" - ] + "items": "minecraft:bamboo_door" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_block.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_block.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_block.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_block.json index 13b2376..7767685 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_block.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_block.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_block" - ] + "items": "minecraft:bamboo_block" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_block" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_door.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_door.json similarity index 76% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_door.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_door.json index 50feccd..07e3bcd 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_door.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_door.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_door" - ] + "items": "minecraft:bamboo_door" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_door" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_fence.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_fence.json index 574e9f1..abb44e6 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_fence.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_fence" - ] + "items": "minecraft:bamboo_fence" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence_gate.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_fence_gate.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence_gate.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_fence_gate.json index 2374f16..7054c2b 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_fence_gate.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_fence_gate.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_fence_gate" - ] + "items": "minecraft:bamboo_fence_gate" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_ladder.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_ladder.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_ladder.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_ladder.json index 27136a7..ffe6610 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_ladder.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_ladder.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "bambooeverything:dry_bamboo" - ] + "items": "bambooeverything:dry_bamboo" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_slab.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_slab.json similarity index 76% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_slab.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_slab.json index 2b4bfcf..069920c 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_slab.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_slab.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_slab" - ] + "items": "minecraft:bamboo_slab" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_stairs.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_stairs.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_stairs.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_stairs.json index 233e16d..6f59172 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_stairs.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_stairs.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_stairs" - ] + "items": "minecraft:bamboo_stairs" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_torch.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_torch.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_torch.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_torch.json index f3e3541..788be6a 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_torch.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_torch.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "bambooeverything:dry_bamboo" - ] + "items": "bambooeverything:dry_bamboo" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_torch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_trapdoor.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_trapdoor.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_trapdoor.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_trapdoor.json index d895cf2..0314be9 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_dry_trapdoor.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_dry_trapdoor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_trapdoor" - ] + "items": "minecraft:bamboo_trapdoor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_dry_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_fence.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_fence.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_fence.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_fence.json index 5a387bc..cf7fc7d 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_fence.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_fence.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_fence" - ] + "items": "minecraft:bamboo_fence" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_fence" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_fence_gate.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_fence_gate.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_fence_gate.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_fence_gate.json index 9ed565e..311985a 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_fence_gate.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_fence_gate.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_fence_gate" - ] + "items": "minecraft:bamboo_fence_gate" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_fence_gate" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_ladder.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_ladder.json similarity index 76% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_ladder.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_ladder.json index 2f9e6c3..d32566f 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_ladder.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_ladder.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo" - ] + "items": "minecraft:bamboo" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_ladder" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_slab.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_slab.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_slab.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_slab.json index 054f490..6b6ae08 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_slab.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_slab.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_slab" - ] + "items": "minecraft:bamboo_slab" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_slab" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_stairs.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_stairs.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_stairs.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_stairs.json index 9580ae5..96fba9e 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_stairs.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_stairs.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_stairs" - ] + "items": "minecraft:bamboo_stairs" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_stairs" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_torch.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_torch.json similarity index 76% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_torch.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_torch.json index c9284e8..584897b 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_torch.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_torch.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo" - ] + "items": "minecraft:bamboo" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_torch" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_trapdoor.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_trapdoor.json similarity index 75% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_trapdoor.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_trapdoor.json index 481d0e0..8dea07c 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/building_blocks/bamboo_trapdoor.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/building_blocks/bamboo_trapdoor.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo_trapdoor" - ] + "items": "minecraft:bamboo_trapdoor" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:bamboo_trapdoor" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/advancements/recipes/misc/dry_bamboo.json b/common/src/generated/resources/data/bambooeverything/advancement/recipes/misc/dry_bamboo.json similarity index 76% rename from common/src/generated/resources/data/bambooeverything/advancements/recipes/misc/dry_bamboo.json rename to common/src/generated/resources/data/bambooeverything/advancement/recipes/misc/dry_bamboo.json index ad08849..e810b2b 100644 --- a/common/src/generated/resources/data/bambooeverything/advancements/recipes/misc/dry_bamboo.json +++ b/common/src/generated/resources/data/bambooeverything/advancement/recipes/misc/dry_bamboo.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:bamboo" - ] + "items": "minecraft:bamboo" } ] }, @@ -22,14 +20,13 @@ }, "requirements": [ [ - "has_bamboo", - "has_the_recipe" + "has_the_recipe", + "has_bamboo" ] ], "rewards": { "recipes": [ "bambooeverything:dry_bamboo" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_block.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_block.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_block.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_block.json index 0bb6e5b..273405f 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_block.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_block.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_block" }, - "result": "bambooeverything:bamboo_bundle" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_bundle" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_door.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_door.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_door.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_door.json index 7bede72..5010546 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_door.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_door.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_door" }, - "result": "bambooeverything:bamboo_door" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_door" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_block.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_block.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_block.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_block.json index 61c3a4d..ca77614 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_block.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_block.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_block" }, - "result": "bambooeverything:dry_bamboo_bundle" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_bundle" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_door.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_door.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_door.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_door.json index 8a3efc1..9b3818d 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_door.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_door.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_door" }, - "result": "bambooeverything:dry_bamboo_door" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_door" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_fence.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_fence.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_fence.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_fence.json index e3e82f6..4ae5047 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_fence.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_fence.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_fence" }, - "result": "bambooeverything:dry_bamboo_fence" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_fence" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_fence_gate.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_fence_gate.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_fence_gate.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_fence_gate.json index 8aeb840..555d110 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_fence_gate.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_fence_gate.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_fence_gate" }, - "result": "bambooeverything:dry_bamboo_fence_gate" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_fence_gate" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_ladder.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_ladder.json similarity index 72% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_ladder.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_ladder.json index a9a81b6..c2d0aa3 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_ladder.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_ladder.json @@ -12,7 +12,7 @@ "B B" ], "result": { - "item": "bambooeverything:dry_bamboo_ladder" - }, - "show_notification": true + "count": 1, + "id": "bambooeverything:dry_bamboo_ladder" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_slab.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_slab.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_slab.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_slab.json index 9e3987f..13256d3 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_slab.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_slab.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_slab" }, - "result": "bambooeverything:dry_bamboo_slab" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_slab" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_stairs.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_stairs.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_stairs.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_stairs.json index 5015f87..6602f03 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_stairs.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_stairs.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_stairs" }, - "result": "bambooeverything:dry_bamboo_stairs" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_stairs" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_torch.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_torch.json similarity index 79% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_torch.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_torch.json index b70d32b..13a4ef1 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_torch.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_torch.json @@ -19,7 +19,7 @@ "B" ], "result": { - "item": "bambooeverything:dry_bamboo_torch" - }, - "show_notification": true + "count": 1, + "id": "bambooeverything:dry_bamboo_torch" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_trapdoor.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_trapdoor.json similarity index 55% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_trapdoor.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_trapdoor.json index b393d4b..5e4edaa 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_dry_trapdoor.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_dry_trapdoor.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_trapdoor" }, - "result": "bambooeverything:dry_bamboo_trapdoor" + "result": { + "count": 1, + "id": "bambooeverything:dry_bamboo_trapdoor" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_fence.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_fence.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_fence.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_fence.json index 310fb15..34e5df7 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_fence.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_fence.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_fence" }, - "result": "bambooeverything:bamboo_fence" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_fence" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_fence_gate.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_fence_gate.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_fence_gate.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_fence_gate.json index ee88510..3711a2d 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_fence_gate.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_fence_gate.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_fence_gate" }, - "result": "bambooeverything:bamboo_fence_gate" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_fence_gate" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_ladder.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_ladder.json similarity index 71% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_ladder.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_ladder.json index 8a8a276..8a1a717 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_ladder.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_ladder.json @@ -12,7 +12,7 @@ "B B" ], "result": { - "item": "bambooeverything:bamboo_ladder" - }, - "show_notification": true + "count": 1, + "id": "bambooeverything:bamboo_ladder" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_slab.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_slab.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_slab.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_slab.json index 0d0bd65..87f8410 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_slab.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_slab.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_slab" }, - "result": "bambooeverything:bamboo_slab" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_slab" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_stairs.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_stairs.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_stairs.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_stairs.json index 610bf96..0f562a6 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_stairs.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_stairs.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_stairs" }, - "result": "bambooeverything:bamboo_stairs" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_stairs" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_torch.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_torch.json similarity index 79% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_torch.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_torch.json index 4daba92..13d6d8c 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_torch.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_torch.json @@ -19,7 +19,7 @@ "B" ], "result": { - "item": "bambooeverything:bamboo_torch" - }, - "show_notification": true + "count": 1, + "id": "bambooeverything:bamboo_torch" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_trapdoor.json b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_trapdoor.json similarity index 56% rename from common/src/generated/resources/data/bambooeverything/recipes/bamboo_trapdoor.json rename to common/src/generated/resources/data/bambooeverything/recipe/bamboo_trapdoor.json index d7b7cb0..1c5e2ff 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/bamboo_trapdoor.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/bamboo_trapdoor.json @@ -1,8 +1,10 @@ { "type": "minecraft:stonecutting", - "count": 1, "ingredient": { "item": "minecraft:bamboo_trapdoor" }, - "result": "bambooeverything:bamboo_trapdoor" + "result": { + "count": 1, + "id": "bambooeverything:bamboo_trapdoor" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/bambooeverything/recipes/dry_bamboo.json b/common/src/generated/resources/data/bambooeverything/recipe/dry_bamboo.json similarity index 72% rename from common/src/generated/resources/data/bambooeverything/recipes/dry_bamboo.json rename to common/src/generated/resources/data/bambooeverything/recipe/dry_bamboo.json index 9544589..a3a40fc 100644 --- a/common/src/generated/resources/data/bambooeverything/recipes/dry_bamboo.json +++ b/common/src/generated/resources/data/bambooeverything/recipe/dry_bamboo.json @@ -6,5 +6,7 @@ "ingredient": { "item": "minecraft:bamboo" }, - "result": "bambooeverything:dry_bamboo" + "result": { + "id": "bambooeverything:dry_bamboo" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/blocks/climbable.json b/common/src/main/resources/data/minecraft/tags/block/climbable.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/climbable.json rename to common/src/main/resources/data/minecraft/tags/block/climbable.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/fence_gates.json b/common/src/main/resources/data/minecraft/tags/block/fence_gates.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/fence_gates.json rename to common/src/main/resources/data/minecraft/tags/block/fence_gates.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/fences.json b/common/src/main/resources/data/minecraft/tags/block/fences.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/fences.json rename to common/src/main/resources/data/minecraft/tags/block/fences.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to common/src/main/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/planks.json b/common/src/main/resources/data/minecraft/tags/block/planks.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/planks.json rename to common/src/main/resources/data/minecraft/tags/block/planks.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/common/src/main/resources/data/minecraft/tags/block/wooden_doors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json rename to common/src/main/resources/data/minecraft/tags/block/wooden_doors.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/common/src/main/resources/data/minecraft/tags/block/wooden_slabs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json rename to common/src/main/resources/data/minecraft/tags/block/wooden_slabs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/common/src/main/resources/data/minecraft/tags/block/wooden_stairs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json rename to common/src/main/resources/data/minecraft/tags/block/wooden_stairs.json diff --git a/common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/common/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json rename to common/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json diff --git a/common/src/main/resources/data/minecraft/tags/items/fence_gates.json b/common/src/main/resources/data/minecraft/tags/item/fence_gates.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/fence_gates.json rename to common/src/main/resources/data/minecraft/tags/item/fence_gates.json diff --git a/common/src/main/resources/data/minecraft/tags/items/fences.json b/common/src/main/resources/data/minecraft/tags/item/fences.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/fences.json rename to common/src/main/resources/data/minecraft/tags/item/fences.json diff --git a/common/src/main/resources/data/minecraft/tags/items/planks.json b/common/src/main/resources/data/minecraft/tags/item/planks.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/planks.json rename to common/src/main/resources/data/minecraft/tags/item/planks.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/common/src/main/resources/data/minecraft/tags/item/wooden_doors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/wooden_doors.json rename to common/src/main/resources/data/minecraft/tags/item/wooden_doors.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/common/src/main/resources/data/minecraft/tags/item/wooden_slabs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/wooden_slabs.json rename to common/src/main/resources/data/minecraft/tags/item/wooden_slabs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/common/src/main/resources/data/minecraft/tags/item/wooden_stairs.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/wooden_stairs.json rename to common/src/main/resources/data/minecraft/tags/item/wooden_stairs.json diff --git a/common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json b/common/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json rename to common/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json diff --git a/gradle.properties b/gradle.properties index cca3e35..ab3e7e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ minecraft_version=1.21 enabled_platforms=fabric,neoforge archives_base_name=BambooEverything -mod_version=21.0.1 +mod_version=21.0.2 maven_group=dev.wuffs -architectury_version=13.0.1 +architectury_version=13.0.4 -fabric_loader_version=0.15.11 -fabric_api_version=0.100.2+1.21 +fabric_loader_version=0.16.0 +fabric_api_version=0.100.6+1.21 # Neo -neo_version=21.0.14-beta -neo_gradle=[7.0.143,) +neo_version=21.0.87-beta +neo_gradle=[7.0.154,) # Publishing curseforge_id=331723