From 45c07c6f77e73d6cbd2eb5374ff8965e21c4f405 Mon Sep 17 00:00:00 2001 From: Hugo Landrin Date: Sun, 21 Jul 2024 11:52:57 +0200 Subject: [PATCH] Update to 1.21 --- build.gradle | 2 +- gradle.properties | 8 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../java/fr/hugman/promenade/Promenade.java | 3 - .../fr/hugman/promenade/PromenadeClient.java | 4 +- .../fr/hugman/promenade/PromenadeFactory.java | 24 +---- .../promenade/block/DecoratedLeavesBlock.java | 2 +- .../promenade/block/PromenadeBlocks.java | 38 ++++---- .../entity/LushCreeperOverlayRenderer.java | 4 +- .../render/entity/model/CapybaraModel.java | 6 +- .../promenade/entity/CapybaraBrain.java | 2 +- .../hugman/promenade/entity/SunkenEntity.java | 9 +- .../PromenadePaintingVariantKeys.java | 16 ---- .../painting/PromenadePaintingVariants.java | 12 --- .../promenade/particle/FloatingParticle.java | 1 + .../data/c/tags/{blocks => block}/bushes.json | 0 .../tags/{blocks => block}/igneous_rocks.json | 0 .../c/tags/{blocks => block}/saplings.json | 0 .../tags/{blocks => block}/stripped_logs.json | 0 .../{blocks => block}/stripped_woods.json | 0 .../animals.json | 0 .../animals/birds.json | 0 .../animals/rodents.json | 0 .../monsters.json | 0 .../monsters/creepers.json | 0 .../monsters/skeletons.json | 0 .../data/c/tags/{items => item}/foods.json | 0 .../data/c/tags/{items => item}/fruits.json | 0 .../tags/{items => item}/fruits/apricots.json | 0 .../tags/{items => item}/fruits/bananas.json | 0 .../{items => item}/fruits/blueberries.json | 0 .../c/tags/{items => item}/fruits/mangos.json | 0 .../c/tags/{items => item}/igneous_rocks.json | 0 .../data/c/tags/{items => item}/saplings.json | 0 .../c/tags/{items => item}/stripped_logs.json | 0 .../tags/{items => item}/stripped_woods.json | 0 .../base_stone_overworld.json | 0 .../tags/{blocks => block}/bee_growables.json | 0 .../ceiling_hanging_signs.json | 0 .../tags/{blocks => block}/dirt.json | 0 .../{blocks => block}/enderman_holdable.json | 0 .../tags/{blocks => block}/fence_gates.json | 0 .../tags/{blocks => block}/flower_pots.json | 0 .../tags/{blocks => block}/flowers.json | 0 .../tags/{blocks => block}/leaves.json | 0 .../tags/{blocks => block}/logs.json | 0 .../{blocks => block}/logs_that_burn.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../tags/{blocks => block}/mineable/hoe.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../{blocks => block}/mineable/shovel.json | 0 .../tags/{blocks => block}/planks.json | 0 .../replaceable_by_trees.json | 0 .../tags/{blocks => block}/saplings.json | 0 .../tags/{blocks => block}/slabs.json | 0 .../tags/{blocks => block}/stairs.json | 0 .../{blocks => block}/standing_signs.json | 0 .../stone_ore_replaceables.json | 0 .../tags/{blocks => block}/stripped_logs.json | 0 .../{blocks => block}/sword_efficient.json | 0 .../{blocks => block}/wall_hanging_signs.json | 0 .../{blocks => block}/wall_post_override.json | 0 .../tags/{blocks => block}/wall_signs.json | 0 .../tags/{blocks => block}/walls.json | 0 .../tags/{blocks => block}/wart_blocks.json | 0 .../{blocks => block}/wooden_buttons.json | 0 .../tags/{blocks => block}/wooden_doors.json | 0 .../tags/{blocks => block}/wooden_fences.json | 0 .../wooden_pressure_plates.json | 0 .../tags/{blocks => block}/wooden_slabs.json | 0 .../tags/{blocks => block}/wooden_stairs.json | 0 .../{blocks => block}/wooden_trapdoors.json | 0 .../axolotl_always_hostiles.json | 0 .../fall_damage_immune.json | 0 .../freeze_immune_entity_types.json | 0 .../skeletons.json | 0 .../minecraft/tags/{items => item}/boats.json | 0 .../tags/{items => item}/chest_boats.json | 0 .../tags/{items => item}/flowers.json | 0 .../tags/{items => item}/fox_food.json | 0 .../tags/{items => item}/hanging_signs.json | 0 .../tags/{items => item}/leaves.json | 0 .../minecraft/tags/{items => item}/logs.json | 0 .../tags/{items => item}/logs_that_burn.json | 0 .../minecraft/tags/{items => item}/meat.json | 0 .../{items => item}/non_flammable_wood.json | 0 .../tags/{items => item}/planks.json | 0 .../tags/{items => item}/saplings.json | 0 .../minecraft/tags/{items => item}/signs.json | 0 .../minecraft/tags/{items => item}/slabs.json | 0 .../tags/{items => item}/stairs.json | 0 .../stone_crafting_materials.json | 0 .../{items => item}/stone_tool_materials.json | 0 .../tags/{items => item}/stripped_logs.json | 0 .../minecraft/tags/{items => item}/walls.json | 0 .../tags/{items => item}/wart_blocks.json | 0 .../tags/{items => item}/wooden_buttons.json | 0 .../tags/{items => item}/wooden_doors.json | 0 .../tags/{items => item}/wooden_fences.json | 0 .../wooden_pressure_plates.json | 0 .../tags/{items => item}/wooden_slabs.json | 0 .../tags/{items => item}/wooden_stairs.json | 0 .../{items => item}/wooden_trapdoors.json | 0 .../adventure/kill_sunken_outside_water.json | 0 .../husbandry/harvest_maple_syrup.json | 0 .../recipes/campfire_cooking/cooked_duck.json | 0 .../crafting/asphalt/polished_block.json | 0 .../crafting/asphalt/polished_slab.json | 0 .../crafting/asphalt/polished_stairs.json | 0 .../recipes/crafting/asphalt/slab.json | 0 .../recipes/crafting/asphalt/stairs.json | 0 .../recipes/crafting/asphalt/wall.json | 0 .../crafting/blue_dye_from_blueberries.json | 0 .../crafting/blunite/polished_block.json | 0 .../crafting/blunite/polished_slab.json | 0 .../crafting/blunite/polished_stairs.json | 0 .../recipes/crafting/blunite/slab.json | 0 .../recipes/crafting/blunite/stairs.json | 0 .../recipes/crafting/blunite/wall.json | 0 .../crafting/dark_amaranth/button.json | 0 .../recipes/crafting/dark_amaranth/door.json | 0 .../recipes/crafting/dark_amaranth/fence.json | 0 .../crafting/dark_amaranth/fence_gate.json | 0 .../crafting/dark_amaranth/hanging_sign.json | 0 .../crafting/dark_amaranth/hyphae.json | 0 .../crafting/dark_amaranth/planks.json | 0 .../dark_amaranth/pressure_plate.json | 0 .../recipes/crafting/dark_amaranth/sign.json | 0 .../recipes/crafting/dark_amaranth/slab.json | 0 .../crafting/dark_amaranth/stairs.json | 0 .../crafting/dark_amaranth/trapdoor.json | 0 .../recipes/crafting/maple/boat.json | 0 .../recipes/crafting/maple/button.json | 0 .../recipes/crafting/maple/chest_boat.json | 0 .../recipes/crafting/maple/door.json | 0 .../recipes/crafting/maple/fence.json | 0 .../recipes/crafting/maple/fence_gate.json | 0 .../recipes/crafting/maple/hanging_sign.json | 0 .../crafting/maple/leaf_pile/fulvous.json | 0 .../crafting/maple/leaf_pile/mikado.json | 0 .../recipes/crafting/maple/leaf_pile/sap.json | 0 .../crafting/maple/leaf_pile/vermilion.json | 0 .../recipes/crafting/maple/planks.json | 0 .../crafting/maple/pressure_plate.json | 0 .../recipes/crafting/maple/sign.json | 0 .../recipes/crafting/maple/slab.json | 0 .../recipes/crafting/maple/stairs.json | 0 .../recipes/crafting/maple/trapdoor.json | 0 .../recipes/crafting/maple/wood.json | 0 .../recipes/crafting/palm/boat.json | 0 .../recipes/crafting/palm/button.json | 0 .../recipes/crafting/palm/chest_boat.json | 0 .../recipes/crafting/palm/door.json | 0 .../recipes/crafting/palm/fence.json | 0 .../recipes/crafting/palm/fence_gate.json | 0 .../recipes/crafting/palm/hanging_sign.json | 0 .../recipes/crafting/palm/leaf_pile.json | 0 .../recipes/crafting/palm/planks.json | 0 .../recipes/crafting/palm/pressure_plate.json | 0 .../recipes/crafting/palm/sign.json | 0 .../recipes/crafting/palm/slab.json | 0 .../recipes/crafting/palm/stairs.json | 0 .../recipes/crafting/palm/trapdoor.json | 0 .../recipes/crafting/palm/wood.json | 0 .../crafting/sakura/blossom_pile/blush.json | 0 .../crafting/sakura/blossom_pile/cotton.json | 0 .../recipes/crafting/sakura/boat.json | 0 .../recipes/crafting/sakura/button.json | 0 .../recipes/crafting/sakura/chest_boat.json | 0 .../recipes/crafting/sakura/door.json | 0 .../recipes/crafting/sakura/fence.json | 0 .../recipes/crafting/sakura/fence_gate.json | 0 .../recipes/crafting/sakura/hanging_sign.json | 0 .../recipes/crafting/sakura/planks.json | 0 .../crafting/sakura/pressure_plate.json | 0 .../recipes/crafting/sakura/sign.json | 0 .../recipes/crafting/sakura/slab.json | 0 .../recipes/crafting/sakura/stairs.json | 0 .../recipes/crafting/sakura/trapdoor.json | 0 .../recipes/crafting/sakura/wood.json | 0 .../crafting/vanilla_piles/acacia_leaf.json | 0 .../crafting/vanilla_piles/allium.json | 0 .../crafting/vanilla_piles/azalea_leaf.json | 0 .../crafting/vanilla_piles/azure_bluet.json | 0 .../crafting/vanilla_piles/birch_leaf.json | 0 .../crafting/vanilla_piles/blue_orchid.json | 0 .../crafting/vanilla_piles/cornflower.json | 0 .../crafting/vanilla_piles/dandelion.json | 0 .../crafting/vanilla_piles/dark_oak_leaf.json | 0 .../vanilla_piles/flowering_azalea_leaf.json | 0 .../crafting/vanilla_piles/jungle_leaf.json | 0 .../vanilla_piles/lily_of_the_valley.json | 0 .../crafting/vanilla_piles/mangrove_leaf.json | 0 .../crafting/vanilla_piles/oak_leaf.json | 0 .../crafting/vanilla_piles/orange_tulip.json | 0 .../crafting/vanilla_piles/oxeye_daisy.json | 0 .../crafting/vanilla_piles/pink_tulip.json | 0 .../recipes/crafting/vanilla_piles/poppy.json | 0 .../crafting/vanilla_piles/red_tulip.json | 0 .../crafting/vanilla_piles/spruce_leaf.json | 0 .../crafting/vanilla_piles/white_tulip.json | 0 .../crafting/vanilla_piles/wither_rose.json | 0 .../crafting/vanilla_snowy_leaves/spruce.json | 0 .../recipes/smoking/cooked_duck.json | 0 .../stonecutting/asphalt/polished_block.json | 0 .../stonecutting/asphalt/polished_slab.json | 0 .../stonecutting/asphalt/polished_stairs.json | 0 .../recipes/stonecutting/asphalt/slab.json | 0 .../recipes/stonecutting/asphalt/stairs.json | 0 .../recipes/stonecutting/asphalt/wall.json | 0 .../stonecutting/blunite/polished_block.json | 0 .../stonecutting/blunite/polished_slab.json | 0 .../stonecutting/blunite/polished_stairs.json | 0 .../recipes/stonecutting/blunite/slab.json | 0 .../recipes/stonecutting/blunite/stairs.json | 0 .../recipes/stonecutting/blunite/wall.json | 0 .../recipes/stonecutting/moai.json | 0 .../blocks/acacia_leaf_pile.json | 0 .../blocks/allium_pile.json | 0 .../blocks/asphalt.json | 0 .../blocks/asphalt_slab.json | 0 .../blocks/asphalt_stairs.json | 0 .../blocks/asphalt_wall.json | 0 .../blocks/azalea_leaf_pile.json | 0 .../blocks/azure_bluet_pile.json | 0 .../blocks/birch_leaf_pile.json | 0 .../blocks/black_dylium.json | 0 .../blocks/blue_orchid_pile.json | 0 .../blocks/blueberry_bush.json | 0 .../blocks/blunite.json | 0 .../blocks/blunite_slab.json | 0 .../blocks/blunite_stairs.json | 0 .../blocks/blunite_wall.json | 0 .../blocks/blush_sakura_blossom_pile.json | 0 .../blocks/blush_sakura_blossoms.json | 0 .../blocks/blush_sakura_sapling.json | 0 .../blocks/cornflower_pile.json | 0 .../blocks/cotton_sakura_blossom_pile.json | 0 .../blocks/cotton_sakura_blossoms.json | 0 .../blocks/cotton_sakura_sapling.json | 0 .../blocks/dandelion_pile.json | 0 .../blocks/dark_amaranth_button.json | 0 .../blocks/dark_amaranth_door.json | 0 .../blocks/dark_amaranth_fence.json | 0 .../blocks/dark_amaranth_fence_gate.json | 0 .../blocks/dark_amaranth_fungus.json | 0 .../blocks/dark_amaranth_hanging_sign.json | 0 .../blocks/dark_amaranth_hyphae.json | 0 .../blocks/dark_amaranth_planks.json | 0 .../blocks/dark_amaranth_pressure_plate.json | 0 .../blocks/dark_amaranth_roots.json | 0 .../blocks/dark_amaranth_sign.json | 0 .../blocks/dark_amaranth_slab.json | 0 .../blocks/dark_amaranth_stairs.json | 0 .../blocks/dark_amaranth_stem.json | 0 .../blocks/dark_amaranth_trapdoor.json | 0 .../dark_amaranth_wall_hanging_sign.json | 0 .../blocks/dark_amaranth_wall_sign.json | 0 .../blocks/dark_amaranth_wart_block.json | 0 .../blocks/dark_oak_leaf_pile.json | 0 .../blocks/flowering_azalea_leaf_pile.json | 0 .../blocks/fulvous_carpeted_grass_block.json | 0 .../blocks/fulvous_maple_leaf_pile.json | 0 .../blocks/fulvous_maple_leaves.json | 0 .../blocks/fulvous_maple_sapling.json | 0 .../blocks/jungle_leaf_pile.json | 0 .../blocks/lily_of_the_valley_pile.json | 0 .../blocks/mangrove_leaf_pile.json | 0 .../blocks/maple_button.json | 0 .../blocks/maple_door.json | 0 .../blocks/maple_fence.json | 0 .../blocks/maple_fence_gate.json | 0 .../blocks/maple_hanging_sign.json | 0 .../blocks/maple_log.json | 0 .../blocks/maple_planks.json | 0 .../blocks/maple_pressure_plate.json | 0 .../blocks/maple_sign.json | 0 .../blocks/maple_slab.json | 0 .../blocks/maple_stairs.json | 0 .../blocks/maple_trapdoor.json | 0 .../blocks/maple_wall_hanging_sign.json | 0 .../blocks/maple_wall_sign.json | 0 .../blocks/maple_wood.json | 0 .../blocks/mikado_carpeted_grass_block.json | 0 .../blocks/mikado_maple_leaf_pile.json | 0 .../blocks/mikado_maple_leaves.json | 0 .../blocks/mikado_maple_sapling.json | 0 .../blocks/moai.json | 0 .../blocks/oak_leaf_pile.json | 0 .../blocks/orange_tulip_pile.json | 0 .../blocks/oxeye_daisy_pile.json | 0 .../blocks/palm_button.json | 0 .../blocks/palm_door.json | 0 .../blocks/palm_fence.json | 0 .../blocks/palm_fence_gate.json | 0 .../blocks/palm_hanging_sign.json | 0 .../blocks/palm_leaf_pile.json | 0 .../blocks/palm_leaves.json | 0 .../blocks/palm_log.json | 0 .../blocks/palm_planks.json | 0 .../blocks/palm_pressure_plate.json | 0 .../blocks/palm_sapling.json | 0 .../blocks/palm_sign.json | 0 .../blocks/palm_slab.json | 0 .../blocks/palm_stairs.json | 0 .../blocks/palm_trapdoor.json | 0 .../blocks/palm_wall_hanging_sign.json | 0 .../blocks/palm_wall_sign.json | 0 .../blocks/palm_wood.json | 0 .../blocks/pink_tulip_pile.json | 0 .../blocks/polished_asphalt.json | 0 .../blocks/polished_asphalt_slab.json | 0 .../blocks/polished_asphalt_stairs.json | 0 .../blocks/polished_blunite.json | 0 .../blocks/polished_blunite_slab.json | 0 .../blocks/polished_blunite_stairs.json | 0 .../blocks/poppy_pile.json | 0 .../blocks/potted_blush_sakura_sapling.json | 0 .../blocks/potted_cotton_sakura_sapling.json | 0 .../blocks/potted_dark_amaranth_fungus.json | 0 .../blocks/potted_fulvous_maple_sapling.json | 0 .../blocks/potted_mikado_maple_sapling.json | 0 .../blocks/potted_palm_sapling.json | 0 .../blocks/potted_sap_maple_sapling.json | 0 .../potted_vermilion_maple_sapling.json | 0 .../blocks/red_tulip_pile.json | 0 .../blocks/sakura_button.json | 0 .../blocks/sakura_door.json | 0 .../blocks/sakura_fence.json | 0 .../blocks/sakura_fence_gate.json | 0 .../blocks/sakura_hanging_sign.json | 0 .../blocks/sakura_log.json | 0 .../blocks/sakura_planks.json | 0 .../blocks/sakura_pressure_plate.json | 0 .../blocks/sakura_sign.json | 0 .../blocks/sakura_slab.json | 0 .../blocks/sakura_stairs.json | 0 .../blocks/sakura_trapdoor.json | 0 .../blocks/sakura_wall_hanging_sign.json | 0 .../blocks/sakura_wall_sign.json | 0 .../blocks/sakura_wood.json | 0 .../blocks/sap_maple_leaf_pile.json | 0 .../blocks/sap_maple_leaves.json | 0 .../blocks/sap_maple_sapling.json | 0 .../blocks/snowy_spruce_leaves.json | 0 .../blocks/spruce_leaf_pile.json | 0 .../blocks/stripped_dark_amaranth_hyphae.json | 0 .../blocks/stripped_dark_amaranth_stem.json | 0 .../blocks/stripped_maple_log.json | 0 .../blocks/stripped_maple_wood.json | 0 .../blocks/stripped_palm_log.json | 0 .../blocks/stripped_palm_wood.json | 0 .../blocks/stripped_sakura_log.json | 0 .../blocks/stripped_sakura_wood.json | 0 .../vermilion_carpeted_grass_block.json | 0 .../blocks/vermilion_maple_leaf_pile.json | 0 .../blocks/vermilion_maple_leaves.json | 0 .../blocks/vermilion_maple_sapling.json | 0 .../blocks/white_tulip_pile.json | 0 .../blocks/wither_rose_pile.json | 0 .../chests/witch_hut.json | 0 .../promenade/loot_table/entities/duck.json | 89 ++++++++++++++++++ .../entities/lush_creeper.json | 11 ++- .../entities/sunken/bubble.json | 9 +- .../entities/sunken/fire.json | 9 +- .../entities/sunken/horn.json | 9 +- .../promenade/loot_tables/entities/duck.json | 65 ------------- .../promenade/painting_variant/nurture.json | 5 + .../promenade/painting_variant/optimism.json | 5 + .../campfire_cooking/cooked_duck.json | 0 .../crafting/asphalt/polished_block.json | 0 .../crafting/asphalt/polished_slab.json | 0 .../crafting/asphalt/polished_stairs.json | 0 .../crafting/asphalt/slab.json | 0 .../crafting/asphalt/stairs.json | 0 .../crafting/asphalt/wall.json | 0 .../crafting/blue_dye_from_blueberries.json | 0 .../crafting/blunite/polished_block.json | 0 .../crafting/blunite/polished_slab.json | 0 .../crafting/blunite/polished_stairs.json | 0 .../crafting/blunite/slab.json | 0 .../crafting/blunite/stairs.json | 0 .../crafting/blunite/wall.json | 0 .../crafting/dark_amaranth/button.json | 0 .../crafting/dark_amaranth/door.json | 0 .../crafting/dark_amaranth/fence.json | 0 .../crafting/dark_amaranth/fence_gate.json | 0 .../crafting/dark_amaranth/hanging_sign.json | 0 .../crafting/dark_amaranth/hyphae.json | 0 .../crafting/dark_amaranth/planks.json | 0 .../dark_amaranth/pressure_plate.json | 0 .../crafting/dark_amaranth/sign.json | 0 .../crafting/dark_amaranth/slab.json | 0 .../crafting/dark_amaranth/stairs.json | 0 .../crafting/dark_amaranth/trapdoor.json | 0 .../crafting/maple/boat.json | 0 .../crafting/maple/button.json | 0 .../crafting/maple/chest_boat.json | 0 .../crafting/maple/door.json | 0 .../crafting/maple/fence.json | 0 .../crafting/maple/fence_gate.json | 0 .../crafting/maple/hanging_sign.json | 0 .../crafting/maple/leaf_pile/fulvous.json | 0 .../crafting/maple/leaf_pile/mikado.json | 0 .../crafting/maple/leaf_pile/sap.json | 0 .../crafting/maple/leaf_pile/vermilion.json | 0 .../crafting/maple/planks.json | 0 .../crafting/maple/pressure_plate.json | 0 .../crafting/maple/sign.json | 0 .../crafting/maple/slab.json | 0 .../crafting/maple/stairs.json | 0 .../crafting/maple/trapdoor.json | 0 .../crafting/maple/wood.json | 0 .../crafting/palm/boat.json | 0 .../crafting/palm/button.json | 0 .../crafting/palm/chest_boat.json | 0 .../crafting/palm/door.json | 0 .../crafting/palm/fence.json | 0 .../crafting/palm/fence_gate.json | 0 .../crafting/palm/hanging_sign.json | 0 .../crafting/palm/leaf_pile.json | 0 .../crafting/palm/planks.json | 0 .../crafting/palm/pressure_plate.json | 0 .../crafting/palm/sign.json | 0 .../crafting/palm/slab.json | 0 .../crafting/palm/stairs.json | 0 .../crafting/palm/trapdoor.json | 0 .../crafting/palm/wood.json | 0 .../crafting/sakura/blossom_pile/blush.json | 0 .../crafting/sakura/blossom_pile/cotton.json | 0 .../crafting/sakura/boat.json | 0 .../crafting/sakura/button.json | 0 .../crafting/sakura/chest_boat.json | 0 .../crafting/sakura/door.json | 0 .../crafting/sakura/fence.json | 0 .../crafting/sakura/fence_gate.json | 0 .../crafting/sakura/hanging_sign.json | 0 .../crafting/sakura/planks.json | 0 .../crafting/sakura/pressure_plate.json | 0 .../crafting/sakura/sign.json | 0 .../crafting/sakura/slab.json | 0 .../crafting/sakura/stairs.json | 0 .../crafting/sakura/trapdoor.json | 0 .../crafting/sakura/wood.json | 0 .../crafting/vanilla_piles/acacia_leaf.json | 0 .../crafting/vanilla_piles/allium.json | 0 .../crafting/vanilla_piles/azalea_leaf.json | 0 .../crafting/vanilla_piles/azure_bluet.json | 0 .../crafting/vanilla_piles/birch_leaf.json | 0 .../crafting/vanilla_piles/blue_orchid.json | 0 .../crafting/vanilla_piles/cornflower.json | 0 .../crafting/vanilla_piles/dandelion.json | 0 .../crafting/vanilla_piles/dark_oak_leaf.json | 0 .../vanilla_piles/flowering_azalea_leaf.json | 0 .../crafting/vanilla_piles/jungle_leaf.json | 0 .../vanilla_piles/lily_of_the_valley.json | 0 .../crafting/vanilla_piles/mangrove_leaf.json | 0 .../crafting/vanilla_piles/oak_leaf.json | 0 .../crafting/vanilla_piles/orange_tulip.json | 0 .../crafting/vanilla_piles/oxeye_daisy.json | 0 .../crafting/vanilla_piles/pink_tulip.json | 0 .../crafting/vanilla_piles/poppy.json | 0 .../crafting/vanilla_piles/red_tulip.json | 0 .../crafting/vanilla_piles/spruce_leaf.json | 0 .../crafting/vanilla_piles/white_tulip.json | 0 .../crafting/vanilla_piles/wither_rose.json | 0 .../crafting/vanilla_snowy_leaves/spruce.json | 0 .../smelting/cooked_duck.json | 0 .../smoking/cooked_duck.json | 0 .../stonecutting/asphalt/polished_block.json | 0 .../stonecutting/asphalt/polished_slab.json | 0 .../stonecutting/asphalt/polished_stairs.json | 0 .../stonecutting/asphalt/slab.json | 0 .../stonecutting/asphalt/stairs.json | 0 .../stonecutting/asphalt/wall.json | 0 .../stonecutting/blunite/polished_block.json | 0 .../stonecutting/blunite/polished_slab.json | 0 .../stonecutting/blunite/polished_stairs.json | 0 .../stonecutting/blunite/slab.json | 0 .../stonecutting/blunite/stairs.json | 0 .../stonecutting/blunite/wall.json | 0 .../stonecutting/moai.json | 0 .../{structures => structure}/witch_hut.nbt | Bin .../witch_hut/interior/afraid.nbt | Bin .../witch_hut/interior/hatred.nbt | Bin .../witch_hut/interior/normal.nbt | Bin .../can_spread_black_dylium.json | 0 .../carpeted_grass_blocks.json | 0 .../dark_amaranth_stems.json | 0 .../tags/{blocks => block}/flower_piles.json | 0 .../growable_on/dark_amaranth_fungus.json | 0 .../tags/{blocks => block}/leaf_piles.json | 0 .../tags/{blocks => block}/leaves.json | 0 .../tags/{blocks => block}/maple_logs.json | 0 .../tags/{blocks => block}/palm_logs.json | 0 .../placeable_on/dark_amaranth_fungus.json | 0 .../placeable_on/dark_amaranth_roots.json | 0 .../placeable_on/obsidian_spike.json | 0 .../tags/{blocks => block}/sakura_logs.json | 0 .../{items => item}/dark_amaranth_stems.json | 0 .../{items => item}/entity_food/capybara.json | 0 .../{items => item}/entity_food/duck.json | 0 .../tags/{items => item}/maple_logs.json | 0 .../tags/{items => item}/palm_logs.json | 0 .../tags/{items => item}/sakura_logs.json | 0 505 files changed, 168 insertions(+), 167 deletions(-) delete mode 100644 src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java delete mode 100644 src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java rename src/main/resources/data/c/tags/{blocks => block}/bushes.json (100%) rename src/main/resources/data/c/tags/{blocks => block}/igneous_rocks.json (100%) rename src/main/resources/data/c/tags/{blocks => block}/saplings.json (100%) rename src/main/resources/data/c/tags/{blocks => block}/stripped_logs.json (100%) rename src/main/resources/data/c/tags/{blocks => block}/stripped_woods.json (100%) rename src/main/resources/data/c/tags/{entity_types => entity_type}/animals.json (100%) rename src/main/resources/data/c/tags/{entity_types => entity_type}/animals/birds.json (100%) rename src/main/resources/data/c/tags/{entity_types => entity_type}/animals/rodents.json (100%) rename src/main/resources/data/c/tags/{entity_types => entity_type}/monsters.json (100%) rename src/main/resources/data/c/tags/{entity_types => entity_type}/monsters/creepers.json (100%) rename src/main/resources/data/c/tags/{entity_types => entity_type}/monsters/skeletons.json (100%) rename src/main/resources/data/c/tags/{items => item}/foods.json (100%) rename src/main/resources/data/c/tags/{items => item}/fruits.json (100%) rename src/main/resources/data/c/tags/{items => item}/fruits/apricots.json (100%) rename src/main/resources/data/c/tags/{items => item}/fruits/bananas.json (100%) rename src/main/resources/data/c/tags/{items => item}/fruits/blueberries.json (100%) rename src/main/resources/data/c/tags/{items => item}/fruits/mangos.json (100%) rename src/main/resources/data/c/tags/{items => item}/igneous_rocks.json (100%) rename src/main/resources/data/c/tags/{items => item}/saplings.json (100%) rename src/main/resources/data/c/tags/{items => item}/stripped_logs.json (100%) rename src/main/resources/data/c/tags/{items => item}/stripped_woods.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/base_stone_overworld.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/bee_growables.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/ceiling_hanging_signs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/dirt.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/enderman_holdable.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/fence_gates.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/flower_pots.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/flowers.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/leaves.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/logs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/logs_that_burn.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/hoe.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/shovel.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/planks.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/replaceable_by_trees.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/saplings.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/slabs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/stairs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/standing_signs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/stone_ore_replaceables.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/stripped_logs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/sword_efficient.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wall_hanging_signs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wall_post_override.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wall_signs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/walls.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wart_blocks.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_buttons.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_doors.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_fences.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_pressure_plates.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_slabs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_stairs.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wooden_trapdoors.json (100%) rename src/main/resources/data/minecraft/tags/{entity_types => entity_type}/axolotl_always_hostiles.json (100%) rename src/main/resources/data/minecraft/tags/{entity_types => entity_type}/fall_damage_immune.json (100%) rename src/main/resources/data/minecraft/tags/{entity_types => entity_type}/freeze_immune_entity_types.json (100%) rename src/main/resources/data/minecraft/tags/{entity_types => entity_type}/skeletons.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/boats.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/chest_boats.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/flowers.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/fox_food.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/hanging_signs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/leaves.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/logs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/logs_that_burn.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/meat.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/non_flammable_wood.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/planks.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/saplings.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/signs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/slabs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/stairs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/stone_crafting_materials.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/stone_tool_materials.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/stripped_logs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/walls.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wart_blocks.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_buttons.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_doors.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_fences.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_pressure_plates.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_slabs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_stairs.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/wooden_trapdoors.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/adventure/kill_sunken_outside_water.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/husbandry/harvest_maple_syrup.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/campfire_cooking/cooked_duck.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/asphalt/polished_block.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/asphalt/polished_slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/asphalt/polished_stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/asphalt/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/asphalt/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/asphalt/wall.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blue_dye_from_blueberries.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blunite/polished_block.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blunite/polished_slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blunite/polished_stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blunite/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blunite/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/blunite/wall.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/button.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/door.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/fence.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/fence_gate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/hanging_sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/hyphae.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/planks.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/pressure_plate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/dark_amaranth/trapdoor.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/boat.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/button.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/chest_boat.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/door.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/fence.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/fence_gate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/hanging_sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/leaf_pile/fulvous.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/leaf_pile/mikado.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/leaf_pile/sap.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/leaf_pile/vermilion.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/planks.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/pressure_plate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/trapdoor.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/maple/wood.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/boat.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/button.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/chest_boat.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/door.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/fence.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/fence_gate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/hanging_sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/leaf_pile.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/planks.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/pressure_plate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/trapdoor.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/palm/wood.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/blossom_pile/blush.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/blossom_pile/cotton.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/boat.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/button.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/chest_boat.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/door.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/fence.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/fence_gate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/hanging_sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/planks.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/pressure_plate.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/sign.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/trapdoor.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/sakura/wood.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/acacia_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/allium.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/azalea_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/azure_bluet.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/birch_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/blue_orchid.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/cornflower.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/dandelion.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/dark_oak_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/jungle_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/lily_of_the_valley.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/mangrove_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/oak_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/orange_tulip.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/oxeye_daisy.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/pink_tulip.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/poppy.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/red_tulip.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/spruce_leaf.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/white_tulip.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_piles/wither_rose.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/crafting/vanilla_snowy_leaves/spruce.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/smoking/cooked_duck.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/asphalt/polished_block.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/asphalt/polished_slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/asphalt/polished_stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/asphalt/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/asphalt/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/asphalt/wall.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/blunite/polished_block.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/blunite/polished_slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/blunite/polished_stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/blunite/slab.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/blunite/stairs.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/blunite/wall.json (100%) rename src/main/resources/data/promenade/{advancements => advancement}/recipes/stonecutting/moai.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/acacia_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/allium_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/asphalt.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/asphalt_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/asphalt_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/asphalt_wall.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/azalea_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/azure_bluet_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/birch_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/black_dylium.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blue_orchid_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blueberry_bush.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blunite.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blunite_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blunite_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blunite_wall.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blush_sakura_blossom_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blush_sakura_blossoms.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/blush_sakura_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/cornflower_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/cotton_sakura_blossom_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/cotton_sakura_blossoms.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/cotton_sakura_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dandelion_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_button.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_door.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_fence.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_fence_gate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_fungus.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_hyphae.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_planks.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_pressure_plate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_roots.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_stem.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_trapdoor.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_wall_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_wall_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_amaranth_wart_block.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/dark_oak_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/flowering_azalea_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/fulvous_carpeted_grass_block.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/fulvous_maple_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/fulvous_maple_leaves.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/fulvous_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/jungle_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/lily_of_the_valley_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/mangrove_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_button.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_door.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_fence.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_fence_gate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_log.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_planks.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_pressure_plate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_trapdoor.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_wall_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_wall_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/maple_wood.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/mikado_carpeted_grass_block.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/mikado_maple_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/mikado_maple_leaves.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/mikado_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/moai.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/oak_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/orange_tulip_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/oxeye_daisy_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_button.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_door.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_fence.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_fence_gate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_leaves.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_log.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_planks.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_pressure_plate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_trapdoor.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_wall_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_wall_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/palm_wood.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/pink_tulip_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/polished_asphalt.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/polished_asphalt_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/polished_asphalt_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/polished_blunite.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/polished_blunite_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/polished_blunite_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/poppy_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_blush_sakura_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_cotton_sakura_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_dark_amaranth_fungus.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_fulvous_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_mikado_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_palm_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_sap_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/potted_vermilion_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/red_tulip_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_button.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_door.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_fence.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_fence_gate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_log.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_planks.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_pressure_plate.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_slab.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_stairs.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_trapdoor.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_wall_hanging_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_wall_sign.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sakura_wood.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sap_maple_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sap_maple_leaves.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/sap_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/snowy_spruce_leaves.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/spruce_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_dark_amaranth_hyphae.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_dark_amaranth_stem.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_maple_log.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_maple_wood.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_palm_log.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_palm_wood.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_sakura_log.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/stripped_sakura_wood.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/vermilion_carpeted_grass_block.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/vermilion_maple_leaf_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/vermilion_maple_leaves.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/vermilion_maple_sapling.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/white_tulip_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/blocks/wither_rose_pile.json (100%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/chests/witch_hut.json (100%) create mode 100644 src/main/resources/data/promenade/loot_table/entities/duck.json rename src/main/resources/data/promenade/{loot_tables => loot_table}/entities/lush_creeper.json (85%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/entities/sunken/bubble.json (87%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/entities/sunken/fire.json (87%) rename src/main/resources/data/promenade/{loot_tables => loot_table}/entities/sunken/horn.json (87%) delete mode 100644 src/main/resources/data/promenade/loot_tables/entities/duck.json create mode 100644 src/main/resources/data/promenade/painting_variant/nurture.json create mode 100644 src/main/resources/data/promenade/painting_variant/optimism.json rename src/main/resources/data/promenade/{recipes => recipe}/campfire_cooking/cooked_duck.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/asphalt/polished_block.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/asphalt/polished_slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/asphalt/polished_stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/asphalt/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/asphalt/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/asphalt/wall.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blue_dye_from_blueberries.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blunite/polished_block.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blunite/polished_slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blunite/polished_stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blunite/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blunite/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/blunite/wall.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/button.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/door.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/fence.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/fence_gate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/hanging_sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/hyphae.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/planks.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/pressure_plate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/dark_amaranth/trapdoor.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/boat.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/button.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/chest_boat.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/door.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/fence.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/fence_gate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/hanging_sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/leaf_pile/fulvous.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/leaf_pile/mikado.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/leaf_pile/sap.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/leaf_pile/vermilion.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/planks.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/pressure_plate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/trapdoor.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/maple/wood.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/boat.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/button.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/chest_boat.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/door.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/fence.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/fence_gate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/hanging_sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/leaf_pile.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/planks.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/pressure_plate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/trapdoor.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/palm/wood.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/blossom_pile/blush.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/blossom_pile/cotton.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/boat.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/button.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/chest_boat.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/door.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/fence.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/fence_gate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/hanging_sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/planks.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/pressure_plate.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/sign.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/trapdoor.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/sakura/wood.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/acacia_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/allium.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/azalea_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/azure_bluet.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/birch_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/blue_orchid.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/cornflower.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/dandelion.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/dark_oak_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/flowering_azalea_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/jungle_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/lily_of_the_valley.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/mangrove_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/oak_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/orange_tulip.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/oxeye_daisy.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/pink_tulip.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/poppy.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/red_tulip.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/spruce_leaf.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/white_tulip.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_piles/wither_rose.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/crafting/vanilla_snowy_leaves/spruce.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/smelting/cooked_duck.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/smoking/cooked_duck.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/asphalt/polished_block.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/asphalt/polished_slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/asphalt/polished_stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/asphalt/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/asphalt/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/asphalt/wall.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/blunite/polished_block.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/blunite/polished_slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/blunite/polished_stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/blunite/slab.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/blunite/stairs.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/blunite/wall.json (100%) rename src/main/resources/data/promenade/{recipes => recipe}/stonecutting/moai.json (100%) rename src/main/resources/data/promenade/{structures => structure}/witch_hut.nbt (100%) rename src/main/resources/data/promenade/{structures => structure}/witch_hut/interior/afraid.nbt (100%) rename src/main/resources/data/promenade/{structures => structure}/witch_hut/interior/hatred.nbt (100%) rename src/main/resources/data/promenade/{structures => structure}/witch_hut/interior/normal.nbt (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/can_spread_black_dylium.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/carpeted_grass_blocks.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/dark_amaranth_stems.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/flower_piles.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/growable_on/dark_amaranth_fungus.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/leaf_piles.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/leaves.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/maple_logs.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/palm_logs.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/placeable_on/dark_amaranth_fungus.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/placeable_on/dark_amaranth_roots.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/placeable_on/obsidian_spike.json (100%) rename src/main/resources/data/promenade/tags/{blocks => block}/sakura_logs.json (100%) rename src/main/resources/data/promenade/tags/{items => item}/dark_amaranth_stems.json (100%) rename src/main/resources/data/promenade/tags/{items => item}/entity_food/capybara.json (100%) rename src/main/resources/data/promenade/tags/{items => item}/entity_food/duck.json (100%) rename src/main/resources/data/promenade/tags/{items => item}/maple_logs.json (100%) rename src/main/resources/data/promenade/tags/{items => item}/palm_logs.json (100%) rename src/main/resources/data/promenade/tags/{items => item}/sakura_logs.json (100%) diff --git a/build.gradle b/build.gradle index bc849e1a..a3f626af 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' } apply from: 'https://dawnteammc.github.io/resources/gradle_scripts/fabric-mod/java-21.gradle' diff --git a/gradle.properties b/gradle.properties index 641d82fb..d7977266 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,12 +9,12 @@ loader_name=Fabric loader_icon=https://fabricmc.net/assets/logo.png # check these on https://fabricmc.net/versions.html -minecraft_version=1.20.5 -yarn_mappings=1.20.5+build.1 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 loader_version=0.15.11 -fabric_version=0.97.8+1.20.5 +fabric_version=0.100.7+1.21 # https://github.com/DawnTeamMC/DawnAPI dawn_version=snapshot-SNAPSHOT # https://maven.terraformersmc.com/releases/com/terraformersmc/biolith-fabric -biolith_version=2.1.0-alpha.4 \ No newline at end of file +biolith_version=3.0.0-beta.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48c0a02c..19cfad96 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/fr/hugman/promenade/Promenade.java b/src/main/java/fr/hugman/promenade/Promenade.java index ce0f8e48..c1f16403 100644 --- a/src/main/java/fr/hugman/promenade/Promenade.java +++ b/src/main/java/fr/hugman/promenade/Promenade.java @@ -7,7 +7,6 @@ import fr.hugman.promenade.entity.PromenadeEntityTypes; import fr.hugman.promenade.entity.ai.brain.sensor.PromenadeSensorTypes; import fr.hugman.promenade.entity.data.PromenadeTrackedData; -import fr.hugman.promenade.entity.decoration.painting.PromenadePaintingVariants; import fr.hugman.promenade.item.PromenadeItems; import fr.hugman.promenade.registry.PromenadeRegistries; import fr.hugman.promenade.sound.PromenadeSoundEvents; @@ -51,8 +50,6 @@ public void onInitialize() { PromenadeBiomes.appendWorldGen(); PromenadePlacedFeatures.appendWorldGen(); PromenadeEntityTypes.appendWorldGen(); - - PromenadePaintingVariants.register(); } public static Identifier id(String path) { diff --git a/src/main/java/fr/hugman/promenade/PromenadeClient.java b/src/main/java/fr/hugman/promenade/PromenadeClient.java index c7f28bf8..acda1d01 100644 --- a/src/main/java/fr/hugman/promenade/PromenadeClient.java +++ b/src/main/java/fr/hugman/promenade/PromenadeClient.java @@ -21,10 +21,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.color.world.BiomeColors; -import net.minecraft.client.color.world.FoliageColors; -import net.minecraft.client.color.world.GrassColors; import net.minecraft.client.render.RenderLayer; import net.minecraft.item.BlockItem; +import net.minecraft.world.biome.FoliageColors; +import net.minecraft.world.biome.GrassColors; @Environment(EnvType.CLIENT) public class PromenadeClient implements ClientModInitializer { diff --git a/src/main/java/fr/hugman/promenade/PromenadeFactory.java b/src/main/java/fr/hugman/promenade/PromenadeFactory.java index 625da4db..35f67e60 100644 --- a/src/main/java/fr/hugman/promenade/PromenadeFactory.java +++ b/src/main/java/fr/hugman/promenade/PromenadeFactory.java @@ -1,9 +1,9 @@ package fr.hugman.promenade; -import com.terraformersmc.terraform.sign.block.TerraformHangingSignBlock; -import com.terraformersmc.terraform.sign.block.TerraformSignBlock; -import com.terraformersmc.terraform.sign.block.TerraformWallHangingSignBlock; -import com.terraformersmc.terraform.sign.block.TerraformWallSignBlock; +import com.terraformersmc.terraform.sign.api.block.TerraformHangingSignBlock; +import com.terraformersmc.terraform.sign.api.block.TerraformSignBlock; +import com.terraformersmc.terraform.sign.api.block.TerraformWallHangingSignBlock; +import com.terraformersmc.terraform.sign.api.block.TerraformWallSignBlock; import fr.hugman.dawn.DawnFactory; import fr.hugman.promenade.block.*; import net.minecraft.block.AbstractBlock; @@ -85,20 +85,4 @@ public static DecoratedLeavesBlock decoratedLeaves(MapColor mapColor, int bound, public static DecoratedLeavesBlock decoratedLeaves(MapColor mapColor, ParticleEffect particle) { return decoratedLeaves(mapColor, BlockSoundGroup.GRASS, 10, particle); } - - //TODO: move to Dawn API - public static Block sign(boolean hanging, boolean wall, Identifier texturePath, Block basePlanks, BlockSoundGroup soundGroup) { - return sign(hanging, wall, texturePath, DawnFactory.signSettings(basePlanks, soundGroup)); - } - - //TODO: move to Dawn API - public static Block sign(boolean hanging, boolean wall, Identifier texturePath, AbstractBlock.Settings settings) { - if (hanging) { - var hangingSignTexture = Identifier.of(texturePath.getNamespace(), "entity/signs/hanging/" + texturePath.getPath()); - var hangingSignGuiTexture = Identifier.of(texturePath.getNamespace(), "textures/gui/hanging_signs/" + texturePath.getPath()); - return wall ? new TerraformWallHangingSignBlock(hangingSignTexture, hangingSignGuiTexture, settings) : new TerraformHangingSignBlock(hangingSignTexture, hangingSignGuiTexture, settings); - } - var signTexture = Identifier.of(texturePath.getNamespace(), "entity/signs/" + texturePath.getPath()); - return wall ? new TerraformWallSignBlock(signTexture, settings) : new TerraformSignBlock(signTexture, settings); - } } diff --git a/src/main/java/fr/hugman/promenade/block/DecoratedLeavesBlock.java b/src/main/java/fr/hugman/promenade/block/DecoratedLeavesBlock.java index 471037e6..5f828c01 100644 --- a/src/main/java/fr/hugman/promenade/block/DecoratedLeavesBlock.java +++ b/src/main/java/fr/hugman/promenade/block/DecoratedLeavesBlock.java @@ -5,9 +5,9 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.block.BlockState; import net.minecraft.block.LeavesBlock; -import net.minecraft.client.util.ParticleUtil; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; +import net.minecraft.particle.ParticleUtil; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; diff --git a/src/main/java/fr/hugman/promenade/block/PromenadeBlocks.java b/src/main/java/fr/hugman/promenade/block/PromenadeBlocks.java index 180a4b5b..2bb0b07a 100644 --- a/src/main/java/fr/hugman/promenade/block/PromenadeBlocks.java +++ b/src/main/java/fr/hugman/promenade/block/PromenadeBlocks.java @@ -12,7 +12,7 @@ import fr.hugman.promenade.world.gen.feature.PromenadeConfiguredFeatureKeys; import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper; import net.minecraft.block.*; -import net.minecraft.block.enums.Instrument; +import net.minecraft.block.enums.NoteBlockInstrument; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.EntityType; import net.minecraft.entity.EquipmentSlot; @@ -117,10 +117,10 @@ public class PromenadeBlocks { public static final Block SAKURA_TRAPDOOR = of(PromenadeBlockKeys.SAKURA_TRAPDOOR, DawnFactory.trapdoor(SAKURA_PLANKS, PromenadeBlockSetTypes.SAKURA)); public static final Block SAKURA_BUTTON = of(PromenadeBlockKeys.SAKURA_BUTTON, DawnFactory.woodenButton(SAKURA_PLANKS, PromenadeBlockSetTypes.SAKURA)); public static final Block SAKURA_PRESSURE_PLATE = of(PromenadeBlockKeys.SAKURA_PRESSURE_PLATE, DawnFactory.pressurePlate(SAKURA_PLANKS, PromenadeBlockSetTypes.SAKURA)); - public static final Block SAKURA_SIGN = of(PromenadeBlockKeys.SAKURA_SIGN, PromenadeFactory.sign(false, false, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS)); - public static final Block SAKURA_WALL_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS)); - public static final Block SAKURA_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN)); - public static final Block SAKURA_WALL_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN)); + public static final Block SAKURA_SIGN = of(PromenadeBlockKeys.SAKURA_SIGN, DawnFactory.sign(false, false, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS)); + public static final Block SAKURA_WALL_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("sakura"), SAKURA_PLANKS, SAKURA_WOOD_SOUNDS)); + public static final Block SAKURA_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN)); + public static final Block SAKURA_WALL_HANGING_SIGN = of(PromenadeBlockKeys.SAKURA_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("sakura"), SAKURA_PLANKS, BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN)); public static final Block BLUSH_SAKURA_SAPLING = of(PromenadeBlockKeys.BLUSH_SAKURA_SAPLING, DawnFactory.sapling(BLUSH_BLOSSOMS_COLOR, PromenadeSaplingGenerators.BLUSH_SAKURA_SAPLING_GENERATOR)); public static final Block POTTED_BLUSH_SAKURA_SAPLING = of(PromenadeBlockKeys.POTTED_BLUSH_SAKURA_SAPLING, DawnFactory.potted(BLUSH_SAKURA_SAPLING)); @@ -160,10 +160,10 @@ public class PromenadeBlocks { public static final Block MAPLE_TRAPDOOR = of(PromenadeBlockKeys.MAPLE_TRAPDOOR, DawnFactory.trapdoor(MAPLE_PLANKS, PromenadeBlockSetTypes.MAPLE)); public static final Block MAPLE_BUTTON = of(PromenadeBlockKeys.MAPLE_BUTTON, DawnFactory.woodenButton(MAPLE_PLANKS, PromenadeBlockSetTypes.MAPLE)); public static final Block MAPLE_PRESSURE_PLATE = of(PromenadeBlockKeys.MAPLE_PRESSURE_PLATE, DawnFactory.pressurePlate(MAPLE_PLANKS, PromenadeBlockSetTypes.MAPLE)); - public static final Block MAPLE_SIGN = of(PromenadeBlockKeys.MAPLE_SIGN, PromenadeFactory.sign(false, false, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS)); - public static final Block MAPLE_WALL_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS)); - public static final Block MAPLE_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN)); - public static final Block MAPLE_WALL_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN)); + public static final Block MAPLE_SIGN = of(PromenadeBlockKeys.MAPLE_SIGN, DawnFactory.sign(false, false, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS)); + public static final Block MAPLE_WALL_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("maple"), MAPLE_PLANKS, MAPLE_WOOD_SOUNDS)); + public static final Block MAPLE_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN)); + public static final Block MAPLE_WALL_HANGING_SIGN = of(PromenadeBlockKeys.MAPLE_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("maple"), MAPLE_PLANKS, BlockSoundGroup.HANGING_SIGN)); public static final Block SAP_MAPLE_SAPLING = of(PromenadeBlockKeys.SAP_MAPLE_SAPLING, DawnFactory.sapling(MAPLE_SAP_LEAVES_COLOR, PromenadeSaplingGenerators.SAP_MAPLE_SAPLING_GENERATOR)); public static final Block POTTED_SAP_MAPLE_SAPLING = of(PromenadeBlockKeys.POTTED_SAP_MAPLE_SAPLING, DawnFactory.potted(SAP_MAPLE_SAPLING)); @@ -212,10 +212,10 @@ public class PromenadeBlocks { public static final Block PALM_TRAPDOOR = of(PromenadeBlockKeys.PALM_TRAPDOOR, DawnFactory.trapdoor(PALM_PLANKS, PromenadeBlockSetTypes.PALM)); public static final Block PALM_BUTTON = of(PromenadeBlockKeys.PALM_BUTTON, DawnFactory.woodenButton(PALM_PLANKS, PromenadeBlockSetTypes.PALM)); public static final Block PALM_PRESSURE_PLATE = of(PromenadeBlockKeys.PALM_PRESSURE_PLATE, DawnFactory.pressurePlate(PALM_PLANKS, PromenadeBlockSetTypes.PALM)); - public static final Block PALM_SIGN = of(PromenadeBlockKeys.PALM_SIGN, PromenadeFactory.sign(false, false, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS)); - public static final Block PALM_WALL_SIGN = of(PromenadeBlockKeys.PALM_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS)); - public static final Block PALM_HANGING_SIGN = of(PromenadeBlockKeys.PALM_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN)); - public static final Block PALM_WALL_HANGING_SIGN = of(PromenadeBlockKeys.PALM_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN)); + public static final Block PALM_SIGN = of(PromenadeBlockKeys.PALM_SIGN, DawnFactory.sign(false, false, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS)); + public static final Block PALM_WALL_SIGN = of(PromenadeBlockKeys.PALM_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("palm"), PALM_PLANKS, PALM_WOOD_SOUNDS)); + public static final Block PALM_HANGING_SIGN = of(PromenadeBlockKeys.PALM_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN)); + public static final Block PALM_WALL_HANGING_SIGN = of(PromenadeBlockKeys.PALM_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("palm"), PALM_PLANKS, BlockSoundGroup.HANGING_SIGN)); public static final Block PALM_SAPLING = of(PromenadeBlockKeys.PALM_SAPLING, DawnFactory.sapling(PALM_LEAVES_COLOR, PromenadeSaplingGenerators.PALM_SAPLING_GENERATOR, state -> state.isIn(BlockTags.SAND))); public static final Block POTTED_PALM_SAPLING = of(PromenadeBlockKeys.POTTED_PALM_SAPLING, DawnFactory.potted(PALM_SAPLING)); @@ -255,7 +255,7 @@ public class PromenadeBlocks { AbstractBlock.Settings.create() .item() .mapColor(MapColor.BLACK) - .instrument(Instrument.BASEDRUM) + .instrument(NoteBlockInstrument.BASEDRUM) .requiresTool() .strength(3.0F, 9.0F) .sounds(BlockSoundGroup.NYLIUM) @@ -289,16 +289,16 @@ public class PromenadeBlocks { public static final Block DARK_AMARANTH_TRAPDOOR = of(PromenadeBlockKeys.DARK_AMARANTH_TRAPDOOR, DawnFactory.trapdoor(DARK_AMARANTH_PLANKS, PromenadeBlockSetTypes.AMARANTH)); public static final Block DARK_AMARANTH_BUTTON = of(PromenadeBlockKeys.DARK_AMARANTH_BUTTON, DawnFactory.woodenButton(DARK_AMARANTH_PLANKS, PromenadeBlockSetTypes.AMARANTH)); public static final Block DARK_AMARANTH_PRESSURE_PLATE = of(PromenadeBlockKeys.DARK_AMARANTH_PRESSURE_PLATE, DawnFactory.pressurePlate(DARK_AMARANTH_PLANKS, PromenadeBlockSetTypes.AMARANTH)); - public static final Block DARK_AMARANTH_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_SIGN, PromenadeFactory.sign(false, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS)); - public static final Block DARK_AMARANTH_WALL_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_SIGN, PromenadeFactory.sign(false, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS)); - public static final Block DARK_AMARANTH_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_HANGING_SIGN, PromenadeFactory.sign(true, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN)); - public static final Block DARK_AMARANTH_WALL_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_HANGING_SIGN, PromenadeFactory.sign(true, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN)); + public static final Block DARK_AMARANTH_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_SIGN, DawnFactory.sign(false, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS)); + public static final Block DARK_AMARANTH_WALL_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_SIGN, DawnFactory.sign(false, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, AMARANTH_WOOD_SOUNDS)); + public static final Block DARK_AMARANTH_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_HANGING_SIGN, DawnFactory.sign(true, false, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN)); + public static final Block DARK_AMARANTH_WALL_HANGING_SIGN = of(PromenadeBlockKeys.DARK_AMARANTH_WALL_HANGING_SIGN, DawnFactory.sign(true, true, Promenade.id("dark_amaranth"), DARK_AMARANTH_PLANKS, BlockSoundGroup.HANGING_SIGN)); public static final Block DARK_AMARANTH_FUNGUS = of(PromenadeBlockKeys.DARK_AMARANTH_FUNGUS, DawnFactory.fungus(MapColor.PURPLE, PromenadeConfiguredFeatureKeys.PLANTED_AMARANTH_FUNGUS, PromenadeBlockTags.DARK_AMARANTH_FUNGUS_PLACEABLE_ON, PromenadeBlockTags.DARK_AMARANTH_FUNGUS_GROWABLE_ON)); public static final Block POTTED_DARK_AMARANTH_FUNGUS = of(PromenadeBlockKeys.POTTED_DARK_AMARANTH_FUNGUS, DawnFactory.potted(DARK_AMARANTH_FUNGUS)); - public static final Block MOAI = of(PromenadeBlockKeys.MOAI, new MoaiBlock(AbstractBlock.Settings.copy(Blocks.TUFF).mapColor(MapColor.TERRACOTTA_LIGHT_GRAY).item(new Item.Settings().equipmentSlot(stack -> EquipmentSlot.HEAD)))); + public static final Block MOAI = of(PromenadeBlockKeys.MOAI, new MoaiBlock(AbstractBlock.Settings.copy(Blocks.TUFF).mapColor(MapColor.TERRACOTTA_LIGHT_GRAY).item(new Item.Settings().equipmentSlot((entity, stack) -> EquipmentSlot.HEAD)))); public static final Block BLUEBERRY_BUSH = of(PromenadeBlockKeys.BLUEBERRY_BUSH, BerryBushBlock.of(PromenadeItemKeys.BLUEBERRIES, false)); diff --git a/src/main/java/fr/hugman/promenade/client/render/entity/LushCreeperOverlayRenderer.java b/src/main/java/fr/hugman/promenade/client/render/entity/LushCreeperOverlayRenderer.java index 687842c4..6913a540 100644 --- a/src/main/java/fr/hugman/promenade/client/render/entity/LushCreeperOverlayRenderer.java +++ b/src/main/java/fr/hugman/promenade/client/render/entity/LushCreeperOverlayRenderer.java @@ -24,8 +24,8 @@ public LushCreeperOverlayRenderer(FeatureRendererContext brain) { new StayAboveWaterTask(0.8f), new WalkTask(1.0f), new LookAroundTask(45, 90), - new WanderAroundTask(), + new MoveToTargetTask(), new TemptationCooldownTask(MemoryModuleType.TEMPTATION_COOLDOWN_TICKS), new TemptationCooldownTask(MemoryModuleType.GAZE_COOLDOWN_TICKS))); } diff --git a/src/main/java/fr/hugman/promenade/entity/SunkenEntity.java b/src/main/java/fr/hugman/promenade/entity/SunkenEntity.java index a9762ef8..2a674c65 100644 --- a/src/main/java/fr/hugman/promenade/entity/SunkenEntity.java +++ b/src/main/java/fr/hugman/promenade/entity/SunkenEntity.java @@ -125,8 +125,8 @@ public void shootAt(LivingEntity target, float pullProgress) { if (this.isHolding(stack -> stack.getItem() instanceof CrossbowItem)) { this.shoot(this, 1.6F); } else { - ItemStack itemStack = this.getProjectileType(this.getStackInHand(ProjectileUtil.getHandPossiblyHolding(this, Items.BOW))); - PersistentProjectileEntity persistentProjectileEntity = this.createArrowProjectile(itemStack, pullProgress); + ItemStack itemStack = this.getStackInHand(ProjectileUtil.getHandPossiblyHolding(this, Items.BOW)); + PersistentProjectileEntity persistentProjectileEntity = this.createArrowProjectile(this.getProjectileType(itemStack), pullProgress, itemStack); double d = target.getX() - this.getX(); double e = target.getBodyY(0.3333333333333333D) - persistentProjectileEntity.getY(); double f = target.getZ() - this.getZ(); @@ -142,8 +142,9 @@ public void shoot(LivingEntity entity, float speed) { CrossbowUser.super.shoot(entity, speed); } - protected PersistentProjectileEntity createArrowProjectile(ItemStack arrow, float damageModifier) { - PersistentProjectileEntity persistentProjectileEntity = super.createArrowProjectile(arrow, damageModifier); + @Override + protected PersistentProjectileEntity createArrowProjectile(ItemStack arrow, float damageModifier, @Nullable ItemStack shotFrom) { + PersistentProjectileEntity persistentProjectileEntity = super.createArrowProjectile(arrow, damageModifier, shotFrom); if (persistentProjectileEntity instanceof ArrowEntity) { ((ArrowEntity) persistentProjectileEntity).addEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 600)); } diff --git a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java deleted file mode 100644 index fa6b205a..00000000 --- a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariantKeys.java +++ /dev/null @@ -1,16 +0,0 @@ -package fr.hugman.promenade.entity.decoration.painting; - -import fr.hugman.promenade.Promenade; -import net.minecraft.entity.decoration.painting.PaintingVariant; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; - -public class PromenadePaintingVariantKeys { - public static final RegistryKey OPTIMISM = of("optimism"); - public static final RegistryKey NURTURE = of("nurture"); - - - private static RegistryKey of(String path) { - return RegistryKey.of(RegistryKeys.PAINTING_VARIANT, Promenade.id(path)); - } -} diff --git a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java b/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java deleted file mode 100644 index 0efcc035..00000000 --- a/src/main/java/fr/hugman/promenade/entity/decoration/painting/PromenadePaintingVariants.java +++ /dev/null @@ -1,12 +0,0 @@ -package fr.hugman.promenade.entity.decoration.painting; - -import net.minecraft.entity.decoration.painting.PaintingVariant; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; - -public class PromenadePaintingVariants { - public static void register() { - Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.OPTIMISM, new PaintingVariant(32, 32)); - Registry.register(Registries.PAINTING_VARIANT, PromenadePaintingVariantKeys.NURTURE, new PaintingVariant(32, 32)); - } -} diff --git a/src/main/java/fr/hugman/promenade/particle/FloatingParticle.java b/src/main/java/fr/hugman/promenade/particle/FloatingParticle.java index 84121f84..473274fc 100644 --- a/src/main/java/fr/hugman/promenade/particle/FloatingParticle.java +++ b/src/main/java/fr/hugman/promenade/particle/FloatingParticle.java @@ -4,6 +4,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.particle.*; import net.minecraft.client.world.ClientWorld; +import net.minecraft.particle.ParticleGroup; import net.minecraft.particle.SimpleParticleType; import net.minecraft.util.math.MathHelper; diff --git a/src/main/resources/data/c/tags/blocks/bushes.json b/src/main/resources/data/c/tags/block/bushes.json similarity index 100% rename from src/main/resources/data/c/tags/blocks/bushes.json rename to src/main/resources/data/c/tags/block/bushes.json diff --git a/src/main/resources/data/c/tags/blocks/igneous_rocks.json b/src/main/resources/data/c/tags/block/igneous_rocks.json similarity index 100% rename from src/main/resources/data/c/tags/blocks/igneous_rocks.json rename to src/main/resources/data/c/tags/block/igneous_rocks.json diff --git a/src/main/resources/data/c/tags/blocks/saplings.json b/src/main/resources/data/c/tags/block/saplings.json similarity index 100% rename from src/main/resources/data/c/tags/blocks/saplings.json rename to src/main/resources/data/c/tags/block/saplings.json diff --git a/src/main/resources/data/c/tags/blocks/stripped_logs.json b/src/main/resources/data/c/tags/block/stripped_logs.json similarity index 100% rename from src/main/resources/data/c/tags/blocks/stripped_logs.json rename to src/main/resources/data/c/tags/block/stripped_logs.json diff --git a/src/main/resources/data/c/tags/blocks/stripped_woods.json b/src/main/resources/data/c/tags/block/stripped_woods.json similarity index 100% rename from src/main/resources/data/c/tags/blocks/stripped_woods.json rename to src/main/resources/data/c/tags/block/stripped_woods.json diff --git a/src/main/resources/data/c/tags/entity_types/animals.json b/src/main/resources/data/c/tags/entity_type/animals.json similarity index 100% rename from src/main/resources/data/c/tags/entity_types/animals.json rename to src/main/resources/data/c/tags/entity_type/animals.json diff --git a/src/main/resources/data/c/tags/entity_types/animals/birds.json b/src/main/resources/data/c/tags/entity_type/animals/birds.json similarity index 100% rename from src/main/resources/data/c/tags/entity_types/animals/birds.json rename to src/main/resources/data/c/tags/entity_type/animals/birds.json diff --git a/src/main/resources/data/c/tags/entity_types/animals/rodents.json b/src/main/resources/data/c/tags/entity_type/animals/rodents.json similarity index 100% rename from src/main/resources/data/c/tags/entity_types/animals/rodents.json rename to src/main/resources/data/c/tags/entity_type/animals/rodents.json diff --git a/src/main/resources/data/c/tags/entity_types/monsters.json b/src/main/resources/data/c/tags/entity_type/monsters.json similarity index 100% rename from src/main/resources/data/c/tags/entity_types/monsters.json rename to src/main/resources/data/c/tags/entity_type/monsters.json diff --git a/src/main/resources/data/c/tags/entity_types/monsters/creepers.json b/src/main/resources/data/c/tags/entity_type/monsters/creepers.json similarity index 100% rename from src/main/resources/data/c/tags/entity_types/monsters/creepers.json rename to src/main/resources/data/c/tags/entity_type/monsters/creepers.json diff --git a/src/main/resources/data/c/tags/entity_types/monsters/skeletons.json b/src/main/resources/data/c/tags/entity_type/monsters/skeletons.json similarity index 100% rename from src/main/resources/data/c/tags/entity_types/monsters/skeletons.json rename to src/main/resources/data/c/tags/entity_type/monsters/skeletons.json diff --git a/src/main/resources/data/c/tags/items/foods.json b/src/main/resources/data/c/tags/item/foods.json similarity index 100% rename from src/main/resources/data/c/tags/items/foods.json rename to src/main/resources/data/c/tags/item/foods.json diff --git a/src/main/resources/data/c/tags/items/fruits.json b/src/main/resources/data/c/tags/item/fruits.json similarity index 100% rename from src/main/resources/data/c/tags/items/fruits.json rename to src/main/resources/data/c/tags/item/fruits.json diff --git a/src/main/resources/data/c/tags/items/fruits/apricots.json b/src/main/resources/data/c/tags/item/fruits/apricots.json similarity index 100% rename from src/main/resources/data/c/tags/items/fruits/apricots.json rename to src/main/resources/data/c/tags/item/fruits/apricots.json diff --git a/src/main/resources/data/c/tags/items/fruits/bananas.json b/src/main/resources/data/c/tags/item/fruits/bananas.json similarity index 100% rename from src/main/resources/data/c/tags/items/fruits/bananas.json rename to src/main/resources/data/c/tags/item/fruits/bananas.json diff --git a/src/main/resources/data/c/tags/items/fruits/blueberries.json b/src/main/resources/data/c/tags/item/fruits/blueberries.json similarity index 100% rename from src/main/resources/data/c/tags/items/fruits/blueberries.json rename to src/main/resources/data/c/tags/item/fruits/blueberries.json diff --git a/src/main/resources/data/c/tags/items/fruits/mangos.json b/src/main/resources/data/c/tags/item/fruits/mangos.json similarity index 100% rename from src/main/resources/data/c/tags/items/fruits/mangos.json rename to src/main/resources/data/c/tags/item/fruits/mangos.json diff --git a/src/main/resources/data/c/tags/items/igneous_rocks.json b/src/main/resources/data/c/tags/item/igneous_rocks.json similarity index 100% rename from src/main/resources/data/c/tags/items/igneous_rocks.json rename to src/main/resources/data/c/tags/item/igneous_rocks.json diff --git a/src/main/resources/data/c/tags/items/saplings.json b/src/main/resources/data/c/tags/item/saplings.json similarity index 100% rename from src/main/resources/data/c/tags/items/saplings.json rename to src/main/resources/data/c/tags/item/saplings.json diff --git a/src/main/resources/data/c/tags/items/stripped_logs.json b/src/main/resources/data/c/tags/item/stripped_logs.json similarity index 100% rename from src/main/resources/data/c/tags/items/stripped_logs.json rename to src/main/resources/data/c/tags/item/stripped_logs.json diff --git a/src/main/resources/data/c/tags/items/stripped_woods.json b/src/main/resources/data/c/tags/item/stripped_woods.json similarity index 100% rename from src/main/resources/data/c/tags/items/stripped_woods.json rename to src/main/resources/data/c/tags/item/stripped_woods.json diff --git a/src/main/resources/data/minecraft/tags/blocks/base_stone_overworld.json b/src/main/resources/data/minecraft/tags/block/base_stone_overworld.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/base_stone_overworld.json rename to src/main/resources/data/minecraft/tags/block/base_stone_overworld.json diff --git a/src/main/resources/data/minecraft/tags/blocks/bee_growables.json b/src/main/resources/data/minecraft/tags/block/bee_growables.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/bee_growables.json rename to src/main/resources/data/minecraft/tags/block/bee_growables.json diff --git a/src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json b/src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/ceiling_hanging_signs.json rename to src/main/resources/data/minecraft/tags/block/ceiling_hanging_signs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/dirt.json b/src/main/resources/data/minecraft/tags/block/dirt.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/dirt.json rename to src/main/resources/data/minecraft/tags/block/dirt.json diff --git a/src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json b/src/main/resources/data/minecraft/tags/block/enderman_holdable.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/enderman_holdable.json rename to src/main/resources/data/minecraft/tags/block/enderman_holdable.json diff --git a/src/main/resources/data/minecraft/tags/blocks/fence_gates.json b/src/main/resources/data/minecraft/tags/block/fence_gates.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/fence_gates.json rename to src/main/resources/data/minecraft/tags/block/fence_gates.json diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/main/resources/data/minecraft/tags/block/flower_pots.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/flower_pots.json rename to src/main/resources/data/minecraft/tags/block/flower_pots.json diff --git a/src/main/resources/data/minecraft/tags/blocks/flowers.json b/src/main/resources/data/minecraft/tags/block/flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/flowers.json rename to src/main/resources/data/minecraft/tags/block/flowers.json diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/main/resources/data/minecraft/tags/block/leaves.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/leaves.json rename to src/main/resources/data/minecraft/tags/block/leaves.json diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/main/resources/data/minecraft/tags/block/logs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/logs.json rename to src/main/resources/data/minecraft/tags/block/logs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/main/resources/data/minecraft/tags/block/logs_that_burn.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json rename to src/main/resources/data/minecraft/tags/block/logs_that_burn.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/main/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/block/mineable/hoe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json rename to src/main/resources/data/minecraft/tags/block/mineable/hoe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/block/mineable/shovel.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/main/resources/data/minecraft/tags/block/mineable/shovel.json diff --git a/src/main/resources/data/minecraft/tags/blocks/planks.json b/src/main/resources/data/minecraft/tags/block/planks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/planks.json rename to src/main/resources/data/minecraft/tags/block/planks.json diff --git a/src/main/resources/data/minecraft/tags/blocks/replaceable_by_trees.json b/src/main/resources/data/minecraft/tags/block/replaceable_by_trees.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/replaceable_by_trees.json rename to src/main/resources/data/minecraft/tags/block/replaceable_by_trees.json diff --git a/src/main/resources/data/minecraft/tags/blocks/saplings.json b/src/main/resources/data/minecraft/tags/block/saplings.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/saplings.json rename to src/main/resources/data/minecraft/tags/block/saplings.json diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/block/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/slabs.json rename to src/main/resources/data/minecraft/tags/block/slabs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/block/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/stairs.json rename to src/main/resources/data/minecraft/tags/block/stairs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/standing_signs.json b/src/main/resources/data/minecraft/tags/block/standing_signs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/standing_signs.json rename to src/main/resources/data/minecraft/tags/block/standing_signs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/stone_ore_replaceables.json b/src/main/resources/data/minecraft/tags/block/stone_ore_replaceables.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/stone_ore_replaceables.json rename to src/main/resources/data/minecraft/tags/block/stone_ore_replaceables.json diff --git a/src/main/resources/data/minecraft/tags/blocks/stripped_logs.json b/src/main/resources/data/minecraft/tags/block/stripped_logs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/stripped_logs.json rename to src/main/resources/data/minecraft/tags/block/stripped_logs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/sword_efficient.json b/src/main/resources/data/minecraft/tags/block/sword_efficient.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/sword_efficient.json rename to src/main/resources/data/minecraft/tags/block/sword_efficient.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json b/src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wall_hanging_signs.json rename to src/main/resources/data/minecraft/tags/block/wall_hanging_signs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wall_post_override.json b/src/main/resources/data/minecraft/tags/block/wall_post_override.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wall_post_override.json rename to src/main/resources/data/minecraft/tags/block/wall_post_override.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wall_signs.json b/src/main/resources/data/minecraft/tags/block/wall_signs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wall_signs.json rename to src/main/resources/data/minecraft/tags/block/wall_signs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/block/walls.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/walls.json rename to src/main/resources/data/minecraft/tags/block/walls.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wart_blocks.json b/src/main/resources/data/minecraft/tags/block/wart_blocks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wart_blocks.json rename to src/main/resources/data/minecraft/tags/block/wart_blocks.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json b/src/main/resources/data/minecraft/tags/block/wooden_buttons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json rename to src/main/resources/data/minecraft/tags/block/wooden_buttons.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/main/resources/data/minecraft/tags/block/wooden_doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_doors.json rename to src/main/resources/data/minecraft/tags/block/wooden_doors.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/main/resources/data/minecraft/tags/block/wooden_fences.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_fences.json rename to src/main/resources/data/minecraft/tags/block/wooden_fences.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json rename to src/main/resources/data/minecraft/tags/block/wooden_pressure_plates.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/main/resources/data/minecraft/tags/block/wooden_slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json rename to src/main/resources/data/minecraft/tags/block/wooden_slabs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/main/resources/data/minecraft/tags/block/wooden_stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json rename to src/main/resources/data/minecraft/tags/block/wooden_stairs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json rename to src/main/resources/data/minecraft/tags/block/wooden_trapdoors.json diff --git a/src/main/resources/data/minecraft/tags/entity_types/axolotl_always_hostiles.json b/src/main/resources/data/minecraft/tags/entity_type/axolotl_always_hostiles.json similarity index 100% rename from src/main/resources/data/minecraft/tags/entity_types/axolotl_always_hostiles.json rename to src/main/resources/data/minecraft/tags/entity_type/axolotl_always_hostiles.json diff --git a/src/main/resources/data/minecraft/tags/entity_types/fall_damage_immune.json b/src/main/resources/data/minecraft/tags/entity_type/fall_damage_immune.json similarity index 100% rename from src/main/resources/data/minecraft/tags/entity_types/fall_damage_immune.json rename to src/main/resources/data/minecraft/tags/entity_type/fall_damage_immune.json diff --git a/src/main/resources/data/minecraft/tags/entity_types/freeze_immune_entity_types.json b/src/main/resources/data/minecraft/tags/entity_type/freeze_immune_entity_types.json similarity index 100% rename from src/main/resources/data/minecraft/tags/entity_types/freeze_immune_entity_types.json rename to src/main/resources/data/minecraft/tags/entity_type/freeze_immune_entity_types.json diff --git a/src/main/resources/data/minecraft/tags/entity_types/skeletons.json b/src/main/resources/data/minecraft/tags/entity_type/skeletons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/entity_types/skeletons.json rename to src/main/resources/data/minecraft/tags/entity_type/skeletons.json diff --git a/src/main/resources/data/minecraft/tags/items/boats.json b/src/main/resources/data/minecraft/tags/item/boats.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/boats.json rename to src/main/resources/data/minecraft/tags/item/boats.json diff --git a/src/main/resources/data/minecraft/tags/items/chest_boats.json b/src/main/resources/data/minecraft/tags/item/chest_boats.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/chest_boats.json rename to src/main/resources/data/minecraft/tags/item/chest_boats.json diff --git a/src/main/resources/data/minecraft/tags/items/flowers.json b/src/main/resources/data/minecraft/tags/item/flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/flowers.json rename to src/main/resources/data/minecraft/tags/item/flowers.json diff --git a/src/main/resources/data/minecraft/tags/items/fox_food.json b/src/main/resources/data/minecraft/tags/item/fox_food.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/fox_food.json rename to src/main/resources/data/minecraft/tags/item/fox_food.json diff --git a/src/main/resources/data/minecraft/tags/items/hanging_signs.json b/src/main/resources/data/minecraft/tags/item/hanging_signs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/hanging_signs.json rename to src/main/resources/data/minecraft/tags/item/hanging_signs.json diff --git a/src/main/resources/data/minecraft/tags/items/leaves.json b/src/main/resources/data/minecraft/tags/item/leaves.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/leaves.json rename to src/main/resources/data/minecraft/tags/item/leaves.json diff --git a/src/main/resources/data/minecraft/tags/items/logs.json b/src/main/resources/data/minecraft/tags/item/logs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/logs.json rename to src/main/resources/data/minecraft/tags/item/logs.json diff --git a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json b/src/main/resources/data/minecraft/tags/item/logs_that_burn.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/logs_that_burn.json rename to src/main/resources/data/minecraft/tags/item/logs_that_burn.json diff --git a/src/main/resources/data/minecraft/tags/items/meat.json b/src/main/resources/data/minecraft/tags/item/meat.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/meat.json rename to src/main/resources/data/minecraft/tags/item/meat.json diff --git a/src/main/resources/data/minecraft/tags/items/non_flammable_wood.json b/src/main/resources/data/minecraft/tags/item/non_flammable_wood.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/non_flammable_wood.json rename to src/main/resources/data/minecraft/tags/item/non_flammable_wood.json diff --git a/src/main/resources/data/minecraft/tags/items/planks.json b/src/main/resources/data/minecraft/tags/item/planks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/planks.json rename to src/main/resources/data/minecraft/tags/item/planks.json diff --git a/src/main/resources/data/minecraft/tags/items/saplings.json b/src/main/resources/data/minecraft/tags/item/saplings.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/saplings.json rename to src/main/resources/data/minecraft/tags/item/saplings.json diff --git a/src/main/resources/data/minecraft/tags/items/signs.json b/src/main/resources/data/minecraft/tags/item/signs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/signs.json rename to src/main/resources/data/minecraft/tags/item/signs.json diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/item/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/slabs.json rename to src/main/resources/data/minecraft/tags/item/slabs.json diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/item/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/stairs.json rename to src/main/resources/data/minecraft/tags/item/stairs.json diff --git a/src/main/resources/data/minecraft/tags/items/stone_crafting_materials.json b/src/main/resources/data/minecraft/tags/item/stone_crafting_materials.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/stone_crafting_materials.json rename to src/main/resources/data/minecraft/tags/item/stone_crafting_materials.json diff --git a/src/main/resources/data/minecraft/tags/items/stone_tool_materials.json b/src/main/resources/data/minecraft/tags/item/stone_tool_materials.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/stone_tool_materials.json rename to src/main/resources/data/minecraft/tags/item/stone_tool_materials.json diff --git a/src/main/resources/data/minecraft/tags/items/stripped_logs.json b/src/main/resources/data/minecraft/tags/item/stripped_logs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/stripped_logs.json rename to src/main/resources/data/minecraft/tags/item/stripped_logs.json diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/item/walls.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/walls.json rename to src/main/resources/data/minecraft/tags/item/walls.json diff --git a/src/main/resources/data/minecraft/tags/items/wart_blocks.json b/src/main/resources/data/minecraft/tags/item/wart_blocks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wart_blocks.json rename to src/main/resources/data/minecraft/tags/item/wart_blocks.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_buttons.json b/src/main/resources/data/minecraft/tags/item/wooden_buttons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_buttons.json rename to src/main/resources/data/minecraft/tags/item/wooden_buttons.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/src/main/resources/data/minecraft/tags/item/wooden_doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_doors.json rename to src/main/resources/data/minecraft/tags/item/wooden_doors.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/src/main/resources/data/minecraft/tags/item/wooden_fences.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_fences.json rename to src/main/resources/data/minecraft/tags/item/wooden_fences.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json rename to src/main/resources/data/minecraft/tags/item/wooden_pressure_plates.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/src/main/resources/data/minecraft/tags/item/wooden_slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_slabs.json rename to src/main/resources/data/minecraft/tags/item/wooden_slabs.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/src/main/resources/data/minecraft/tags/item/wooden_stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_stairs.json rename to src/main/resources/data/minecraft/tags/item/wooden_stairs.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json b/src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json rename to src/main/resources/data/minecraft/tags/item/wooden_trapdoors.json diff --git a/src/main/resources/data/promenade/advancements/adventure/kill_sunken_outside_water.json b/src/main/resources/data/promenade/advancement/adventure/kill_sunken_outside_water.json similarity index 100% rename from src/main/resources/data/promenade/advancements/adventure/kill_sunken_outside_water.json rename to src/main/resources/data/promenade/advancement/adventure/kill_sunken_outside_water.json diff --git a/src/main/resources/data/promenade/advancements/husbandry/harvest_maple_syrup.json b/src/main/resources/data/promenade/advancement/husbandry/harvest_maple_syrup.json similarity index 100% rename from src/main/resources/data/promenade/advancements/husbandry/harvest_maple_syrup.json rename to src/main/resources/data/promenade/advancement/husbandry/harvest_maple_syrup.json diff --git a/src/main/resources/data/promenade/advancements/recipes/campfire_cooking/cooked_duck.json b/src/main/resources/data/promenade/advancement/recipes/campfire_cooking/cooked_duck.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/campfire_cooking/cooked_duck.json rename to src/main/resources/data/promenade/advancement/recipes/campfire_cooking/cooked_duck.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/polished_block.json b/src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/polished_block.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/polished_block.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/polished_slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/polished_slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/polished_slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/polished_stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/polished_stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/polished_stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/wall.json b/src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/wall.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/asphalt/wall.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/asphalt/wall.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blue_dye_from_blueberries.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blue_dye_from_blueberries.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blue_dye_from_blueberries.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blue_dye_from_blueberries.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite/polished_block.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blunite/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blunite/polished_block.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blunite/polished_block.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite/polished_slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blunite/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blunite/polished_slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blunite/polished_slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite/polished_stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blunite/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blunite/polished_stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blunite/polished_stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite/slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blunite/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blunite/slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blunite/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite/stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blunite/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blunite/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blunite/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite/wall.json b/src/main/resources/data/promenade/advancement/recipes/crafting/blunite/wall.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/blunite/wall.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/blunite/wall.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/button.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/button.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/button.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/button.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/door.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/door.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/door.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/door.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/fence.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/fence.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/fence.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/fence.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/fence_gate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/fence_gate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/fence_gate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/hanging_sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/hanging_sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/hanging_sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/hyphae.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/hyphae.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/hyphae.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/hyphae.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/planks.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/planks.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/planks.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/planks.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/pressure_plate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/pressure_plate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/pressure_plate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/trapdoor.json b/src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/dark_amaranth/trapdoor.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/dark_amaranth/trapdoor.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/boat.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/boat.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/boat.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/boat.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/button.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/button.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/button.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/button.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/chest_boat.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/chest_boat.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/chest_boat.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/chest_boat.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/door.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/door.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/door.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/door.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/fence.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/fence.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/fence.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/fence.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/fence_gate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/fence_gate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/fence_gate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/hanging_sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/hanging_sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/hanging_sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/fulvous.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/fulvous.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/fulvous.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/fulvous.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/mikado.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/mikado.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/mikado.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/mikado.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/sap.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/sap.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/sap.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/sap.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/vermilion.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/vermilion.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/leaf_pile/vermilion.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/leaf_pile/vermilion.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/planks.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/planks.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/planks.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/planks.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/pressure_plate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/pressure_plate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/pressure_plate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/trapdoor.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/trapdoor.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/trapdoor.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/maple/wood.json b/src/main/resources/data/promenade/advancement/recipes/crafting/maple/wood.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/maple/wood.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/maple/wood.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/boat.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/boat.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/boat.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/boat.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/button.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/button.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/button.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/button.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/chest_boat.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/chest_boat.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/chest_boat.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/chest_boat.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/door.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/door.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/door.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/door.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/fence.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/fence.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/fence.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/fence.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/fence_gate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/fence_gate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/fence_gate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/hanging_sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/hanging_sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/hanging_sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/leaf_pile.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/leaf_pile.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/leaf_pile.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/planks.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/planks.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/planks.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/planks.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/pressure_plate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/pressure_plate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/pressure_plate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/trapdoor.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/trapdoor.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/trapdoor.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/palm/wood.json b/src/main/resources/data/promenade/advancement/recipes/crafting/palm/wood.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/palm/wood.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/palm/wood.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/blossom_pile/blush.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/blossom_pile/blush.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/blossom_pile/blush.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/blossom_pile/blush.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/blossom_pile/cotton.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/blossom_pile/cotton.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/blossom_pile/cotton.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/blossom_pile/cotton.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/boat.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/boat.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/boat.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/boat.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/button.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/button.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/button.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/button.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/chest_boat.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/chest_boat.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/chest_boat.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/chest_boat.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/door.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/door.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/door.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/door.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/fence.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/fence.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/fence.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/fence.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/fence_gate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/fence_gate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/fence_gate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/hanging_sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/hanging_sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/hanging_sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/planks.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/planks.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/planks.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/planks.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/pressure_plate.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/pressure_plate.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/pressure_plate.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/sign.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/sign.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/sign.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/sign.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/slab.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/slab.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/stairs.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/trapdoor.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/trapdoor.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/trapdoor.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/sakura/wood.json b/src/main/resources/data/promenade/advancement/recipes/crafting/sakura/wood.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/sakura/wood.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/sakura/wood.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/acacia_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/acacia_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/acacia_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/acacia_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/allium.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/allium.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/allium.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/allium.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/azalea_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/azalea_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/azalea_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/azalea_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/azure_bluet.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/azure_bluet.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/azure_bluet.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/azure_bluet.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/birch_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/birch_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/birch_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/birch_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/blue_orchid.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/blue_orchid.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/blue_orchid.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/blue_orchid.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/cornflower.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/cornflower.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/cornflower.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/cornflower.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/dandelion.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/dandelion.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/dandelion.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/dandelion.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/dark_oak_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/dark_oak_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/dark_oak_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/dark_oak_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/jungle_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/jungle_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/jungle_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/jungle_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/lily_of_the_valley.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/lily_of_the_valley.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/lily_of_the_valley.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/lily_of_the_valley.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/mangrove_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/mangrove_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/mangrove_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/mangrove_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/oak_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/oak_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/oak_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/oak_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/orange_tulip.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/orange_tulip.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/orange_tulip.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/orange_tulip.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/oxeye_daisy.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/oxeye_daisy.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/oxeye_daisy.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/oxeye_daisy.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/pink_tulip.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/pink_tulip.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/pink_tulip.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/pink_tulip.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/poppy.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/poppy.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/poppy.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/poppy.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/red_tulip.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/red_tulip.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/red_tulip.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/red_tulip.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/spruce_leaf.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/spruce_leaf.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/spruce_leaf.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/spruce_leaf.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/white_tulip.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/white_tulip.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/white_tulip.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/white_tulip.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/wither_rose.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/wither_rose.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_piles/wither_rose.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_piles/wither_rose.json diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_snowy_leaves/spruce.json b/src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_snowy_leaves/spruce.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/crafting/vanilla_snowy_leaves/spruce.json rename to src/main/resources/data/promenade/advancement/recipes/crafting/vanilla_snowy_leaves/spruce.json diff --git a/src/main/resources/data/promenade/advancements/recipes/smoking/cooked_duck.json b/src/main/resources/data/promenade/advancement/recipes/smoking/cooked_duck.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/smoking/cooked_duck.json rename to src/main/resources/data/promenade/advancement/recipes/smoking/cooked_duck.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/polished_block.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/polished_block.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/polished_block.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/polished_slab.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/polished_slab.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/polished_slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/polished_stairs.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/polished_stairs.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/polished_stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/slab.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/slab.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/stairs.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/wall.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/wall.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/asphalt/wall.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/asphalt/wall.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/polished_block.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/polished_block.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/polished_block.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/polished_slab.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/polished_slab.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/polished_slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/polished_stairs.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/polished_stairs.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/polished_stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/slab.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/slab.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/slab.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/slab.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/stairs.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/stairs.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/stairs.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/stairs.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/wall.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/wall.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite/wall.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/blunite/wall.json diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/moai.json b/src/main/resources/data/promenade/advancement/recipes/stonecutting/moai.json similarity index 100% rename from src/main/resources/data/promenade/advancements/recipes/stonecutting/moai.json rename to src/main/resources/data/promenade/advancement/recipes/stonecutting/moai.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/acacia_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/acacia_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/acacia_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/acacia_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/allium_pile.json b/src/main/resources/data/promenade/loot_table/blocks/allium_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/allium_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/allium_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/asphalt.json b/src/main/resources/data/promenade/loot_table/blocks/asphalt.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/asphalt.json rename to src/main/resources/data/promenade/loot_table/blocks/asphalt.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/asphalt_slab.json b/src/main/resources/data/promenade/loot_table/blocks/asphalt_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/asphalt_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/asphalt_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/asphalt_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/asphalt_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/asphalt_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/asphalt_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/asphalt_wall.json b/src/main/resources/data/promenade/loot_table/blocks/asphalt_wall.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/asphalt_wall.json rename to src/main/resources/data/promenade/loot_table/blocks/asphalt_wall.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/azalea_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/azalea_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/azalea_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/azalea_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/azure_bluet_pile.json b/src/main/resources/data/promenade/loot_table/blocks/azure_bluet_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/azure_bluet_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/azure_bluet_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/birch_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/birch_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/birch_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/birch_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/black_dylium.json b/src/main/resources/data/promenade/loot_table/blocks/black_dylium.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/black_dylium.json rename to src/main/resources/data/promenade/loot_table/blocks/black_dylium.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blue_orchid_pile.json b/src/main/resources/data/promenade/loot_table/blocks/blue_orchid_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blue_orchid_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/blue_orchid_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blueberry_bush.json b/src/main/resources/data/promenade/loot_table/blocks/blueberry_bush.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blueberry_bush.json rename to src/main/resources/data/promenade/loot_table/blocks/blueberry_bush.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blunite.json b/src/main/resources/data/promenade/loot_table/blocks/blunite.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blunite.json rename to src/main/resources/data/promenade/loot_table/blocks/blunite.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blunite_slab.json b/src/main/resources/data/promenade/loot_table/blocks/blunite_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blunite_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/blunite_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blunite_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/blunite_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blunite_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/blunite_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blunite_wall.json b/src/main/resources/data/promenade/loot_table/blocks/blunite_wall.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blunite_wall.json rename to src/main/resources/data/promenade/loot_table/blocks/blunite_wall.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blush_sakura_blossom_pile.json b/src/main/resources/data/promenade/loot_table/blocks/blush_sakura_blossom_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blush_sakura_blossom_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/blush_sakura_blossom_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blush_sakura_blossoms.json b/src/main/resources/data/promenade/loot_table/blocks/blush_sakura_blossoms.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blush_sakura_blossoms.json rename to src/main/resources/data/promenade/loot_table/blocks/blush_sakura_blossoms.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blush_sakura_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/blush_sakura_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/blush_sakura_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/blush_sakura_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/cornflower_pile.json b/src/main/resources/data/promenade/loot_table/blocks/cornflower_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/cornflower_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/cornflower_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/cotton_sakura_blossom_pile.json b/src/main/resources/data/promenade/loot_table/blocks/cotton_sakura_blossom_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/cotton_sakura_blossom_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/cotton_sakura_blossom_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/cotton_sakura_blossoms.json b/src/main/resources/data/promenade/loot_table/blocks/cotton_sakura_blossoms.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/cotton_sakura_blossoms.json rename to src/main/resources/data/promenade/loot_table/blocks/cotton_sakura_blossoms.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/cotton_sakura_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/cotton_sakura_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/cotton_sakura_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/cotton_sakura_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dandelion_pile.json b/src/main/resources/data/promenade/loot_table/blocks/dandelion_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dandelion_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/dandelion_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_button.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_button.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_button.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_button.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_door.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_door.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_door.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_door.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_fence.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_fence.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_fence.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_fence.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_fence_gate.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_fence_gate.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_fence_gate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_fungus.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_fungus.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_fungus.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_fungus.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_hyphae.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_hyphae.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_hyphae.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_hyphae.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_planks.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_planks.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_planks.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_planks.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_pressure_plate.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_pressure_plate.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_pressure_plate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_roots.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_roots.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_roots.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_roots.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_sign.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_slab.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_stem.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_stem.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_stem.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_stem.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_trapdoor.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_trapdoor.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_trapdoor.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_wall_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_wall_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_wall_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_wall_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_wall_sign.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_wall_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_wall_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_wall_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_wart_block.json b/src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_wart_block.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_amaranth_wart_block.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_amaranth_wart_block.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/dark_oak_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/dark_oak_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/dark_oak_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/dark_oak_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/flowering_azalea_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/flowering_azalea_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/flowering_azalea_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/flowering_azalea_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/fulvous_carpeted_grass_block.json b/src/main/resources/data/promenade/loot_table/blocks/fulvous_carpeted_grass_block.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/fulvous_carpeted_grass_block.json rename to src/main/resources/data/promenade/loot_table/blocks/fulvous_carpeted_grass_block.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/fulvous_maple_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/fulvous_maple_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/fulvous_maple_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/fulvous_maple_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/fulvous_maple_leaves.json b/src/main/resources/data/promenade/loot_table/blocks/fulvous_maple_leaves.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/fulvous_maple_leaves.json rename to src/main/resources/data/promenade/loot_table/blocks/fulvous_maple_leaves.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/fulvous_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/fulvous_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/fulvous_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/fulvous_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/jungle_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/jungle_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/jungle_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/jungle_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/lily_of_the_valley_pile.json b/src/main/resources/data/promenade/loot_table/blocks/lily_of_the_valley_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/lily_of_the_valley_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/lily_of_the_valley_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/mangrove_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/mangrove_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/mangrove_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/mangrove_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_button.json b/src/main/resources/data/promenade/loot_table/blocks/maple_button.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_button.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_button.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_door.json b/src/main/resources/data/promenade/loot_table/blocks/maple_door.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_door.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_door.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_fence.json b/src/main/resources/data/promenade/loot_table/blocks/maple_fence.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_fence.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_fence.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_fence_gate.json b/src/main/resources/data/promenade/loot_table/blocks/maple_fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_fence_gate.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_fence_gate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/maple_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_log.json b/src/main/resources/data/promenade/loot_table/blocks/maple_log.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_log.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_log.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_planks.json b/src/main/resources/data/promenade/loot_table/blocks/maple_planks.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_planks.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_planks.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_pressure_plate.json b/src/main/resources/data/promenade/loot_table/blocks/maple_pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_pressure_plate.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_pressure_plate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_sign.json b/src/main/resources/data/promenade/loot_table/blocks/maple_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_slab.json b/src/main/resources/data/promenade/loot_table/blocks/maple_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/maple_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_trapdoor.json b/src/main/resources/data/promenade/loot_table/blocks/maple_trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_trapdoor.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_trapdoor.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_wall_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/maple_wall_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_wall_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_wall_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_wall_sign.json b/src/main/resources/data/promenade/loot_table/blocks/maple_wall_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_wall_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_wall_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/maple_wood.json b/src/main/resources/data/promenade/loot_table/blocks/maple_wood.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/maple_wood.json rename to src/main/resources/data/promenade/loot_table/blocks/maple_wood.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/mikado_carpeted_grass_block.json b/src/main/resources/data/promenade/loot_table/blocks/mikado_carpeted_grass_block.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/mikado_carpeted_grass_block.json rename to src/main/resources/data/promenade/loot_table/blocks/mikado_carpeted_grass_block.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/mikado_maple_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/mikado_maple_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/mikado_maple_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/mikado_maple_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/mikado_maple_leaves.json b/src/main/resources/data/promenade/loot_table/blocks/mikado_maple_leaves.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/mikado_maple_leaves.json rename to src/main/resources/data/promenade/loot_table/blocks/mikado_maple_leaves.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/mikado_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/mikado_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/mikado_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/mikado_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/moai.json b/src/main/resources/data/promenade/loot_table/blocks/moai.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/moai.json rename to src/main/resources/data/promenade/loot_table/blocks/moai.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/oak_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/oak_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/oak_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/oak_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/orange_tulip_pile.json b/src/main/resources/data/promenade/loot_table/blocks/orange_tulip_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/orange_tulip_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/orange_tulip_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/oxeye_daisy_pile.json b/src/main/resources/data/promenade/loot_table/blocks/oxeye_daisy_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/oxeye_daisy_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/oxeye_daisy_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_button.json b/src/main/resources/data/promenade/loot_table/blocks/palm_button.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_button.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_button.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_door.json b/src/main/resources/data/promenade/loot_table/blocks/palm_door.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_door.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_door.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_fence.json b/src/main/resources/data/promenade/loot_table/blocks/palm_fence.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_fence.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_fence.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_fence_gate.json b/src/main/resources/data/promenade/loot_table/blocks/palm_fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_fence_gate.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_fence_gate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/palm_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/palm_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_leaves.json b/src/main/resources/data/promenade/loot_table/blocks/palm_leaves.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_leaves.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_leaves.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_log.json b/src/main/resources/data/promenade/loot_table/blocks/palm_log.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_log.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_log.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_planks.json b/src/main/resources/data/promenade/loot_table/blocks/palm_planks.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_planks.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_planks.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_pressure_plate.json b/src/main/resources/data/promenade/loot_table/blocks/palm_pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_pressure_plate.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_pressure_plate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/palm_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_sign.json b/src/main/resources/data/promenade/loot_table/blocks/palm_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_slab.json b/src/main/resources/data/promenade/loot_table/blocks/palm_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/palm_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_trapdoor.json b/src/main/resources/data/promenade/loot_table/blocks/palm_trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_trapdoor.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_trapdoor.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_wall_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/palm_wall_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_wall_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_wall_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_wall_sign.json b/src/main/resources/data/promenade/loot_table/blocks/palm_wall_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_wall_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_wall_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/palm_wood.json b/src/main/resources/data/promenade/loot_table/blocks/palm_wood.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/palm_wood.json rename to src/main/resources/data/promenade/loot_table/blocks/palm_wood.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/pink_tulip_pile.json b/src/main/resources/data/promenade/loot_table/blocks/pink_tulip_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/pink_tulip_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/pink_tulip_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/polished_asphalt.json b/src/main/resources/data/promenade/loot_table/blocks/polished_asphalt.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/polished_asphalt.json rename to src/main/resources/data/promenade/loot_table/blocks/polished_asphalt.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/polished_asphalt_slab.json b/src/main/resources/data/promenade/loot_table/blocks/polished_asphalt_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/polished_asphalt_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/polished_asphalt_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/polished_asphalt_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/polished_asphalt_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/polished_asphalt_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/polished_asphalt_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/polished_blunite.json b/src/main/resources/data/promenade/loot_table/blocks/polished_blunite.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/polished_blunite.json rename to src/main/resources/data/promenade/loot_table/blocks/polished_blunite.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/polished_blunite_slab.json b/src/main/resources/data/promenade/loot_table/blocks/polished_blunite_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/polished_blunite_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/polished_blunite_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/polished_blunite_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/polished_blunite_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/polished_blunite_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/polished_blunite_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/poppy_pile.json b/src/main/resources/data/promenade/loot_table/blocks/poppy_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/poppy_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/poppy_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_blush_sakura_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_blush_sakura_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_blush_sakura_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_blush_sakura_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_cotton_sakura_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_cotton_sakura_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_cotton_sakura_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_cotton_sakura_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_dark_amaranth_fungus.json b/src/main/resources/data/promenade/loot_table/blocks/potted_dark_amaranth_fungus.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_dark_amaranth_fungus.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_dark_amaranth_fungus.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_fulvous_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_fulvous_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_fulvous_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_fulvous_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_mikado_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_mikado_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_mikado_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_mikado_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_palm_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_palm_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_palm_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_palm_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_sap_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_sap_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_sap_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_sap_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/potted_vermilion_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/potted_vermilion_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/potted_vermilion_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/potted_vermilion_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/red_tulip_pile.json b/src/main/resources/data/promenade/loot_table/blocks/red_tulip_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/red_tulip_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/red_tulip_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_button.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_button.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_button.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_button.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_door.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_door.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_door.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_door.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_fence.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_fence.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_fence.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_fence.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_fence_gate.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_fence_gate.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_fence_gate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_log.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_log.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_log.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_log.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_planks.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_planks.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_planks.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_planks.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_pressure_plate.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_pressure_plate.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_pressure_plate.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_sign.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_slab.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_slab.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_slab.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_slab.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_stairs.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_stairs.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_stairs.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_stairs.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_trapdoor.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_trapdoor.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_trapdoor.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_wall_hanging_sign.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_wall_hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_wall_hanging_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_wall_hanging_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_wall_sign.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_wall_sign.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_wall_sign.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_wall_sign.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sakura_wood.json b/src/main/resources/data/promenade/loot_table/blocks/sakura_wood.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sakura_wood.json rename to src/main/resources/data/promenade/loot_table/blocks/sakura_wood.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sap_maple_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/sap_maple_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sap_maple_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/sap_maple_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sap_maple_leaves.json b/src/main/resources/data/promenade/loot_table/blocks/sap_maple_leaves.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sap_maple_leaves.json rename to src/main/resources/data/promenade/loot_table/blocks/sap_maple_leaves.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/sap_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/sap_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/sap_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/sap_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/snowy_spruce_leaves.json b/src/main/resources/data/promenade/loot_table/blocks/snowy_spruce_leaves.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/snowy_spruce_leaves.json rename to src/main/resources/data/promenade/loot_table/blocks/snowy_spruce_leaves.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/spruce_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/spruce_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/spruce_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/spruce_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_dark_amaranth_hyphae.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_dark_amaranth_hyphae.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_dark_amaranth_hyphae.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_dark_amaranth_hyphae.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_dark_amaranth_stem.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_dark_amaranth_stem.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_dark_amaranth_stem.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_dark_amaranth_stem.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_maple_log.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_maple_log.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_maple_log.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_maple_log.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_maple_wood.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_maple_wood.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_maple_wood.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_maple_wood.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_palm_log.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_palm_log.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_palm_log.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_palm_log.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_palm_wood.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_palm_wood.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_palm_wood.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_palm_wood.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_sakura_log.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_sakura_log.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_sakura_log.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_sakura_log.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/stripped_sakura_wood.json b/src/main/resources/data/promenade/loot_table/blocks/stripped_sakura_wood.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/stripped_sakura_wood.json rename to src/main/resources/data/promenade/loot_table/blocks/stripped_sakura_wood.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/vermilion_carpeted_grass_block.json b/src/main/resources/data/promenade/loot_table/blocks/vermilion_carpeted_grass_block.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/vermilion_carpeted_grass_block.json rename to src/main/resources/data/promenade/loot_table/blocks/vermilion_carpeted_grass_block.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/vermilion_maple_leaf_pile.json b/src/main/resources/data/promenade/loot_table/blocks/vermilion_maple_leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/vermilion_maple_leaf_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/vermilion_maple_leaf_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/vermilion_maple_leaves.json b/src/main/resources/data/promenade/loot_table/blocks/vermilion_maple_leaves.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/vermilion_maple_leaves.json rename to src/main/resources/data/promenade/loot_table/blocks/vermilion_maple_leaves.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/vermilion_maple_sapling.json b/src/main/resources/data/promenade/loot_table/blocks/vermilion_maple_sapling.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/vermilion_maple_sapling.json rename to src/main/resources/data/promenade/loot_table/blocks/vermilion_maple_sapling.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/white_tulip_pile.json b/src/main/resources/data/promenade/loot_table/blocks/white_tulip_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/white_tulip_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/white_tulip_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/blocks/wither_rose_pile.json b/src/main/resources/data/promenade/loot_table/blocks/wither_rose_pile.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/blocks/wither_rose_pile.json rename to src/main/resources/data/promenade/loot_table/blocks/wither_rose_pile.json diff --git a/src/main/resources/data/promenade/loot_tables/chests/witch_hut.json b/src/main/resources/data/promenade/loot_table/chests/witch_hut.json similarity index 100% rename from src/main/resources/data/promenade/loot_tables/chests/witch_hut.json rename to src/main/resources/data/promenade/loot_table/chests/witch_hut.json diff --git a/src/main/resources/data/promenade/loot_table/entities/duck.json b/src/main/resources/data/promenade/loot_table/entities/duck.json new file mode 100644 index 00000000..bed2f276 --- /dev/null +++ b/src/main/resources/data/promenade/loot_table/entities/duck.json @@ -0,0 +1,89 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:feather", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "minecraft:uniform", + "min": 0, + "max": 2 + } + }, + { + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", + "count": { + "type": "minecraft:uniform", + "min": 0, + "max": 1 + } + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "promenade:duck", + "functions": [ + { + "function": "minecraft:furnace_smelt", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "flags": { + "is_on_fire": true + } + } + }, + { + "condition": "minecraft:entity_properties", + "entity": "direct_attacker", + "predicate": { + "equipment": { + "mainhand": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "#minecraft:smelts_loot" + } + ] + } + } + } + } + } + ] + } + ] + }, + { + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", + "count": { + "type": "minecraft:uniform", + "min": 0, + "max": 1 + } + } + ] + } + ] + } + ] +} diff --git a/src/main/resources/data/promenade/loot_tables/entities/lush_creeper.json b/src/main/resources/data/promenade/loot_table/entities/lush_creeper.json similarity index 85% rename from src/main/resources/data/promenade/loot_tables/entities/lush_creeper.json rename to src/main/resources/data/promenade/loot_table/entities/lush_creeper.json index 8446b664..6c054947 100644 --- a/src/main/resources/data/promenade/loot_tables/entities/lush_creeper.json +++ b/src/main/resources/data/promenade/loot_table/entities/lush_creeper.json @@ -18,7 +18,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -48,7 +49,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -69,7 +71,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -92,7 +95,7 @@ "conditions": [ { "condition": "minecraft:entity_properties", - "entity": "killer", + "entity": "attacker", "predicate": { "type": "#minecraft:skeletons" } diff --git a/src/main/resources/data/promenade/loot_tables/entities/sunken/bubble.json b/src/main/resources/data/promenade/loot_table/entities/sunken/bubble.json similarity index 87% rename from src/main/resources/data/promenade/loot_tables/entities/sunken/bubble.json rename to src/main/resources/data/promenade/loot_table/entities/sunken/bubble.json index 60cfd841..444e5ff2 100644 --- a/src/main/resources/data/promenade/loot_tables/entities/sunken/bubble.json +++ b/src/main/resources/data/promenade/loot_table/entities/sunken/bubble.json @@ -19,7 +19,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -48,7 +49,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -97,7 +99,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, diff --git a/src/main/resources/data/promenade/loot_tables/entities/sunken/fire.json b/src/main/resources/data/promenade/loot_table/entities/sunken/fire.json similarity index 87% rename from src/main/resources/data/promenade/loot_tables/entities/sunken/fire.json rename to src/main/resources/data/promenade/loot_table/entities/sunken/fire.json index 139506e2..34d9cd8a 100644 --- a/src/main/resources/data/promenade/loot_tables/entities/sunken/fire.json +++ b/src/main/resources/data/promenade/loot_table/entities/sunken/fire.json @@ -19,7 +19,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -48,7 +49,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -97,7 +99,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, diff --git a/src/main/resources/data/promenade/loot_tables/entities/sunken/horn.json b/src/main/resources/data/promenade/loot_table/entities/sunken/horn.json similarity index 87% rename from src/main/resources/data/promenade/loot_tables/entities/sunken/horn.json rename to src/main/resources/data/promenade/loot_table/entities/sunken/horn.json index da2ad28f..b4643ccd 100644 --- a/src/main/resources/data/promenade/loot_tables/entities/sunken/horn.json +++ b/src/main/resources/data/promenade/loot_table/entities/sunken/horn.json @@ -19,7 +19,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -48,7 +49,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, @@ -97,7 +99,8 @@ "add": false }, { - "function": "minecraft:looting_enchant", + "function": "minecraft:enchanted_count_increase", + "enchantment": "minecraft:looting", "count": { "type": "minecraft:uniform", "min": 0, diff --git a/src/main/resources/data/promenade/loot_tables/entities/duck.json b/src/main/resources/data/promenade/loot_tables/entities/duck.json deleted file mode 100644 index 8d58df8b..00000000 --- a/src/main/resources/data/promenade/loot_tables/entities/duck.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "type": "minecraft:entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:feather", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 0, - "max": 2 - } - }, - { - "function": "minecraft:looting_enchant", - "count": { - "type": "minecraft:uniform", - "min": 0, - "max": 1 - } - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "promenade:duck", - "functions": [ - { - "function": "minecraft:furnace_smelt", - "conditions": [ - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "flags": { - "is_on_fire": true - } - } - } - ] - }, - { - "function": "minecraft:looting_enchant", - "count": { - "type": "minecraft:uniform", - "min": 0, - "max": 1 - } - } - ] - } - ] - } - ] -} diff --git a/src/main/resources/data/promenade/painting_variant/nurture.json b/src/main/resources/data/promenade/painting_variant/nurture.json new file mode 100644 index 00000000..688dc172 --- /dev/null +++ b/src/main/resources/data/promenade/painting_variant/nurture.json @@ -0,0 +1,5 @@ +{ + "asset_id": "promenade:nurture", + "width": 2, + "height": 2 +} diff --git a/src/main/resources/data/promenade/painting_variant/optimism.json b/src/main/resources/data/promenade/painting_variant/optimism.json new file mode 100644 index 00000000..7801fbf1 --- /dev/null +++ b/src/main/resources/data/promenade/painting_variant/optimism.json @@ -0,0 +1,5 @@ +{ + "asset_id": "promenade:optimism", + "width": 2, + "height": 2 +} diff --git a/src/main/resources/data/promenade/recipes/campfire_cooking/cooked_duck.json b/src/main/resources/data/promenade/recipe/campfire_cooking/cooked_duck.json similarity index 100% rename from src/main/resources/data/promenade/recipes/campfire_cooking/cooked_duck.json rename to src/main/resources/data/promenade/recipe/campfire_cooking/cooked_duck.json diff --git a/src/main/resources/data/promenade/recipes/crafting/asphalt/polished_block.json b/src/main/resources/data/promenade/recipe/crafting/asphalt/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/asphalt/polished_block.json rename to src/main/resources/data/promenade/recipe/crafting/asphalt/polished_block.json diff --git a/src/main/resources/data/promenade/recipes/crafting/asphalt/polished_slab.json b/src/main/resources/data/promenade/recipe/crafting/asphalt/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/asphalt/polished_slab.json rename to src/main/resources/data/promenade/recipe/crafting/asphalt/polished_slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/asphalt/polished_stairs.json b/src/main/resources/data/promenade/recipe/crafting/asphalt/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/asphalt/polished_stairs.json rename to src/main/resources/data/promenade/recipe/crafting/asphalt/polished_stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/asphalt/slab.json b/src/main/resources/data/promenade/recipe/crafting/asphalt/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/asphalt/slab.json rename to src/main/resources/data/promenade/recipe/crafting/asphalt/slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/asphalt/stairs.json b/src/main/resources/data/promenade/recipe/crafting/asphalt/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/asphalt/stairs.json rename to src/main/resources/data/promenade/recipe/crafting/asphalt/stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/asphalt/wall.json b/src/main/resources/data/promenade/recipe/crafting/asphalt/wall.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/asphalt/wall.json rename to src/main/resources/data/promenade/recipe/crafting/asphalt/wall.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blue_dye_from_blueberries.json b/src/main/resources/data/promenade/recipe/crafting/blue_dye_from_blueberries.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blue_dye_from_blueberries.json rename to src/main/resources/data/promenade/recipe/crafting/blue_dye_from_blueberries.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite/polished_block.json b/src/main/resources/data/promenade/recipe/crafting/blunite/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blunite/polished_block.json rename to src/main/resources/data/promenade/recipe/crafting/blunite/polished_block.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite/polished_slab.json b/src/main/resources/data/promenade/recipe/crafting/blunite/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blunite/polished_slab.json rename to src/main/resources/data/promenade/recipe/crafting/blunite/polished_slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite/polished_stairs.json b/src/main/resources/data/promenade/recipe/crafting/blunite/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blunite/polished_stairs.json rename to src/main/resources/data/promenade/recipe/crafting/blunite/polished_stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite/slab.json b/src/main/resources/data/promenade/recipe/crafting/blunite/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blunite/slab.json rename to src/main/resources/data/promenade/recipe/crafting/blunite/slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite/stairs.json b/src/main/resources/data/promenade/recipe/crafting/blunite/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blunite/stairs.json rename to src/main/resources/data/promenade/recipe/crafting/blunite/stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite/wall.json b/src/main/resources/data/promenade/recipe/crafting/blunite/wall.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/blunite/wall.json rename to src/main/resources/data/promenade/recipe/crafting/blunite/wall.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/button.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/button.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/button.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/button.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/door.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/door.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/door.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/door.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/fence.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/fence.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/fence.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/fence.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/fence_gate.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/fence_gate.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/fence_gate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/hanging_sign.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/hanging_sign.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/hanging_sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/hyphae.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/hyphae.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/hyphae.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/hyphae.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/planks.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/planks.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/planks.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/planks.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/pressure_plate.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/pressure_plate.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/pressure_plate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/sign.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/sign.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/slab.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/slab.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/stairs.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/stairs.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/dark_amaranth/trapdoor.json b/src/main/resources/data/promenade/recipe/crafting/dark_amaranth/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/dark_amaranth/trapdoor.json rename to src/main/resources/data/promenade/recipe/crafting/dark_amaranth/trapdoor.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/boat.json b/src/main/resources/data/promenade/recipe/crafting/maple/boat.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/boat.json rename to src/main/resources/data/promenade/recipe/crafting/maple/boat.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/button.json b/src/main/resources/data/promenade/recipe/crafting/maple/button.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/button.json rename to src/main/resources/data/promenade/recipe/crafting/maple/button.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/chest_boat.json b/src/main/resources/data/promenade/recipe/crafting/maple/chest_boat.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/chest_boat.json rename to src/main/resources/data/promenade/recipe/crafting/maple/chest_boat.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/door.json b/src/main/resources/data/promenade/recipe/crafting/maple/door.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/door.json rename to src/main/resources/data/promenade/recipe/crafting/maple/door.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/fence.json b/src/main/resources/data/promenade/recipe/crafting/maple/fence.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/fence.json rename to src/main/resources/data/promenade/recipe/crafting/maple/fence.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/fence_gate.json b/src/main/resources/data/promenade/recipe/crafting/maple/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/fence_gate.json rename to src/main/resources/data/promenade/recipe/crafting/maple/fence_gate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/hanging_sign.json b/src/main/resources/data/promenade/recipe/crafting/maple/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/hanging_sign.json rename to src/main/resources/data/promenade/recipe/crafting/maple/hanging_sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/fulvous.json b/src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/fulvous.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/fulvous.json rename to src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/fulvous.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/mikado.json b/src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/mikado.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/mikado.json rename to src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/mikado.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/sap.json b/src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/sap.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/sap.json rename to src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/sap.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/vermilion.json b/src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/vermilion.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/leaf_pile/vermilion.json rename to src/main/resources/data/promenade/recipe/crafting/maple/leaf_pile/vermilion.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/planks.json b/src/main/resources/data/promenade/recipe/crafting/maple/planks.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/planks.json rename to src/main/resources/data/promenade/recipe/crafting/maple/planks.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/pressure_plate.json b/src/main/resources/data/promenade/recipe/crafting/maple/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/pressure_plate.json rename to src/main/resources/data/promenade/recipe/crafting/maple/pressure_plate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/sign.json b/src/main/resources/data/promenade/recipe/crafting/maple/sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/sign.json rename to src/main/resources/data/promenade/recipe/crafting/maple/sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/slab.json b/src/main/resources/data/promenade/recipe/crafting/maple/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/slab.json rename to src/main/resources/data/promenade/recipe/crafting/maple/slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/stairs.json b/src/main/resources/data/promenade/recipe/crafting/maple/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/stairs.json rename to src/main/resources/data/promenade/recipe/crafting/maple/stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/trapdoor.json b/src/main/resources/data/promenade/recipe/crafting/maple/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/trapdoor.json rename to src/main/resources/data/promenade/recipe/crafting/maple/trapdoor.json diff --git a/src/main/resources/data/promenade/recipes/crafting/maple/wood.json b/src/main/resources/data/promenade/recipe/crafting/maple/wood.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/maple/wood.json rename to src/main/resources/data/promenade/recipe/crafting/maple/wood.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/boat.json b/src/main/resources/data/promenade/recipe/crafting/palm/boat.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/boat.json rename to src/main/resources/data/promenade/recipe/crafting/palm/boat.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/button.json b/src/main/resources/data/promenade/recipe/crafting/palm/button.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/button.json rename to src/main/resources/data/promenade/recipe/crafting/palm/button.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/chest_boat.json b/src/main/resources/data/promenade/recipe/crafting/palm/chest_boat.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/chest_boat.json rename to src/main/resources/data/promenade/recipe/crafting/palm/chest_boat.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/door.json b/src/main/resources/data/promenade/recipe/crafting/palm/door.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/door.json rename to src/main/resources/data/promenade/recipe/crafting/palm/door.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/fence.json b/src/main/resources/data/promenade/recipe/crafting/palm/fence.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/fence.json rename to src/main/resources/data/promenade/recipe/crafting/palm/fence.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/fence_gate.json b/src/main/resources/data/promenade/recipe/crafting/palm/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/fence_gate.json rename to src/main/resources/data/promenade/recipe/crafting/palm/fence_gate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/hanging_sign.json b/src/main/resources/data/promenade/recipe/crafting/palm/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/hanging_sign.json rename to src/main/resources/data/promenade/recipe/crafting/palm/hanging_sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/leaf_pile.json b/src/main/resources/data/promenade/recipe/crafting/palm/leaf_pile.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/leaf_pile.json rename to src/main/resources/data/promenade/recipe/crafting/palm/leaf_pile.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/planks.json b/src/main/resources/data/promenade/recipe/crafting/palm/planks.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/planks.json rename to src/main/resources/data/promenade/recipe/crafting/palm/planks.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/pressure_plate.json b/src/main/resources/data/promenade/recipe/crafting/palm/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/pressure_plate.json rename to src/main/resources/data/promenade/recipe/crafting/palm/pressure_plate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/sign.json b/src/main/resources/data/promenade/recipe/crafting/palm/sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/sign.json rename to src/main/resources/data/promenade/recipe/crafting/palm/sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/slab.json b/src/main/resources/data/promenade/recipe/crafting/palm/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/slab.json rename to src/main/resources/data/promenade/recipe/crafting/palm/slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/stairs.json b/src/main/resources/data/promenade/recipe/crafting/palm/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/stairs.json rename to src/main/resources/data/promenade/recipe/crafting/palm/stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/trapdoor.json b/src/main/resources/data/promenade/recipe/crafting/palm/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/trapdoor.json rename to src/main/resources/data/promenade/recipe/crafting/palm/trapdoor.json diff --git a/src/main/resources/data/promenade/recipes/crafting/palm/wood.json b/src/main/resources/data/promenade/recipe/crafting/palm/wood.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/palm/wood.json rename to src/main/resources/data/promenade/recipe/crafting/palm/wood.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/blossom_pile/blush.json b/src/main/resources/data/promenade/recipe/crafting/sakura/blossom_pile/blush.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/blossom_pile/blush.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/blossom_pile/blush.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/blossom_pile/cotton.json b/src/main/resources/data/promenade/recipe/crafting/sakura/blossom_pile/cotton.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/blossom_pile/cotton.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/blossom_pile/cotton.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/boat.json b/src/main/resources/data/promenade/recipe/crafting/sakura/boat.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/boat.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/boat.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/button.json b/src/main/resources/data/promenade/recipe/crafting/sakura/button.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/button.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/button.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/chest_boat.json b/src/main/resources/data/promenade/recipe/crafting/sakura/chest_boat.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/chest_boat.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/chest_boat.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/door.json b/src/main/resources/data/promenade/recipe/crafting/sakura/door.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/door.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/door.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/fence.json b/src/main/resources/data/promenade/recipe/crafting/sakura/fence.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/fence.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/fence.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/fence_gate.json b/src/main/resources/data/promenade/recipe/crafting/sakura/fence_gate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/fence_gate.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/fence_gate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/hanging_sign.json b/src/main/resources/data/promenade/recipe/crafting/sakura/hanging_sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/hanging_sign.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/hanging_sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/planks.json b/src/main/resources/data/promenade/recipe/crafting/sakura/planks.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/planks.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/planks.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/pressure_plate.json b/src/main/resources/data/promenade/recipe/crafting/sakura/pressure_plate.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/pressure_plate.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/pressure_plate.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/sign.json b/src/main/resources/data/promenade/recipe/crafting/sakura/sign.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/sign.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/sign.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/slab.json b/src/main/resources/data/promenade/recipe/crafting/sakura/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/slab.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/slab.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/stairs.json b/src/main/resources/data/promenade/recipe/crafting/sakura/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/stairs.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/stairs.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/trapdoor.json b/src/main/resources/data/promenade/recipe/crafting/sakura/trapdoor.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/trapdoor.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/trapdoor.json diff --git a/src/main/resources/data/promenade/recipes/crafting/sakura/wood.json b/src/main/resources/data/promenade/recipe/crafting/sakura/wood.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/sakura/wood.json rename to src/main/resources/data/promenade/recipe/crafting/sakura/wood.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/acacia_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/acacia_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/acacia_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/acacia_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/allium.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/allium.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/allium.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/allium.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/azalea_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/azalea_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/azalea_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/azalea_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/azure_bluet.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/azure_bluet.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/azure_bluet.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/azure_bluet.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/birch_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/birch_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/birch_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/birch_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/blue_orchid.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/blue_orchid.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/blue_orchid.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/blue_orchid.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/cornflower.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/cornflower.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/cornflower.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/cornflower.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/dandelion.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/dandelion.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/dandelion.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/dandelion.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/dark_oak_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/dark_oak_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/dark_oak_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/dark_oak_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/flowering_azalea_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/flowering_azalea_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/flowering_azalea_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/jungle_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/jungle_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/jungle_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/jungle_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/lily_of_the_valley.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/lily_of_the_valley.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/lily_of_the_valley.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/lily_of_the_valley.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/mangrove_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/mangrove_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/mangrove_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/mangrove_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/oak_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/oak_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/oak_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/oak_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/orange_tulip.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/orange_tulip.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/orange_tulip.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/orange_tulip.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/oxeye_daisy.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/oxeye_daisy.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/oxeye_daisy.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/oxeye_daisy.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/pink_tulip.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/pink_tulip.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/pink_tulip.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/pink_tulip.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/poppy.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/poppy.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/poppy.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/poppy.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/red_tulip.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/red_tulip.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/red_tulip.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/red_tulip.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/spruce_leaf.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/spruce_leaf.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/spruce_leaf.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/spruce_leaf.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/white_tulip.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/white_tulip.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/white_tulip.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/white_tulip.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_piles/wither_rose.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_piles/wither_rose.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_piles/wither_rose.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_piles/wither_rose.json diff --git a/src/main/resources/data/promenade/recipes/crafting/vanilla_snowy_leaves/spruce.json b/src/main/resources/data/promenade/recipe/crafting/vanilla_snowy_leaves/spruce.json similarity index 100% rename from src/main/resources/data/promenade/recipes/crafting/vanilla_snowy_leaves/spruce.json rename to src/main/resources/data/promenade/recipe/crafting/vanilla_snowy_leaves/spruce.json diff --git a/src/main/resources/data/promenade/recipes/smelting/cooked_duck.json b/src/main/resources/data/promenade/recipe/smelting/cooked_duck.json similarity index 100% rename from src/main/resources/data/promenade/recipes/smelting/cooked_duck.json rename to src/main/resources/data/promenade/recipe/smelting/cooked_duck.json diff --git a/src/main/resources/data/promenade/recipes/smoking/cooked_duck.json b/src/main/resources/data/promenade/recipe/smoking/cooked_duck.json similarity index 100% rename from src/main/resources/data/promenade/recipes/smoking/cooked_duck.json rename to src/main/resources/data/promenade/recipe/smoking/cooked_duck.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/asphalt/polished_block.json b/src/main/resources/data/promenade/recipe/stonecutting/asphalt/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/asphalt/polished_block.json rename to src/main/resources/data/promenade/recipe/stonecutting/asphalt/polished_block.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/asphalt/polished_slab.json b/src/main/resources/data/promenade/recipe/stonecutting/asphalt/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/asphalt/polished_slab.json rename to src/main/resources/data/promenade/recipe/stonecutting/asphalt/polished_slab.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/asphalt/polished_stairs.json b/src/main/resources/data/promenade/recipe/stonecutting/asphalt/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/asphalt/polished_stairs.json rename to src/main/resources/data/promenade/recipe/stonecutting/asphalt/polished_stairs.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/asphalt/slab.json b/src/main/resources/data/promenade/recipe/stonecutting/asphalt/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/asphalt/slab.json rename to src/main/resources/data/promenade/recipe/stonecutting/asphalt/slab.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/asphalt/stairs.json b/src/main/resources/data/promenade/recipe/stonecutting/asphalt/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/asphalt/stairs.json rename to src/main/resources/data/promenade/recipe/stonecutting/asphalt/stairs.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/asphalt/wall.json b/src/main/resources/data/promenade/recipe/stonecutting/asphalt/wall.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/asphalt/wall.json rename to src/main/resources/data/promenade/recipe/stonecutting/asphalt/wall.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite/polished_block.json b/src/main/resources/data/promenade/recipe/stonecutting/blunite/polished_block.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/blunite/polished_block.json rename to src/main/resources/data/promenade/recipe/stonecutting/blunite/polished_block.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite/polished_slab.json b/src/main/resources/data/promenade/recipe/stonecutting/blunite/polished_slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/blunite/polished_slab.json rename to src/main/resources/data/promenade/recipe/stonecutting/blunite/polished_slab.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite/polished_stairs.json b/src/main/resources/data/promenade/recipe/stonecutting/blunite/polished_stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/blunite/polished_stairs.json rename to src/main/resources/data/promenade/recipe/stonecutting/blunite/polished_stairs.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite/slab.json b/src/main/resources/data/promenade/recipe/stonecutting/blunite/slab.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/blunite/slab.json rename to src/main/resources/data/promenade/recipe/stonecutting/blunite/slab.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite/stairs.json b/src/main/resources/data/promenade/recipe/stonecutting/blunite/stairs.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/blunite/stairs.json rename to src/main/resources/data/promenade/recipe/stonecutting/blunite/stairs.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite/wall.json b/src/main/resources/data/promenade/recipe/stonecutting/blunite/wall.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/blunite/wall.json rename to src/main/resources/data/promenade/recipe/stonecutting/blunite/wall.json diff --git a/src/main/resources/data/promenade/recipes/stonecutting/moai.json b/src/main/resources/data/promenade/recipe/stonecutting/moai.json similarity index 100% rename from src/main/resources/data/promenade/recipes/stonecutting/moai.json rename to src/main/resources/data/promenade/recipe/stonecutting/moai.json diff --git a/src/main/resources/data/promenade/structures/witch_hut.nbt b/src/main/resources/data/promenade/structure/witch_hut.nbt similarity index 100% rename from src/main/resources/data/promenade/structures/witch_hut.nbt rename to src/main/resources/data/promenade/structure/witch_hut.nbt diff --git a/src/main/resources/data/promenade/structures/witch_hut/interior/afraid.nbt b/src/main/resources/data/promenade/structure/witch_hut/interior/afraid.nbt similarity index 100% rename from src/main/resources/data/promenade/structures/witch_hut/interior/afraid.nbt rename to src/main/resources/data/promenade/structure/witch_hut/interior/afraid.nbt diff --git a/src/main/resources/data/promenade/structures/witch_hut/interior/hatred.nbt b/src/main/resources/data/promenade/structure/witch_hut/interior/hatred.nbt similarity index 100% rename from src/main/resources/data/promenade/structures/witch_hut/interior/hatred.nbt rename to src/main/resources/data/promenade/structure/witch_hut/interior/hatred.nbt diff --git a/src/main/resources/data/promenade/structures/witch_hut/interior/normal.nbt b/src/main/resources/data/promenade/structure/witch_hut/interior/normal.nbt similarity index 100% rename from src/main/resources/data/promenade/structures/witch_hut/interior/normal.nbt rename to src/main/resources/data/promenade/structure/witch_hut/interior/normal.nbt diff --git a/src/main/resources/data/promenade/tags/blocks/can_spread_black_dylium.json b/src/main/resources/data/promenade/tags/block/can_spread_black_dylium.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/can_spread_black_dylium.json rename to src/main/resources/data/promenade/tags/block/can_spread_black_dylium.json diff --git a/src/main/resources/data/promenade/tags/blocks/carpeted_grass_blocks.json b/src/main/resources/data/promenade/tags/block/carpeted_grass_blocks.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/carpeted_grass_blocks.json rename to src/main/resources/data/promenade/tags/block/carpeted_grass_blocks.json diff --git a/src/main/resources/data/promenade/tags/blocks/dark_amaranth_stems.json b/src/main/resources/data/promenade/tags/block/dark_amaranth_stems.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/dark_amaranth_stems.json rename to src/main/resources/data/promenade/tags/block/dark_amaranth_stems.json diff --git a/src/main/resources/data/promenade/tags/blocks/flower_piles.json b/src/main/resources/data/promenade/tags/block/flower_piles.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/flower_piles.json rename to src/main/resources/data/promenade/tags/block/flower_piles.json diff --git a/src/main/resources/data/promenade/tags/blocks/growable_on/dark_amaranth_fungus.json b/src/main/resources/data/promenade/tags/block/growable_on/dark_amaranth_fungus.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/growable_on/dark_amaranth_fungus.json rename to src/main/resources/data/promenade/tags/block/growable_on/dark_amaranth_fungus.json diff --git a/src/main/resources/data/promenade/tags/blocks/leaf_piles.json b/src/main/resources/data/promenade/tags/block/leaf_piles.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/leaf_piles.json rename to src/main/resources/data/promenade/tags/block/leaf_piles.json diff --git a/src/main/resources/data/promenade/tags/blocks/leaves.json b/src/main/resources/data/promenade/tags/block/leaves.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/leaves.json rename to src/main/resources/data/promenade/tags/block/leaves.json diff --git a/src/main/resources/data/promenade/tags/blocks/maple_logs.json b/src/main/resources/data/promenade/tags/block/maple_logs.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/maple_logs.json rename to src/main/resources/data/promenade/tags/block/maple_logs.json diff --git a/src/main/resources/data/promenade/tags/blocks/palm_logs.json b/src/main/resources/data/promenade/tags/block/palm_logs.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/palm_logs.json rename to src/main/resources/data/promenade/tags/block/palm_logs.json diff --git a/src/main/resources/data/promenade/tags/blocks/placeable_on/dark_amaranth_fungus.json b/src/main/resources/data/promenade/tags/block/placeable_on/dark_amaranth_fungus.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/placeable_on/dark_amaranth_fungus.json rename to src/main/resources/data/promenade/tags/block/placeable_on/dark_amaranth_fungus.json diff --git a/src/main/resources/data/promenade/tags/blocks/placeable_on/dark_amaranth_roots.json b/src/main/resources/data/promenade/tags/block/placeable_on/dark_amaranth_roots.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/placeable_on/dark_amaranth_roots.json rename to src/main/resources/data/promenade/tags/block/placeable_on/dark_amaranth_roots.json diff --git a/src/main/resources/data/promenade/tags/blocks/placeable_on/obsidian_spike.json b/src/main/resources/data/promenade/tags/block/placeable_on/obsidian_spike.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/placeable_on/obsidian_spike.json rename to src/main/resources/data/promenade/tags/block/placeable_on/obsidian_spike.json diff --git a/src/main/resources/data/promenade/tags/blocks/sakura_logs.json b/src/main/resources/data/promenade/tags/block/sakura_logs.json similarity index 100% rename from src/main/resources/data/promenade/tags/blocks/sakura_logs.json rename to src/main/resources/data/promenade/tags/block/sakura_logs.json diff --git a/src/main/resources/data/promenade/tags/items/dark_amaranth_stems.json b/src/main/resources/data/promenade/tags/item/dark_amaranth_stems.json similarity index 100% rename from src/main/resources/data/promenade/tags/items/dark_amaranth_stems.json rename to src/main/resources/data/promenade/tags/item/dark_amaranth_stems.json diff --git a/src/main/resources/data/promenade/tags/items/entity_food/capybara.json b/src/main/resources/data/promenade/tags/item/entity_food/capybara.json similarity index 100% rename from src/main/resources/data/promenade/tags/items/entity_food/capybara.json rename to src/main/resources/data/promenade/tags/item/entity_food/capybara.json diff --git a/src/main/resources/data/promenade/tags/items/entity_food/duck.json b/src/main/resources/data/promenade/tags/item/entity_food/duck.json similarity index 100% rename from src/main/resources/data/promenade/tags/items/entity_food/duck.json rename to src/main/resources/data/promenade/tags/item/entity_food/duck.json diff --git a/src/main/resources/data/promenade/tags/items/maple_logs.json b/src/main/resources/data/promenade/tags/item/maple_logs.json similarity index 100% rename from src/main/resources/data/promenade/tags/items/maple_logs.json rename to src/main/resources/data/promenade/tags/item/maple_logs.json diff --git a/src/main/resources/data/promenade/tags/items/palm_logs.json b/src/main/resources/data/promenade/tags/item/palm_logs.json similarity index 100% rename from src/main/resources/data/promenade/tags/items/palm_logs.json rename to src/main/resources/data/promenade/tags/item/palm_logs.json diff --git a/src/main/resources/data/promenade/tags/items/sakura_logs.json b/src/main/resources/data/promenade/tags/item/sakura_logs.json similarity index 100% rename from src/main/resources/data/promenade/tags/items/sakura_logs.json rename to src/main/resources/data/promenade/tags/item/sakura_logs.json