From c5e8935595b899b2e8ffc945f29b52482c3ace8c Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 26 Sep 2024 16:01:30 +0200 Subject: [PATCH] made everything run properly --- .../items => c/tags/item}/rods/wooden.json | 0 .../data/curios/tags/items/belt.json | 6 --- .../data/curios/tags/items/charm.json | 6 --- .../data/curios/tags/items/necklace.json | 5 --- .../data/curios/tags/items/ring.json | 5 --- .../tags/{blocks => block}/dirt.json | 0 .../tags/{blocks => block}/leaves.json | 0 .../tags/{blocks => block}/logs.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../tags/{blocks => block}/planks.json | 0 .../tags/{blocks => block}/rails.json | 0 .../tags/{blocks => block}/slabs.json | 0 .../tags/{blocks => block}/small_flowers.json | 0 .../tags/{blocks => block}/stairs.json | 0 .../minecraft/tags/{items => item}/axes.json | 0 .../cluster_max_harvestables.json | 0 .../minecraft/tags/{items => item}/hoes.json | 0 .../tags/{items => item}/leaves.json | 0 .../minecraft/tags/{items => item}/logs.json | 0 .../tags/{items => item}/pickaxes.json | 0 .../tags/{items => item}/planks.json | 0 .../minecraft/tags/{items => item}/rails.json | 0 .../tags/{items => item}/shovels.json | 0 .../minecraft/tags/{items => item}/slabs.json | 0 .../tags/{items => item}/stairs.json | 0 .../tags/{items => item}/swords.json | 0 .../data/naturesaura/curios/slots/belt.json | 1 - .../data/naturesaura/curios/slots/charm.json | 1 - .../naturesaura/curios/slots/necklace.json | 1 - .../data/naturesaura/curios/slots/ring.json | 1 - .../blocks/ancient_bark.json | 0 .../blocks/ancient_leaves.json | 16 ++++---- .../blocks/ancient_log.json | 0 .../blocks/ancient_planks.json | 0 .../blocks/ancient_sapling.json | 0 .../blocks/ancient_slab.json | 0 .../blocks/ancient_stairs.json | 0 .../blocks/animal_container.json | 0 .../blocks/animal_generator.json | 0 .../blocks/animal_spawner.json | 0 .../blocks/aura_bloom.json | 0 .../blocks/aura_cactus.json | 0 .../blocks/aura_detector.json | 0 .../blocks/aura_mushroom.json | 0 .../blocks/aura_timer.json | 0 .../blocks/auto_crafter.json | 0 .../blocks/blast_furnace_booster.json | 0 .../blocks/chorus_generator.json | 0 .../blocks/chunk_loader.json | 0 .../blocks/conversion_catalyst.json | 0 .../blocks/crimson_aura_mushroom.json | 0 .../blocks/crushing_catalyst.json | 0 .../blocks/decayed_leaves.json | 16 ++++---- .../blocks/depth_ingot_block.json | 0 .../blocks/dimension_rail_end.json | 0 .../blocks/dimension_rail_nether.json | 0 .../blocks/dimension_rail_overworld.json | 0 .../blocks/end_flower.json | 0 .../blocks/ender_crate.json | 0 .../blocks/field_creator.json | 0 .../blocks/firework_generator.json | 0 .../blocks/flower_generator.json | 0 .../blocks/furnace_heater.json | 0 .../blocks/generator_limit_remover.json | 0 .../blocks/gold_brick.json | 0 .../blocks/gold_nether_brick.json | 0 .../blocks/gold_powder.json | 0 .../blocks/golden_leaves.json | 0 .../blocks/grated_chute.json | 0 .../blocks/hopper_upgrade.json | 0 .../blocks/infused_brick.json | 0 .../blocks/infused_brick_slab.json | 0 .../blocks/infused_brick_stairs.json | 0 .../blocks/infused_iron_block.json | 0 .../blocks/infused_slab.json | 0 .../blocks/infused_stairs.json | 0 .../blocks/infused_stone.json | 0 .../blocks/item_distributor.json | 0 .../blocks/light.json | 0 .../blocks/lower_limiter.json | 0 .../blocks/moss_generator.json | 0 .../blocks/nature_altar.json | 0 .../blocks/nether_grass.json | 16 ++++---- .../blocks/nether_wart_mushroom.json | 16 ++++---- .../blocks/oak_generator.json | 0 .../blocks/offering_table.json | 0 .../blocks/pickup_stopper.json | 0 .../blocks/placer.json | 0 .../blocks/potion_generator.json | 0 .../blocks/potted_aura_bloom.json | 0 .../blocks/potted_aura_cactus.json | 0 .../blocks/potted_aura_mushroom.json | 0 .../blocks/potted_crimson_aura_mushroom.json | 0 .../blocks/potted_warped_aura_mushroom.json | 0 .../blocks/powder_placer.json | 0 .../blocks/projectile_generator.json | 0 .../blocks/rf_converter.json | 0 .../blocks/sky_ingot_block.json | 0 .../blocks/slime_split_generator.json | 0 .../blocks/snow_creator.json | 0 .../blocks/spawn_lamp.json | 0 .../blocks/spring.json | 0 .../blocks/tainted_gold_block.json | 0 .../blocks/time_changer.json | 0 .../blocks/warped_aura_mushroom.json | 0 .../blocks/weather_changer.json | 0 .../blocks/wood_stand.json | 0 .../neoforge/biome_modifier/aura_cactus.json | 2 +- .../biome_modifier/aura_mushroom.json | 2 +- .../{blocks => block}/altar_fancy_brick.json | 0 .../{blocks => block}/altar_gold_brick.json | 0 .../tags/{blocks => block}/altar_stone.json | 0 .../tags/{blocks => block}/altar_wood.json | 0 .../blocks/BlockAnimalGenerator.java | 2 +- .../blocks/tiles/BlockEntityImpl.java | 2 +- .../blocks/tiles/render/RenderAuraTimer.java | 2 +- .../render/RenderGeneratorLimitRemover.java | 2 +- .../naturesaura/events/ClientEvents.java | 10 +++-- .../ellpeck/naturesaura/gen/ModFeatures.java | 25 +++++------ .../naturesaura/items/ItemAuraBottle.java | 3 +- .../naturesaura/items/ItemColorChanger.java | 5 ++- .../naturesaura/items/ItemEffectPowder.java | 3 +- .../naturesaura/items/ItemGoldFiber.java | 2 +- .../naturesaura/items/ItemPetReviver.java | 2 +- .../ellpeck/naturesaura/items/ModItems.java | 3 +- .../naturesaura/items/tools/ItemArmor.java | 2 +- .../en_us/entries/effects/effect_powder.json | 4 +- .../book/en_us/entries/intro/intro.json | 4 +- .../en_us/entries/practices/aura_bottle.json | 6 +-- .../{advancements => advancement}/altar.json | 0 .../aura_bottle_end.json | 0 .../aura_bottle_nether.json | 0 .../aura_bottle_overworld.json | 0 .../aura_cache.json | 0 .../conversion_catalyst.json | 0 .../depth_ingot.json | 0 .../depth_tools.json | 0 .../end_flower.json | 0 .../{advancements => advancement}/eye.json | 0 .../eye_improved.json | 0 .../furnace_heater.json | 0 .../get_book.json | 0 .../gold_leaf.json | 0 .../infused_materials.json | 0 .../infused_tools.json | 0 .../negative_imbalance.json | 0 .../offering.json | 0 .../{advancements => advancement}/placer.json | 0 .../positive_imbalance.json | 0 .../range_visualizer.json | 0 .../{advancements => advancement}/root.json | 0 .../sky_ingot.json | 0 .../vacuum_bottle.json | 0 .../wood_stand.json | 0 .../{recipes => recipe}/altar/amethyst.json | 4 +- .../{recipes => recipe}/altar/arrow.json | 4 +- .../{recipes => recipe}/altar/blaze.json | 4 +- .../{recipes => recipe}/altar/bone.json | 4 +- .../data/naturesaura/recipe/altar/breath.json | 20 +++++++++ .../{recipes => recipe}/altar/chorus.json | 4 +- .../{recipes => recipe}/altar/coal.json | 4 +- .../altar/crimson_fungus.json | 4 +- .../{recipes => recipe}/altar/egg.json | 4 +- .../altar/ender_pearl.json | 4 +- .../{recipes => recipe}/altar/fermented.json | 4 +- .../{recipes => recipe}/altar/ghast_tear.json | 4 +- .../altar/gilded_blackstone.json | 4 +- .../{recipes => recipe}/altar/glowstone.json | 4 +- .../altar/gold_powder.json | 4 +- .../altar/infused_iron.json | 4 +- .../altar/infused_iron_block.json | 4 +- .../altar/infused_stone.json | 4 +- .../{recipes => recipe}/altar/lead.json | 4 +- .../{recipes => recipe}/altar/leather.json | 4 +- .../{recipes => recipe}/altar/milk.json | 4 +- .../{recipes => recipe}/altar/mud.json | 4 +- .../altar/nether_wart.json | 4 +- .../altar/nether_wart_crushing.json | 4 +- .../{recipes => recipe}/altar/potato.json | 4 +- .../{recipes => recipe}/altar/prismarine.json | 4 +- .../altar/prismarine_crystal.json | 4 +- .../altar/rabbit_foot.json | 4 +- .../{recipes => recipe}/altar/sand.json | 4 +- .../{recipes => recipe}/altar/soul_sand.json | 4 +- .../altar/soul_sand_crushing.json | 4 +- .../{recipes => recipe}/altar/sugar.json | 4 +- .../altar/tainted_gold.json | 4 +- .../altar/tainted_gold_block.json | 4 +- .../altar/warped_fungus.json | 4 +- .../{recipes => recipe}/altar/water.json | 8 ++-- .../{recipes => recipe}/ancient_bark.json | 4 +- .../{recipes => recipe}/ancient_planks.json | 4 +- .../ancient_planks_from_bark.json | 4 +- .../{recipes => recipe}/ancient_slab.json | 4 +- .../{recipes => recipe}/ancient_stairs.json | 4 +- .../{recipes => recipe}/ancient_stick.json | 4 +- .../{recipes => recipe}/animal_container.json | 4 +- .../{recipes => recipe}/animal_generator.json | 4 +- .../{recipes => recipe}/animal_spawner.json | 4 +- .../animal_spawner/bat.json | 0 .../animal_spawner/bee.json | 0 .../animal_spawner/blaze.json | 0 .../animal_spawner/cat.json | 0 .../animal_spawner/cave_spider.json | 0 .../animal_spawner/chicken.json | 0 .../animal_spawner/cow.json | 0 .../animal_spawner/creeper.json | 0 .../animal_spawner/dolphin.json | 0 .../animal_spawner/donkey.json | 0 .../animal_spawner/enderman.json | 0 .../animal_spawner/endermite.json | 0 .../animal_spawner/fox.json | 0 .../animal_spawner/ghast.json | 0 .../animal_spawner/guardian.json | 0 .../animal_spawner/hoglin.json | 0 .../animal_spawner/horse.json | 0 .../animal_spawner/husk.json | 0 .../animal_spawner/llama.json | 0 .../animal_spawner/magma_cube.json | 0 .../animal_spawner/mooshroom.json | 0 .../animal_spawner/mule.json | 0 .../animal_spawner/ocelot.json | 0 .../animal_spawner/panda.json | 0 .../animal_spawner/parrot.json | 0 .../animal_spawner/phantom.json | 0 .../animal_spawner/pig.json | 0 .../animal_spawner/piglin.json | 0 .../animal_spawner/piglin_brute.json | 0 .../animal_spawner/polar_bear.json | 0 .../animal_spawner/rabbit.json | 0 .../animal_spawner/sheep_black.json | 0 .../animal_spawner/sheep_blue.json | 0 .../animal_spawner/sheep_brown.json | 0 .../animal_spawner/sheep_cyan.json | 0 .../animal_spawner/sheep_gray.json | 0 .../animal_spawner/sheep_green.json | 0 .../animal_spawner/sheep_light_blue.json | 0 .../animal_spawner/sheep_light_gray.json | 0 .../animal_spawner/sheep_lime.json | 0 .../animal_spawner/sheep_magenta.json | 0 .../animal_spawner/sheep_orange.json | 0 .../animal_spawner/sheep_pink.json | 0 .../animal_spawner/sheep_purple.json | 0 .../animal_spawner/sheep_red.json | 0 .../animal_spawner/sheep_white.json | 0 .../animal_spawner/sheep_yellow.json | 0 .../animal_spawner/shulker.json | 0 .../animal_spawner/silverfish.json | 0 .../animal_spawner/skeleton.json | 0 .../animal_spawner/slime.json | 0 .../animal_spawner/spider.json | 0 .../animal_spawner/squid.json | 0 .../animal_spawner/stray.json | 0 .../animal_spawner/turtle.json | 4 +- .../animal_spawner/witch.json | 0 .../animal_spawner/wither_skeleton.json | 0 .../animal_spawner/wolf.json | 0 .../animal_spawner/zombie.json | 0 .../animal_spawner/zombified_piglin.json | 0 .../{recipes => recipe}/aura_cache.json | 4 +- .../{recipes => recipe}/aura_detector.json | 4 +- .../{recipes => recipe}/aura_timer.json | 4 +- .../{recipes => recipe}/aura_trove.json | 4 +- .../{recipes => recipe}/auto_crafter.json | 4 +- .../blast_furnace_booster.json | 4 +- .../naturesaura/{recipes => recipe}/book.json | 4 +- .../bottle_two_the_rebottling.json | 4 +- .../naturesaura/recipe/calling_spirit.json | 41 +++++++++++++++++++ .../{recipes => recipe}/cave_finder.json | 4 +- .../{recipes => recipe}/chorus_generator.json | 4 +- .../{recipes => recipe}/chunk_loader.json | 16 ++++---- .../{recipes => recipe}/color_changer.json | 4 +- .../data/naturesaura/recipe/crimson_meal.json | 26 ++++++++++++ .../{recipes => recipe}/death_ring.json | 16 ++++---- .../{recipes => recipe}/depth_axe.json | 4 +- .../{recipes => recipe}/depth_chest.json | 4 +- .../{recipes => recipe}/depth_helmet.json | 4 +- .../{recipes => recipe}/depth_hoe.json | 4 +- .../{recipes => recipe}/depth_ingot.json | 4 +- .../depth_ingot_block.json | 4 +- .../depth_ingot_creation.json | 2 +- .../{recipes => recipe}/depth_pants.json | 4 +- .../{recipes => recipe}/depth_pickaxe.json | 4 +- .../{recipes => recipe}/depth_shoes.json | 4 +- .../{recipes => recipe}/depth_shovel.json | 4 +- .../{recipes => recipe}/depth_sword.json | 4 +- .../dimension_rail_end.json | 16 ++++---- .../dimension_rail_nether.json | 16 ++++---- .../dimension_rail_overworld.json | 16 ++++---- .../{recipes => recipe}/end_city_finder.json | 16 ++++---- .../{recipes => recipe}/ender_access.json | 16 ++++---- .../{recipes => recipe}/ender_crate.json | 16 ++++---- .../{recipes => recipe}/farming_stencil.json | 4 +- .../{recipes => recipe}/field_creator.json | 4 +- .../firework_generator.json | 4 +- .../{recipes => recipe}/flower_generator.json | 4 +- .../{recipes => recipe}/fortress_finder.json | 16 ++++---- .../generator_limit_remover.json | 4 +- .../{recipes => recipe}/gold_brick.json | 4 +- .../{recipes => recipe}/gold_fiber.json | 2 +- .../gold_nether_brick.json | 4 +- .../{recipes => recipe}/gold_powder.json | 4 +- .../{recipes => recipe}/grated_chute.json | 4 +- .../{recipes => recipe}/hopper_upgrade.json | 4 +- .../{recipes => recipe}/infused_axe.json | 4 +- .../{recipes => recipe}/infused_brick.json | 4 +- .../infused_brick_slab.json | 4 +- .../infused_brick_stairs.json | 4 +- .../{recipes => recipe}/infused_chest.json | 4 +- .../{recipes => recipe}/infused_helmet.json | 4 +- .../{recipes => recipe}/infused_hoe.json | 4 +- .../{recipes => recipe}/infused_iron.json | 4 +- .../infused_iron_block.json | 4 +- .../{recipes => recipe}/infused_pants.json | 4 +- .../{recipes => recipe}/infused_pickaxe.json | 4 +- .../{recipes => recipe}/infused_shoes.json | 4 +- .../{recipes => recipe}/infused_shovel.json | 4 +- .../{recipes => recipe}/infused_slab.json | 4 +- .../{recipes => recipe}/infused_stairs.json | 4 +- .../{recipes => recipe}/infused_sword.json | 4 +- .../{recipes => recipe}/item_distributor.json | 4 +- .../{recipes => recipe}/light_staff.json | 4 +- .../{recipes => recipe}/loot_finder.json | 4 +- .../{recipes => recipe}/lower_limiter.json | 4 +- .../{recipes => recipe}/moss_generator.json | 4 +- .../{recipes => recipe}/mover_cart.json | 16 ++++---- .../{recipes => recipe}/netherite_finder.json | 4 +- .../{recipes => recipe}/oak_generator.json | 16 ++++---- .../offering/clock_hand.json | 4 +- .../offering/sky_ingot.json | 4 +- .../offering/sky_ingot_from_gold.json | 4 +- .../offering/token_euphoria.json | 4 +- .../offering/token_grief.json | 4 +- .../offering/token_rage.json | 4 +- .../offering/token_terror.json | 4 +- .../{recipes => recipe}/offering_table.json | 4 +- .../{recipes => recipe}/outpost_finder.json | 16 ++++---- .../{recipes => recipe}/pet_reviver.json | 4 +- .../{recipes => recipe}/pickup_stopper.json | 4 +- .../{recipes => recipe}/placer.json | 4 +- .../{recipes => recipe}/potion_generator.json | 4 +- .../{recipes => recipe}/powder_placer.json | 4 +- .../projectile_generator.json | 4 +- .../{recipes => recipe}/range_visualizer.json | 4 +- .../{recipes => recipe}/rf_converter.json | 4 +- .../shockwave_creator.json | 4 +- .../{recipes => recipe}/sky_axe.json | 4 +- .../{recipes => recipe}/sky_chest.json | 4 +- .../{recipes => recipe}/sky_helmet.json | 4 +- .../{recipes => recipe}/sky_hoe.json | 4 +- .../{recipes => recipe}/sky_ingot.json | 4 +- .../{recipes => recipe}/sky_ingot_block.json | 4 +- .../{recipes => recipe}/sky_pants.json | 4 +- .../{recipes => recipe}/sky_pickaxe.json | 4 +- .../{recipes => recipe}/sky_shoes.json | 4 +- .../{recipes => recipe}/sky_shovel.json | 4 +- .../{recipes => recipe}/sky_sword.json | 4 +- .../slime_split_generator.json | 16 ++++---- .../{recipes => recipe}/snow_creator.json | 4 +- .../{recipes => recipe}/spawn_lamp.json | 16 ++++---- .../{recipes => recipe}/spring.json | 4 +- .../{recipes => recipe}/tainted_gold.json | 4 +- .../tainted_gold_block.json | 4 +- .../{recipes => recipe}/time_changer.json | 4 +- .../tree_ritual/ancient_sapling.json | 4 +- .../tree_ritual/animal_powder.json | 10 +++-- .../tree_ritual/break_prevention.json | 4 +- .../tree_ritual/cache_powder.json | 10 +++-- .../tree_ritual/conversion_catalyst.json | 4 +- .../tree_ritual/crushing_catalyst.json | 4 +- .../{recipes => recipe}/tree_ritual/eye.json | 4 +- .../tree_ritual/eye_improved.json | 4 +- .../tree_ritual/furnace_heater.json | 4 +- .../tree_ritual/nature_altar.json | 4 +- .../tree_ritual/nether_grass_powder.json | 12 +++--- .../tree_ritual/ore_spawn_powder.json | 10 +++-- .../tree_ritual/plant_powder.json | 10 +++-- .../tree_ritual/token_anger.json | 15 ++++--- .../tree_ritual/token_fear.json | 15 ++++--- .../tree_ritual/token_joy.json | 15 ++++--- .../tree_ritual/token_sorrow.json | 15 ++++--- .../{recipes => recipe}/weather_changer.json | 4 +- .../{recipes => recipe}/wood_stand.json | 4 +- .../naturesaura/recipes/altar/breath.json | 17 -------- .../naturesaura/recipes/calling_spirit.json | 37 ----------------- .../naturesaura/recipes/crimson_meal.json | 24 ----------- 387 files changed, 649 insertions(+), 599 deletions(-) rename src/generated/resources/data/{forge/tags/items => c/tags/item}/rods/wooden.json (100%) delete mode 100644 src/generated/resources/data/curios/tags/items/belt.json delete mode 100644 src/generated/resources/data/curios/tags/items/charm.json delete mode 100644 src/generated/resources/data/curios/tags/items/necklace.json delete mode 100644 src/generated/resources/data/curios/tags/items/ring.json rename src/generated/resources/data/minecraft/tags/{blocks => block}/dirt.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/leaves.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/logs.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/planks.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/rails.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/slabs.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/small_flowers.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/stairs.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/axes.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/cluster_max_harvestables.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/hoes.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/leaves.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/logs.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/pickaxes.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/planks.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/rails.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/shovels.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/slabs.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/stairs.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/swords.json (100%) delete mode 100644 src/generated/resources/data/naturesaura/curios/slots/belt.json delete mode 100644 src/generated/resources/data/naturesaura/curios/slots/charm.json delete mode 100644 src/generated/resources/data/naturesaura/curios/slots/necklace.json delete mode 100644 src/generated/resources/data/naturesaura/curios/slots/ring.json rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_bark.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_leaves.json (63%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_log.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_planks.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_sapling.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_slab.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ancient_stairs.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/animal_container.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/animal_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/animal_spawner.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/aura_bloom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/aura_cactus.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/aura_detector.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/aura_mushroom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/aura_timer.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/auto_crafter.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/blast_furnace_booster.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/chorus_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/chunk_loader.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/conversion_catalyst.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/crimson_aura_mushroom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/crushing_catalyst.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/decayed_leaves.json (63%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/depth_ingot_block.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/dimension_rail_end.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/dimension_rail_nether.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/dimension_rail_overworld.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/end_flower.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/ender_crate.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/field_creator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/firework_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/flower_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/furnace_heater.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/generator_limit_remover.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/gold_brick.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/gold_nether_brick.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/gold_powder.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/golden_leaves.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/grated_chute.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/hopper_upgrade.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_brick.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_brick_slab.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_brick_stairs.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_iron_block.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_slab.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_stairs.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/infused_stone.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/item_distributor.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/light.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/lower_limiter.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/moss_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/nature_altar.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/nether_grass.json (69%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/nether_wart_mushroom.json (76%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/oak_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/offering_table.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/pickup_stopper.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/placer.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/potion_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/potted_aura_bloom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/potted_aura_cactus.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/potted_aura_mushroom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/potted_crimson_aura_mushroom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/potted_warped_aura_mushroom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/powder_placer.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/projectile_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/rf_converter.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/sky_ingot_block.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/slime_split_generator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/snow_creator.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/spawn_lamp.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/spring.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/tainted_gold_block.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/time_changer.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/warped_aura_mushroom.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/weather_changer.json (100%) rename src/generated/resources/data/naturesaura/{loot_tables => loot_table}/blocks/wood_stand.json (100%) rename src/generated/resources/data/naturesaura/tags/{blocks => block}/altar_fancy_brick.json (100%) rename src/generated/resources/data/naturesaura/tags/{blocks => block}/altar_gold_brick.json (100%) rename src/generated/resources/data/naturesaura/tags/{blocks => block}/altar_stone.json (100%) rename src/generated/resources/data/naturesaura/tags/{blocks => block}/altar_wood.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/altar.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/aura_bottle_end.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/aura_bottle_nether.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/aura_bottle_overworld.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/aura_cache.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/conversion_catalyst.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/depth_ingot.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/depth_tools.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/end_flower.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/eye.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/eye_improved.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/furnace_heater.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/get_book.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/gold_leaf.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/infused_materials.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/infused_tools.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/negative_imbalance.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/offering.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/placer.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/positive_imbalance.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/range_visualizer.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/root.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/sky_ingot.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/vacuum_bottle.json (100%) rename src/main/resources/data/naturesaura/{advancements => advancement}/wood_stand.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/amethyst.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/arrow.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/blaze.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/bone.json (85%) create mode 100644 src/main/resources/data/naturesaura/recipe/altar/breath.json rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/chorus.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/coal.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/crimson_fungus.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/egg.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/ender_pearl.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/fermented.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/ghast_tear.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/gilded_blackstone.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/glowstone.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/gold_powder.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/infused_iron.json (77%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/infused_iron_block.json (75%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/infused_stone.json (76%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/lead.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/leather.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/milk.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/mud.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/nether_wart.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/nether_wart_crushing.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/potato.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/prismarine.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/prismarine_crystal.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/rabbit_foot.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/sand.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/soul_sand.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/soul_sand_crushing.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/sugar.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/tainted_gold.json (77%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/tainted_gold_block.json (75%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/warped_fungus.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/altar/water.json (67%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ancient_bark.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ancient_planks.json (81%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ancient_planks_from_bark.json (81%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ancient_slab.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ancient_stairs.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ancient_stick.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_container.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_generator.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/bat.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/bee.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/blaze.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/cat.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/cave_spider.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/chicken.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/cow.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/creeper.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/dolphin.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/donkey.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/enderman.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/endermite.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/fox.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/ghast.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/guardian.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/hoglin.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/horse.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/husk.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/llama.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/magma_cube.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/mooshroom.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/mule.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/ocelot.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/panda.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/parrot.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/phantom.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/pig.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/piglin.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/piglin_brute.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/polar_bear.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/rabbit.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_black.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_blue.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_brown.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_cyan.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_gray.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_green.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_light_blue.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_light_gray.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_lime.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_magenta.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_orange.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_pink.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_purple.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_red.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_white.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/sheep_yellow.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/shulker.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/silverfish.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/skeleton.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/slime.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/spider.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/squid.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/stray.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/turtle.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/witch.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/wither_skeleton.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/wolf.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/zombie.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/animal_spawner/zombified_piglin.json (100%) rename src/main/resources/data/naturesaura/{recipes => recipe}/aura_cache.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/aura_detector.json (88%) rename src/main/resources/data/naturesaura/{recipes => recipe}/aura_timer.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/aura_trove.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/auto_crafter.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/blast_furnace_booster.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/book.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/bottle_two_the_rebottling.json (79%) create mode 100644 src/main/resources/data/naturesaura/recipe/calling_spirit.json rename src/main/resources/data/naturesaura/{recipes => recipe}/cave_finder.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/chorus_generator.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/chunk_loader.json (65%) rename src/main/resources/data/naturesaura/{recipes => recipe}/color_changer.json (91%) create mode 100644 src/main/resources/data/naturesaura/recipe/crimson_meal.json rename src/main/resources/data/naturesaura/{recipes => recipe}/death_ring.json (65%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_axe.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_chest.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_helmet.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_hoe.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_ingot.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_ingot_block.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_ingot_creation.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_pants.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_pickaxe.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_shoes.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_shovel.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/depth_sword.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/dimension_rail_end.json (56%) rename src/main/resources/data/naturesaura/{recipes => recipe}/dimension_rail_nether.json (55%) rename src/main/resources/data/naturesaura/{recipes => recipe}/dimension_rail_overworld.json (55%) rename src/main/resources/data/naturesaura/{recipes => recipe}/end_city_finder.json (51%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ender_access.json (51%) rename src/main/resources/data/naturesaura/{recipes => recipe}/ender_crate.json (56%) rename src/main/resources/data/naturesaura/{recipes => recipe}/farming_stencil.json (88%) rename src/main/resources/data/naturesaura/{recipes => recipe}/field_creator.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/firework_generator.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/flower_generator.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/fortress_finder.json (51%) rename src/main/resources/data/naturesaura/{recipes => recipe}/generator_limit_remover.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/gold_brick.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/gold_fiber.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/gold_nether_brick.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/gold_powder.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/grated_chute.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/hopper_upgrade.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_axe.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_brick.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_brick_slab.json (80%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_brick_stairs.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_chest.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_helmet.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_hoe.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_iron.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_iron_block.json (81%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_pants.json (81%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_pickaxe.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_shoes.json (80%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_shovel.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_slab.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_stairs.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/infused_sword.json (85%) rename src/main/resources/data/naturesaura/{recipes => recipe}/item_distributor.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/light_staff.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/loot_finder.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/lower_limiter.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/moss_generator.json (88%) rename src/main/resources/data/naturesaura/{recipes => recipe}/mover_cart.json (64%) rename src/main/resources/data/naturesaura/{recipes => recipe}/netherite_finder.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/oak_generator.json (63%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/clock_hand.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/sky_ingot.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/sky_ingot_from_gold.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/token_euphoria.json (80%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/token_grief.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/token_rage.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering/token_terror.json (81%) rename src/main/resources/data/naturesaura/{recipes => recipe}/offering_table.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/outpost_finder.json (51%) rename src/main/resources/data/naturesaura/{recipes => recipe}/pet_reviver.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/pickup_stopper.json (88%) rename src/main/resources/data/naturesaura/{recipes => recipe}/placer.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/potion_generator.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/powder_placer.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/projectile_generator.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/range_visualizer.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/rf_converter.json (93%) rename src/main/resources/data/naturesaura/{recipes => recipe}/shockwave_creator.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_axe.json (88%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_chest.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_helmet.json (86%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_hoe.json (88%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_ingot.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_ingot_block.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_pants.json (84%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_pickaxe.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_shoes.json (83%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_shovel.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/sky_sword.json (87%) rename src/main/resources/data/naturesaura/{recipes => recipe}/slime_split_generator.json (60%) rename src/main/resources/data/naturesaura/{recipes => recipe}/snow_creator.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/spawn_lamp.json (60%) rename src/main/resources/data/naturesaura/{recipes => recipe}/spring.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tainted_gold.json (82%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tainted_gold_block.json (81%) rename src/main/resources/data/naturesaura/{recipes => recipe}/time_changer.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/ancient_sapling.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/animal_powder.json (72%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/break_prevention.json (89%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/cache_powder.json (71%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/conversion_catalyst.json (91%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/crushing_catalyst.json (90%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/eye.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/eye_improved.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/furnace_heater.json (93%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/nature_altar.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/nether_grass_powder.json (64%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/ore_spawn_powder.json (71%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/plant_powder.json (71%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/token_anger.json (64%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/token_fear.json (63%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/token_joy.json (63%) rename src/main/resources/data/naturesaura/{recipes => recipe}/tree_ritual/token_sorrow.json (71%) rename src/main/resources/data/naturesaura/{recipes => recipe}/weather_changer.json (92%) rename src/main/resources/data/naturesaura/{recipes => recipe}/wood_stand.json (86%) delete mode 100644 src/main/resources/data/naturesaura/recipes/altar/breath.json delete mode 100644 src/main/resources/data/naturesaura/recipes/calling_spirit.json delete mode 100644 src/main/resources/data/naturesaura/recipes/crimson_meal.json diff --git a/src/generated/resources/data/forge/tags/items/rods/wooden.json b/src/generated/resources/data/c/tags/item/rods/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/wooden.json rename to src/generated/resources/data/c/tags/item/rods/wooden.json diff --git a/src/generated/resources/data/curios/tags/items/belt.json b/src/generated/resources/data/curios/tags/items/belt.json deleted file mode 100644 index 47b640c4..00000000 --- a/src/generated/resources/data/curios/tags/items/belt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "naturesaura:aura_cache", - "naturesaura:aura_trove" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/charm.json b/src/generated/resources/data/curios/tags/items/charm.json deleted file mode 100644 index fec975a0..00000000 --- a/src/generated/resources/data/curios/tags/items/charm.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "naturesaura:eye", - "naturesaura:eye_improved" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/necklace.json b/src/generated/resources/data/curios/tags/items/necklace.json deleted file mode 100644 index 34e66ffa..00000000 --- a/src/generated/resources/data/curios/tags/items/necklace.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "naturesaura:shockwave_creator" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/ring.json b/src/generated/resources/data/curios/tags/items/ring.json deleted file mode 100644 index 9d44b997..00000000 --- a/src/generated/resources/data/curios/tags/items/ring.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "naturesaura:death_ring" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/dirt.json b/src/generated/resources/data/minecraft/tags/block/dirt.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/dirt.json rename to src/generated/resources/data/minecraft/tags/block/dirt.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/leaves.json b/src/generated/resources/data/minecraft/tags/block/leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/leaves.json rename to src/generated/resources/data/minecraft/tags/block/leaves.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs.json b/src/generated/resources/data/minecraft/tags/block/logs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/logs.json rename to src/generated/resources/data/minecraft/tags/block/logs.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/planks.json b/src/generated/resources/data/minecraft/tags/block/planks.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/planks.json rename to src/generated/resources/data/minecraft/tags/block/planks.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/rails.json b/src/generated/resources/data/minecraft/tags/block/rails.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/rails.json rename to src/generated/resources/data/minecraft/tags/block/rails.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/block/slabs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/slabs.json rename to src/generated/resources/data/minecraft/tags/block/slabs.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json b/src/generated/resources/data/minecraft/tags/block/small_flowers.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/small_flowers.json rename to src/generated/resources/data/minecraft/tags/block/small_flowers.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/block/stairs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/stairs.json rename to src/generated/resources/data/minecraft/tags/block/stairs.json diff --git a/src/generated/resources/data/minecraft/tags/items/axes.json b/src/generated/resources/data/minecraft/tags/item/axes.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/axes.json rename to src/generated/resources/data/minecraft/tags/item/axes.json diff --git a/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json b/src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json rename to src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json diff --git a/src/generated/resources/data/minecraft/tags/items/hoes.json b/src/generated/resources/data/minecraft/tags/item/hoes.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/hoes.json rename to src/generated/resources/data/minecraft/tags/item/hoes.json diff --git a/src/generated/resources/data/minecraft/tags/items/leaves.json b/src/generated/resources/data/minecraft/tags/item/leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/leaves.json rename to src/generated/resources/data/minecraft/tags/item/leaves.json diff --git a/src/generated/resources/data/minecraft/tags/items/logs.json b/src/generated/resources/data/minecraft/tags/item/logs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/logs.json rename to src/generated/resources/data/minecraft/tags/item/logs.json diff --git a/src/generated/resources/data/minecraft/tags/items/pickaxes.json b/src/generated/resources/data/minecraft/tags/item/pickaxes.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/pickaxes.json rename to src/generated/resources/data/minecraft/tags/item/pickaxes.json diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/item/planks.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/planks.json rename to src/generated/resources/data/minecraft/tags/item/planks.json diff --git a/src/generated/resources/data/minecraft/tags/items/rails.json b/src/generated/resources/data/minecraft/tags/item/rails.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/rails.json rename to src/generated/resources/data/minecraft/tags/item/rails.json diff --git a/src/generated/resources/data/minecraft/tags/items/shovels.json b/src/generated/resources/data/minecraft/tags/item/shovels.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/shovels.json rename to src/generated/resources/data/minecraft/tags/item/shovels.json diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/item/slabs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/slabs.json rename to src/generated/resources/data/minecraft/tags/item/slabs.json diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/item/stairs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/stairs.json rename to src/generated/resources/data/minecraft/tags/item/stairs.json diff --git a/src/generated/resources/data/minecraft/tags/items/swords.json b/src/generated/resources/data/minecraft/tags/item/swords.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/swords.json rename to src/generated/resources/data/minecraft/tags/item/swords.json diff --git a/src/generated/resources/data/naturesaura/curios/slots/belt.json b/src/generated/resources/data/naturesaura/curios/slots/belt.json deleted file mode 100644 index 9e26dfee..00000000 --- a/src/generated/resources/data/naturesaura/curios/slots/belt.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/curios/slots/charm.json b/src/generated/resources/data/naturesaura/curios/slots/charm.json deleted file mode 100644 index 9e26dfee..00000000 --- a/src/generated/resources/data/naturesaura/curios/slots/charm.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/curios/slots/necklace.json b/src/generated/resources/data/naturesaura/curios/slots/necklace.json deleted file mode 100644 index 9e26dfee..00000000 --- a/src/generated/resources/data/naturesaura/curios/slots/necklace.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/curios/slots/ring.json b/src/generated/resources/data/naturesaura/curios/slots/ring.json deleted file mode 100644 index 9e26dfee..00000000 --- a/src/generated/resources/data/naturesaura/curios/slots/ring.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_bark.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_bark.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_leaves.json similarity index 63% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_leaves.json index 2e4efaca..a0b0541a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_leaves.json @@ -7,14 +7,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_log.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_log.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_planks.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_planks.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_sapling.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_sapling.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_slab.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_slab.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ancient_stairs.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ancient_stairs.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json b/src/generated/resources/data/naturesaura/loot_table/blocks/animal_container.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/animal_container.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/animal_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/animal_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json b/src/generated/resources/data/naturesaura/loot_table/blocks/animal_spawner.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/animal_spawner.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/aura_bloom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/aura_bloom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json b/src/generated/resources/data/naturesaura/loot_table/blocks/aura_cactus.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/aura_cactus.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json b/src/generated/resources/data/naturesaura/loot_table/blocks/aura_detector.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/aura_detector.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/aura_mushroom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/aura_mushroom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json b/src/generated/resources/data/naturesaura/loot_table/blocks/aura_timer.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/aura_timer.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json b/src/generated/resources/data/naturesaura/loot_table/blocks/auto_crafter.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/auto_crafter.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json b/src/generated/resources/data/naturesaura/loot_table/blocks/blast_furnace_booster.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/blast_furnace_booster.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/chorus_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/chorus_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json b/src/generated/resources/data/naturesaura/loot_table/blocks/chunk_loader.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/chunk_loader.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json b/src/generated/resources/data/naturesaura/loot_table/blocks/conversion_catalyst.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/conversion_catalyst.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/crimson_aura_mushroom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/crimson_aura_mushroom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json b/src/generated/resources/data/naturesaura/loot_table/blocks/crushing_catalyst.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/crushing_catalyst.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json b/src/generated/resources/data/naturesaura/loot_table/blocks/decayed_leaves.json similarity index 63% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/decayed_leaves.json index 11897e2e..29cab17d 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_table/blocks/decayed_leaves.json @@ -7,14 +7,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json b/src/generated/resources/data/naturesaura/loot_table/blocks/depth_ingot_block.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/depth_ingot_block.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json b/src/generated/resources/data/naturesaura/loot_table/blocks/dimension_rail_end.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/dimension_rail_end.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json b/src/generated/resources/data/naturesaura/loot_table/blocks/dimension_rail_nether.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/dimension_rail_nether.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json b/src/generated/resources/data/naturesaura/loot_table/blocks/dimension_rail_overworld.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/dimension_rail_overworld.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json b/src/generated/resources/data/naturesaura/loot_table/blocks/end_flower.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/end_flower.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json b/src/generated/resources/data/naturesaura/loot_table/blocks/ender_crate.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/ender_crate.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/field_creator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/field_creator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/firework_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/firework_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/flower_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/flower_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json b/src/generated/resources/data/naturesaura/loot_table/blocks/furnace_heater.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/furnace_heater.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json b/src/generated/resources/data/naturesaura/loot_table/blocks/generator_limit_remover.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/generator_limit_remover.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json b/src/generated/resources/data/naturesaura/loot_table/blocks/gold_brick.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/gold_brick.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json b/src/generated/resources/data/naturesaura/loot_table/blocks/gold_nether_brick.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/gold_nether_brick.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json b/src/generated/resources/data/naturesaura/loot_table/blocks/gold_powder.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/gold_powder.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json b/src/generated/resources/data/naturesaura/loot_table/blocks/golden_leaves.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/golden_leaves.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json b/src/generated/resources/data/naturesaura/loot_table/blocks/grated_chute.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/grated_chute.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json b/src/generated/resources/data/naturesaura/loot_table/blocks/hopper_upgrade.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/hopper_upgrade.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_brick.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_brick.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_brick_slab.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_brick_slab.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_brick_stairs.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_brick_stairs.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_iron_block.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_iron_block.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_slab.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_slab.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_stairs.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_stairs.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json b/src/generated/resources/data/naturesaura/loot_table/blocks/infused_stone.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/infused_stone.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json b/src/generated/resources/data/naturesaura/loot_table/blocks/item_distributor.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/item_distributor.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json b/src/generated/resources/data/naturesaura/loot_table/blocks/light.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/light.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/light.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/lower_limiter.json b/src/generated/resources/data/naturesaura/loot_table/blocks/lower_limiter.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/lower_limiter.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/lower_limiter.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/moss_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/moss_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json b/src/generated/resources/data/naturesaura/loot_table/blocks/nature_altar.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/nature_altar.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json b/src/generated/resources/data/naturesaura/loot_table/blocks/nether_grass.json similarity index 69% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/nether_grass.json index 98b88ecb..66c66c87 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json +++ b/src/generated/resources/data/naturesaura/loot_table/blocks/nether_grass.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/nether_wart_mushroom.json similarity index 76% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/nether_wart_mushroom.json index 7a3b9e06..d12c3ec6 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_table/blocks/nether_wart_mushroom.json @@ -13,14 +13,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ], diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/oak_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/oak_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json b/src/generated/resources/data/naturesaura/loot_table/blocks/offering_table.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/offering_table.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json b/src/generated/resources/data/naturesaura/loot_table/blocks/pickup_stopper.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/pickup_stopper.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json b/src/generated/resources/data/naturesaura/loot_table/blocks/placer.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/placer.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/potion_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/potion_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/potted_aura_bloom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/potted_aura_bloom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json b/src/generated/resources/data/naturesaura/loot_table/blocks/potted_aura_cactus.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/potted_aura_cactus.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/potted_aura_mushroom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/potted_aura_mushroom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/potted_crimson_aura_mushroom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/potted_crimson_aura_mushroom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/potted_warped_aura_mushroom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/potted_warped_aura_mushroom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json b/src/generated/resources/data/naturesaura/loot_table/blocks/powder_placer.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/powder_placer.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/projectile_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/projectile_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json b/src/generated/resources/data/naturesaura/loot_table/blocks/rf_converter.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/rf_converter.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json b/src/generated/resources/data/naturesaura/loot_table/blocks/sky_ingot_block.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/sky_ingot_block.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/slime_split_generator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/slime_split_generator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json b/src/generated/resources/data/naturesaura/loot_table/blocks/snow_creator.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/snow_creator.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json b/src/generated/resources/data/naturesaura/loot_table/blocks/spawn_lamp.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/spawn_lamp.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json b/src/generated/resources/data/naturesaura/loot_table/blocks/spring.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/spring.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json b/src/generated/resources/data/naturesaura/loot_table/blocks/tainted_gold_block.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/tainted_gold_block.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json b/src/generated/resources/data/naturesaura/loot_table/blocks/time_changer.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/time_changer.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_table/blocks/warped_aura_mushroom.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/warped_aura_mushroom.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json b/src/generated/resources/data/naturesaura/loot_table/blocks/weather_changer.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/weather_changer.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json b/src/generated/resources/data/naturesaura/loot_table/blocks/wood_stand.json similarity index 100% rename from src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json rename to src/generated/resources/data/naturesaura/loot_table/blocks/wood_stand.json diff --git a/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json index 3299f787..642d820d 100644 --- a/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_cactus.json @@ -1,6 +1,6 @@ { "type": "neoforge:add_features", - "biomes": "#forge:is_sandy", + "biomes": "#c:is_sandy", "features": "naturesaura:aura_cactus", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json index 8303c8a4..4c1023d6 100644 --- a/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/neoforge/biome_modifier/aura_mushroom.json @@ -1,6 +1,6 @@ { "type": "neoforge:add_features", - "biomes": "#forge:is_mushroom", + "biomes": "#c:is_mushroom", "features": "naturesaura:aura_mushroom", "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_fancy_brick.json b/src/generated/resources/data/naturesaura/tags/block/altar_fancy_brick.json similarity index 100% rename from src/generated/resources/data/naturesaura/tags/blocks/altar_fancy_brick.json rename to src/generated/resources/data/naturesaura/tags/block/altar_fancy_brick.json diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_gold_brick.json b/src/generated/resources/data/naturesaura/tags/block/altar_gold_brick.json similarity index 100% rename from src/generated/resources/data/naturesaura/tags/blocks/altar_gold_brick.json rename to src/generated/resources/data/naturesaura/tags/block/altar_gold_brick.json diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json b/src/generated/resources/data/naturesaura/tags/block/altar_stone.json similarity index 100% rename from src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json rename to src/generated/resources/data/naturesaura/tags/block/altar_stone.json diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json b/src/generated/resources/data/naturesaura/tags/block/altar_wood.json similarity index 100% rename from src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json rename to src/generated/resources/data/naturesaura/tags/block/altar_wood.json diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java index 97a88a12..3d17cec9 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java @@ -33,7 +33,7 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali } @SubscribeEvent - public void onLivingUpdate(EntityTickEvent event) { + public void onLivingUpdate(EntityTickEvent.Post event) { var entity = event.getEntity(); if (entity.level().isClientSide || entity.level().getGameTime() % 40 != 0 || !(entity instanceof Animal) || entity instanceof Npc) return; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java index c95bd387..bc532522 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityImpl.java @@ -47,7 +47,7 @@ public class BlockEntityImpl extends BlockEntity { public void readNBT(CompoundTag compound, SaveType type, HolderLookup.Provider registries) { if (type != SaveType.BLOCK) { - super.loadWithComponents(compound, registries); + super.loadAdditional(compound, registries); this.redstonePower = compound.getInt("redstone"); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java index 542a952d..b707b3a3 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderAuraTimer.java @@ -42,7 +42,7 @@ public class RenderAuraTimer implements BlockEntityRenderer> 16 & 255) / 255F; var g = (type.getColor() >> 8 & 255) / 255F; var b = (type.getColor() & 255) / 255F; - this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderAuraTimer.RES)), combinedLightIn, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(r, g, b, 0.75F)); + this.model.renderToBuffer(stack, buffer.getBuffer(this.model.renderType(RenderAuraTimer.RES)), combinedLightIn, combinedOverlayIn, FastColor.ARGB32.colorFromFloat(0.75F, r, g, b)); stack.popPose(); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java index 6e817ec1..c98acdf0 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/render/RenderGeneratorLimitRemover.java @@ -47,7 +47,7 @@ public class RenderGeneratorLimitRemover implements BlockEntityRenderer { Helper.renderWeirdBox(builder, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 1, spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F); @@ -202,7 +202,9 @@ public class ClientEvents { } }); - BufferUploader.drawWithShader(builder.build()); + var data = builder.build(); + if (data != null) + BufferUploader.drawWithShader(data); } // range visualizer @@ -224,7 +226,9 @@ public class ClientEvents { continue; this.renderVisualize(builder, (IVisualizable) entity, mc.level, entity.blockPosition()); } - BufferUploader.drawWithShader(builder.build()); + var data = builder.build(); + if (data != null) + BufferUploader.drawWithShader(data); RenderSystem.enableCull(); } diff --git a/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java b/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java index 38d96d25..a8723556 100644 --- a/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java +++ b/src/main/java/de/ellpeck/naturesaura/gen/ModFeatures.java @@ -6,6 +6,7 @@ import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.data.worldgen.features.FeatureUtils; import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; @@ -25,13 +26,13 @@ public final class ModFeatures { public static final class Configured { - public static final ResourceKey> ANCIENT_TREE = FeatureUtils.createKey(NaturesAura.MOD_ID + ":ancient_tree"); - public static final ResourceKey> NETHER_WART_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":nether_wart_mushroom"); - public static final ResourceKey> AURA_BLOOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom"); - public static final ResourceKey> AURA_CACTUS = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus"); - public static final ResourceKey> WARPED_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom"); - public static final ResourceKey> CRIMSON_AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom"); - public static final ResourceKey> AURA_MUSHROOM = FeatureUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom"); + public static final ResourceKey> ANCIENT_TREE = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":ancient_tree")); + public static final ResourceKey> NETHER_WART_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":nether_wart_mushroom")); + public static final ResourceKey> AURA_BLOOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_bloom")); + public static final ResourceKey> AURA_CACTUS = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_cactus")); + public static final ResourceKey> WARPED_AURA_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":warped_aura_mushroom")); + public static final ResourceKey> CRIMSON_AURA_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":crimson_aura_mushroom")); + public static final ResourceKey> AURA_MUSHROOM = ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_mushroom")); public static void bootstrap(BootstrapContext> context) { FeatureUtils.register(context, ModFeatures.Configured.AURA_BLOOM, ModFeatures.AURA_BLOOM, NoneFeatureConfiguration.INSTANCE); @@ -48,11 +49,11 @@ public final class ModFeatures { public static final class Placed { - public static final ResourceKey AURA_BLOOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_bloom"); - public static final ResourceKey AURA_CACTUS = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_cactus"); - public static final ResourceKey WARPED_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":warped_aura_mushroom"); - public static final ResourceKey CRIMSON_AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":crimson_aura_mushroom"); - public static final ResourceKey AURA_MUSHROOM = PlacementUtils.createKey(NaturesAura.MOD_ID + ":aura_mushroom"); + public static final ResourceKey AURA_BLOOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_bloom")); + public static final ResourceKey AURA_CACTUS = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_cactus")); + public static final ResourceKey WARPED_AURA_MUSHROOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":warped_aura_mushroom")); + public static final ResourceKey CRIMSON_AURA_MUSHROOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":crimson_aura_mushroom")); + public static final ResourceKey AURA_MUSHROOM = ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.parse(NaturesAura.MOD_ID + ":aura_mushroom")); public static void bootstrap(BootstrapContext context) { var holdergetter = context.lookup(Registries.CONFIGURED_FEATURE); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java index 42b3c73a..78c58159 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java @@ -17,6 +17,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.util.FastColor; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -69,7 +70,7 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem, ICu @Override @OnlyIn(Dist.CLIENT) public ItemColor getItemColor() { - return (stack, tintIndex) -> tintIndex > 0 ? ItemAuraBottle.getType(stack).getColor() : 0xFFFFFF; + return (stack, tintIndex) -> tintIndex > 0 ? FastColor.ARGB32.opaque(ItemAuraBottle.getType(stack).getColor()) : 0xFFFFFFFF; } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java b/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java index e8901ecf..30ce05b5 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemColorChanger.java @@ -13,6 +13,7 @@ import net.minecraft.core.Direction; import net.minecraft.core.component.DataComponentType; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.util.FastColor; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; @@ -119,10 +120,10 @@ public class ItemColorChanger extends ItemImpl implements IColorProvidingItem, I if (tintIndex > 0) { var color = ItemColorChanger.getStoredColor(stack); if (color != null) { - return color.getFireworkColor(); + return FastColor.ARGB32.opaque(color.getFireworkColor()); } } - return 0xFFFFFF; + return 0xFFFFFFFF; }; } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java b/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java index b2e4f0b4..63e32bae 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemEffectPowder.java @@ -10,6 +10,7 @@ import net.minecraft.client.color.item.ItemColor; import net.minecraft.core.component.DataComponentType; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FastColor; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; @@ -63,7 +64,7 @@ public class ItemEffectPowder extends ItemImpl implements IColorProvidingItem, I @Override @OnlyIn(Dist.CLIENT) public ItemColor getItemColor() { - return (stack, tintIndex) -> NaturesAuraAPI.EFFECT_POWDERS.getOrDefault(ItemEffectPowder.getEffect(stack), 0xFFFFFF); + return (stack, tintIndex) -> FastColor.ARGB32.opaque(NaturesAuraAPI.EFFECT_POWDERS.getOrDefault(ItemEffectPowder.getEffect(stack), 0xFFFFFF)); } public record Data(String effect) { diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java b/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java index 799c0076..3867a5d0 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemGoldFiber.java @@ -14,7 +14,7 @@ public class ItemGoldFiber extends ItemImpl implements IColorProvidingItem { @Override public ItemColor getItemColor() { - return (stack, tintIndex) -> 0xF2FF00; + return (stack, tintIndex) -> 0xFFF2FF00; } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java b/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java index 8782991c..f32d5a40 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java @@ -39,7 +39,7 @@ public class ItemPetReviver extends ItemImpl { private static class Events { @SubscribeEvent - public void onEntityTick(EntityTickEvent event) { + public void onEntityTick(EntityTickEvent.Post event) { var entity = event.getEntity(); if (entity.level().isClientSide || entity.level().getGameTime() % 20 != 0 || !(entity instanceof TamableAnimal tameable)) return; diff --git a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java index daad3adf..5bc908cf 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ModItems.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ModItems.java @@ -2,7 +2,7 @@ package de.ellpeck.naturesaura.items; import net.minecraft.world.item.Item; -@SuppressWarnings("NonConstantFieldWithUpperCaseName") +@SuppressWarnings({"NonConstantFieldWithUpperCaseName", "FieldNamingConvention"}) public final class ModItems { public static Item INFUSED_IRON_PICKAXE; @@ -75,4 +75,5 @@ public final class ModItems { public static Item DEPTH_CHEST; public static Item DEPTH_PANTS; public static Item DEPTH_SHOES; + } diff --git a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java index cdbc7c3f..06d82a03 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java @@ -80,7 +80,7 @@ public class ItemArmor extends ArmorItem implements IModItem { } @SubscribeEvent - public static void update(PlayerTickEvent event) { + public static void update(PlayerTickEvent.Post event) { var player = event.getEntity(); var speed = player.getAttribute(Attributes.MOVEMENT_SPEED); var step = player.getAttribute(Attributes.STEP_HEIGHT); diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/effects/effect_powder.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/effects/effect_powder.json index ab353ea6..d25faee5 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/effects/effect_powder.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/effects/effect_powder.json @@ -1,6 +1,6 @@ { "name": "Effect Powder", - "icon": "naturesaura:effect_powder{effect:'naturesaura:plant_boost'}", + "icon": "naturesaura:effect_powder[naturesaura:effect_powder_data={'effect':'naturesaura:plant_boost'}]", "category": "naturesaura:effects", "advancement": "naturesaura:positive_imbalance", "priority": true, @@ -14,4 +14,4 @@ "text": "To use it, simply placing a stack of any size down on the ground will cause it to either stop its effect or create it, depending on the type of powder used. The $(thing)range$() the effect will have in blocks is equal to the size of the stack placed down. Hitting it while it is on the ground will cause it to go back into its item form.$(p)Each effect that has an $(item)Effect Powder$() attached to it will show the recipe in its chapter." } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/intro.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/intro.json index 48612e3f..e6751970 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/intro.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/intro/intro.json @@ -1,6 +1,6 @@ { "name": "This Book", - "icon": "patchouli:guide_book{'patchouli:book':'naturesaura:book'}", + "icon": "patchouli:guide_book[patchouli:book='naturesaura:book']", "category": "naturesaura:intro", "priority": true, "pages": [ @@ -13,4 +13,4 @@ "text": "Additionally, to guide the user through the development of their research, some chapters will display $(thing)orange icons$(). These notify the reader of the next step they will have to take to advance their research further. Additionally, there is a direct link to the $(item)Advancement menu$() on the front page, which allows a greater overview of the overall progress." } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json index 615c1b62..2e9bd66e 100644 --- a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/practices/aura_bottle.json @@ -1,6 +1,6 @@ { "name": "Aura Bottling", - "icon": "naturesaura:aura_bottle{stored_type:'naturesaura:overworld'}", + "icon": "naturesaura:aura_bottle[naturesaura:aura_bottle_data={'aura_type':'naturesaura:overworld'}]", "category": "naturesaura:practices", "advancement": "naturesaura:gold_leaf", "turnin": "naturesaura:aura_bottle_overworld", @@ -16,7 +16,7 @@ }, { "type": "spotlight", - "item": "naturesaura:aura_bottle{stored_type:'naturesaura:overworld'}", + "item": "naturesaura:aura_bottle[naturesaura:aura_bottle_data={'aura_type':'naturesaura:overworld'}]", "link_recipe": true, "text": "Of course, based on the world that you are currently in, the type of $(aura) collected will slightly vary. For instance, in the normal world, $(aura) can be gathered in the form of sunlight, while in the Nether realm, $(aura) can be gathered in the form of ghosts, and in the End realm, $(aura) is present in the form of an overabundance of darkness." }, @@ -31,4 +31,4 @@ "text": "Lastly, some areas have a severe lack of $(aura), much lower than the $(l:items/eye)Environmental Eye$() can display, and whose air is subsequently nearly devoid of oxygen. Using a $(item)Bottle and Cork$() in areas like these allows bottling up this air and capturing a nearly perfect $(aura) vacuum in the bottle." } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/advancements/altar.json b/src/main/resources/data/naturesaura/advancement/altar.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/altar.json rename to src/main/resources/data/naturesaura/advancement/altar.json diff --git a/src/main/resources/data/naturesaura/advancements/aura_bottle_end.json b/src/main/resources/data/naturesaura/advancement/aura_bottle_end.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/aura_bottle_end.json rename to src/main/resources/data/naturesaura/advancement/aura_bottle_end.json diff --git a/src/main/resources/data/naturesaura/advancements/aura_bottle_nether.json b/src/main/resources/data/naturesaura/advancement/aura_bottle_nether.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/aura_bottle_nether.json rename to src/main/resources/data/naturesaura/advancement/aura_bottle_nether.json diff --git a/src/main/resources/data/naturesaura/advancements/aura_bottle_overworld.json b/src/main/resources/data/naturesaura/advancement/aura_bottle_overworld.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/aura_bottle_overworld.json rename to src/main/resources/data/naturesaura/advancement/aura_bottle_overworld.json diff --git a/src/main/resources/data/naturesaura/advancements/aura_cache.json b/src/main/resources/data/naturesaura/advancement/aura_cache.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/aura_cache.json rename to src/main/resources/data/naturesaura/advancement/aura_cache.json diff --git a/src/main/resources/data/naturesaura/advancements/conversion_catalyst.json b/src/main/resources/data/naturesaura/advancement/conversion_catalyst.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/conversion_catalyst.json rename to src/main/resources/data/naturesaura/advancement/conversion_catalyst.json diff --git a/src/main/resources/data/naturesaura/advancements/depth_ingot.json b/src/main/resources/data/naturesaura/advancement/depth_ingot.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/depth_ingot.json rename to src/main/resources/data/naturesaura/advancement/depth_ingot.json diff --git a/src/main/resources/data/naturesaura/advancements/depth_tools.json b/src/main/resources/data/naturesaura/advancement/depth_tools.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/depth_tools.json rename to src/main/resources/data/naturesaura/advancement/depth_tools.json diff --git a/src/main/resources/data/naturesaura/advancements/end_flower.json b/src/main/resources/data/naturesaura/advancement/end_flower.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/end_flower.json rename to src/main/resources/data/naturesaura/advancement/end_flower.json diff --git a/src/main/resources/data/naturesaura/advancements/eye.json b/src/main/resources/data/naturesaura/advancement/eye.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/eye.json rename to src/main/resources/data/naturesaura/advancement/eye.json diff --git a/src/main/resources/data/naturesaura/advancements/eye_improved.json b/src/main/resources/data/naturesaura/advancement/eye_improved.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/eye_improved.json rename to src/main/resources/data/naturesaura/advancement/eye_improved.json diff --git a/src/main/resources/data/naturesaura/advancements/furnace_heater.json b/src/main/resources/data/naturesaura/advancement/furnace_heater.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/furnace_heater.json rename to src/main/resources/data/naturesaura/advancement/furnace_heater.json diff --git a/src/main/resources/data/naturesaura/advancements/get_book.json b/src/main/resources/data/naturesaura/advancement/get_book.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/get_book.json rename to src/main/resources/data/naturesaura/advancement/get_book.json diff --git a/src/main/resources/data/naturesaura/advancements/gold_leaf.json b/src/main/resources/data/naturesaura/advancement/gold_leaf.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/gold_leaf.json rename to src/main/resources/data/naturesaura/advancement/gold_leaf.json diff --git a/src/main/resources/data/naturesaura/advancements/infused_materials.json b/src/main/resources/data/naturesaura/advancement/infused_materials.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/infused_materials.json rename to src/main/resources/data/naturesaura/advancement/infused_materials.json diff --git a/src/main/resources/data/naturesaura/advancements/infused_tools.json b/src/main/resources/data/naturesaura/advancement/infused_tools.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/infused_tools.json rename to src/main/resources/data/naturesaura/advancement/infused_tools.json diff --git a/src/main/resources/data/naturesaura/advancements/negative_imbalance.json b/src/main/resources/data/naturesaura/advancement/negative_imbalance.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/negative_imbalance.json rename to src/main/resources/data/naturesaura/advancement/negative_imbalance.json diff --git a/src/main/resources/data/naturesaura/advancements/offering.json b/src/main/resources/data/naturesaura/advancement/offering.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/offering.json rename to src/main/resources/data/naturesaura/advancement/offering.json diff --git a/src/main/resources/data/naturesaura/advancements/placer.json b/src/main/resources/data/naturesaura/advancement/placer.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/placer.json rename to src/main/resources/data/naturesaura/advancement/placer.json diff --git a/src/main/resources/data/naturesaura/advancements/positive_imbalance.json b/src/main/resources/data/naturesaura/advancement/positive_imbalance.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/positive_imbalance.json rename to src/main/resources/data/naturesaura/advancement/positive_imbalance.json diff --git a/src/main/resources/data/naturesaura/advancements/range_visualizer.json b/src/main/resources/data/naturesaura/advancement/range_visualizer.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/range_visualizer.json rename to src/main/resources/data/naturesaura/advancement/range_visualizer.json diff --git a/src/main/resources/data/naturesaura/advancements/root.json b/src/main/resources/data/naturesaura/advancement/root.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/root.json rename to src/main/resources/data/naturesaura/advancement/root.json diff --git a/src/main/resources/data/naturesaura/advancements/sky_ingot.json b/src/main/resources/data/naturesaura/advancement/sky_ingot.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/sky_ingot.json rename to src/main/resources/data/naturesaura/advancement/sky_ingot.json diff --git a/src/main/resources/data/naturesaura/advancements/vacuum_bottle.json b/src/main/resources/data/naturesaura/advancement/vacuum_bottle.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/vacuum_bottle.json rename to src/main/resources/data/naturesaura/advancement/vacuum_bottle.json diff --git a/src/main/resources/data/naturesaura/advancements/wood_stand.json b/src/main/resources/data/naturesaura/advancement/wood_stand.json similarity index 100% rename from src/main/resources/data/naturesaura/advancements/wood_stand.json rename to src/main/resources/data/naturesaura/advancement/wood_stand.json diff --git a/src/main/resources/data/naturesaura/recipes/altar/amethyst.json b/src/main/resources/data/naturesaura/recipe/altar/amethyst.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/amethyst.json rename to src/main/resources/data/naturesaura/recipe/altar/amethyst.json index 8abaecd2..068c8b9e 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/amethyst.json +++ b/src/main/resources/data/naturesaura/recipe/altar/amethyst.json @@ -4,11 +4,11 @@ "item": "minecraft:amethyst_block" }, "output": { - "item": "minecraft:amethyst_shard" + "id": "minecraft:amethyst_shard" }, "catalyst": { "item": "naturesaura:crushing_catalyst" }, "aura": 25000, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/arrow.json b/src/main/resources/data/naturesaura/recipe/altar/arrow.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/altar/arrow.json rename to src/main/resources/data/naturesaura/recipe/altar/arrow.json index 29c5ccd9..3a21a1a7 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/arrow.json +++ b/src/main/resources/data/naturesaura/recipe/altar/arrow.json @@ -4,11 +4,11 @@ "item": "minecraft:arrow" }, "output": { - "item": "minecraft:spectral_arrow" + "id": "minecraft:spectral_arrow" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 10000, "time": 50 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/blaze.json b/src/main/resources/data/naturesaura/recipe/altar/blaze.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/blaze.json rename to src/main/resources/data/naturesaura/recipe/altar/blaze.json index 82629051..dad1d4b0 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/blaze.json +++ b/src/main/resources/data/naturesaura/recipe/altar/blaze.json @@ -4,7 +4,7 @@ "item": "minecraft:blaze_rod" }, "output": { - "item": "minecraft:blaze_powder", + "id": "minecraft:blaze_powder", "count": 4 }, "catalyst": { @@ -12,4 +12,4 @@ }, "aura": 5000, "time": 60 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/bone.json b/src/main/resources/data/naturesaura/recipe/altar/bone.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/bone.json rename to src/main/resources/data/naturesaura/recipe/altar/bone.json index 17c64bdc..91709d60 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/bone.json +++ b/src/main/resources/data/naturesaura/recipe/altar/bone.json @@ -4,7 +4,7 @@ "item": "minecraft:bone" }, "output": { - "item": "minecraft:bone_meal", + "id": "minecraft:bone_meal", "count": 6 }, "catalyst": { @@ -12,4 +12,4 @@ }, "aura": 3000, "time": 40 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipe/altar/breath.json b/src/main/resources/data/naturesaura/recipe/altar/breath.json new file mode 100644 index 00000000..772492bd --- /dev/null +++ b/src/main/resources/data/naturesaura/recipe/altar/breath.json @@ -0,0 +1,20 @@ +{ + "type": "naturesaura:altar", + "input": { + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" + }, + "output": { + "id": "minecraft:dragon_breath" + }, + "catalyst": { + "item": "naturesaura:conversion_catalyst" + }, + "aura": 20000, + "time": 80 +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/chorus.json b/src/main/resources/data/naturesaura/recipe/altar/chorus.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/chorus.json rename to src/main/resources/data/naturesaura/recipe/altar/chorus.json index 16da6b9a..ae3f6195 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/chorus.json +++ b/src/main/resources/data/naturesaura/recipe/altar/chorus.json @@ -4,11 +4,11 @@ "item": "minecraft:popped_chorus_fruit" }, "output": { - "item": "minecraft:chorus_flower" + "id": "minecraft:chorus_flower" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 15000, "time": 80 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/coal.json b/src/main/resources/data/naturesaura/recipe/altar/coal.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/altar/coal.json rename to src/main/resources/data/naturesaura/recipe/altar/coal.json index b1f18277..a767d321 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/coal.json +++ b/src/main/resources/data/naturesaura/recipe/altar/coal.json @@ -4,11 +4,11 @@ "item": "minecraft:charcoal" }, "output": { - "item": "minecraft:coal" + "id": "minecraft:coal" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 30000, "time": 250 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/crimson_fungus.json b/src/main/resources/data/naturesaura/recipe/altar/crimson_fungus.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/crimson_fungus.json rename to src/main/resources/data/naturesaura/recipe/altar/crimson_fungus.json index b89e53e4..898c7a94 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/crimson_fungus.json +++ b/src/main/resources/data/naturesaura/recipe/altar/crimson_fungus.json @@ -4,11 +4,11 @@ "item": "minecraft:red_mushroom" }, "output": { - "item": "minecraft:crimson_fungus" + "id": "minecraft:crimson_fungus" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 30000, "time": 250 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/egg.json b/src/main/resources/data/naturesaura/recipe/altar/egg.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/altar/egg.json rename to src/main/resources/data/naturesaura/recipe/altar/egg.json index 4cac8a11..d3cb4106 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/egg.json +++ b/src/main/resources/data/naturesaura/recipe/altar/egg.json @@ -4,11 +4,11 @@ "item": "minecraft:apple" }, "output": { - "item": "minecraft:egg" + "id": "minecraft:egg" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 5000, "time": 50 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/ender_pearl.json b/src/main/resources/data/naturesaura/recipe/altar/ender_pearl.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/ender_pearl.json rename to src/main/resources/data/naturesaura/recipe/altar/ender_pearl.json index 6886624f..20fde55a 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/ender_pearl.json +++ b/src/main/resources/data/naturesaura/recipe/altar/ender_pearl.json @@ -4,11 +4,11 @@ "item": "minecraft:amethyst_shard" }, "output": { - "item": "minecraft:ender_pearl" + "id": "minecraft:ender_pearl" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 90000, "time": 300 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/fermented.json b/src/main/resources/data/naturesaura/recipe/altar/fermented.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/altar/fermented.json rename to src/main/resources/data/naturesaura/recipe/altar/fermented.json index 81a8147f..b8a01f02 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/fermented.json +++ b/src/main/resources/data/naturesaura/recipe/altar/fermented.json @@ -4,11 +4,11 @@ "item": "minecraft:spider_eye" }, "output": { - "item": "minecraft:fermented_spider_eye" + "id": "minecraft:fermented_spider_eye" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 10000, "time": 50 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/ghast_tear.json b/src/main/resources/data/naturesaura/recipe/altar/ghast_tear.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/ghast_tear.json rename to src/main/resources/data/naturesaura/recipe/altar/ghast_tear.json index 60ea8338..5e738b09 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/ghast_tear.json +++ b/src/main/resources/data/naturesaura/recipe/altar/ghast_tear.json @@ -4,11 +4,11 @@ "item": "minecraft:soul_soil" }, "output": { - "item": "minecraft:ghast_tear" + "id": "minecraft:ghast_tear" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 90000, "time": 300 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/gilded_blackstone.json b/src/main/resources/data/naturesaura/recipe/altar/gilded_blackstone.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/altar/gilded_blackstone.json rename to src/main/resources/data/naturesaura/recipe/altar/gilded_blackstone.json index ec589240..c5e99356 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/gilded_blackstone.json +++ b/src/main/resources/data/naturesaura/recipe/altar/gilded_blackstone.json @@ -4,11 +4,11 @@ "item": "minecraft:blackstone" }, "output": { - "item": "minecraft:gilded_blackstone" + "id": "minecraft:gilded_blackstone" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 50000, "time": 300 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/glowstone.json b/src/main/resources/data/naturesaura/recipe/altar/glowstone.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/glowstone.json rename to src/main/resources/data/naturesaura/recipe/altar/glowstone.json index 9131c697..5139de9d 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/glowstone.json +++ b/src/main/resources/data/naturesaura/recipe/altar/glowstone.json @@ -4,7 +4,7 @@ "item": "minecraft:glowstone" }, "output": { - "item": "minecraft:glowstone_dust", + "id": "minecraft:glowstone_dust", "count": 4 }, "catalyst": { @@ -12,4 +12,4 @@ }, "aura": 3000, "time": 40 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/gold_powder.json b/src/main/resources/data/naturesaura/recipe/altar/gold_powder.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/gold_powder.json rename to src/main/resources/data/naturesaura/recipe/altar/gold_powder.json index 6307fe17..da0676f6 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/gold_powder.json +++ b/src/main/resources/data/naturesaura/recipe/altar/gold_powder.json @@ -4,7 +4,7 @@ "item": "naturesaura:gold_leaf" }, "output": { - "item": "naturesaura:gold_powder", + "id": "naturesaura:gold_powder", "count": 4 }, "catalyst": { @@ -12,4 +12,4 @@ }, "aura": 2000, "time": 20 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/infused_iron.json b/src/main/resources/data/naturesaura/recipe/altar/infused_iron.json similarity index 77% rename from src/main/resources/data/naturesaura/recipes/altar/infused_iron.json rename to src/main/resources/data/naturesaura/recipe/altar/infused_iron.json index bce8e251..74934789 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/infused_iron.json +++ b/src/main/resources/data/naturesaura/recipe/altar/infused_iron.json @@ -4,8 +4,8 @@ "item": "minecraft:iron_ingot" }, "output": { - "item": "naturesaura:infused_iron" + "id": "naturesaura:infused_iron" }, "aura": 15000, "time": 80 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/infused_iron_block.json b/src/main/resources/data/naturesaura/recipe/altar/infused_iron_block.json similarity index 75% rename from src/main/resources/data/naturesaura/recipes/altar/infused_iron_block.json rename to src/main/resources/data/naturesaura/recipe/altar/infused_iron_block.json index ef04bfd7..2c7d1d4d 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/infused_iron_block.json +++ b/src/main/resources/data/naturesaura/recipe/altar/infused_iron_block.json @@ -4,8 +4,8 @@ "item": "minecraft:iron_block" }, "output": { - "item": "naturesaura:infused_iron_block" + "id": "naturesaura:infused_iron_block" }, "aura": 135000, "time": 700 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/infused_stone.json b/src/main/resources/data/naturesaura/recipe/altar/infused_stone.json similarity index 76% rename from src/main/resources/data/naturesaura/recipes/altar/infused_stone.json rename to src/main/resources/data/naturesaura/recipe/altar/infused_stone.json index c0d08ce2..a1772780 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/infused_stone.json +++ b/src/main/resources/data/naturesaura/recipe/altar/infused_stone.json @@ -4,8 +4,8 @@ "item": "minecraft:stone" }, "output": { - "item": "naturesaura:infused_stone" + "id": "naturesaura:infused_stone" }, "aura": 7500, "time": 40 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/lead.json b/src/main/resources/data/naturesaura/recipe/altar/lead.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/altar/lead.json rename to src/main/resources/data/naturesaura/recipe/altar/lead.json index 2744e987..a3b81741 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/lead.json +++ b/src/main/resources/data/naturesaura/recipe/altar/lead.json @@ -4,11 +4,11 @@ "item": "minecraft:string" }, "output": { - "item": "minecraft:lead" + "id": "minecraft:lead" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 10000, "time": 50 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/leather.json b/src/main/resources/data/naturesaura/recipe/altar/leather.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/altar/leather.json rename to src/main/resources/data/naturesaura/recipe/altar/leather.json index 4bad7426..0ad37472 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/leather.json +++ b/src/main/resources/data/naturesaura/recipe/altar/leather.json @@ -4,11 +4,11 @@ "item": "minecraft:rotten_flesh" }, "output": { - "item": "minecraft:leather" + "id": "minecraft:leather" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 10000, "time": 50 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/milk.json b/src/main/resources/data/naturesaura/recipe/altar/milk.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/milk.json rename to src/main/resources/data/naturesaura/recipe/altar/milk.json index 4cc53ecd..0a9b3d9d 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/milk.json +++ b/src/main/resources/data/naturesaura/recipe/altar/milk.json @@ -4,11 +4,11 @@ "item": "minecraft:water_bucket" }, "output": { - "item": "minecraft:milk_bucket" + "id": "minecraft:milk_bucket" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 80000, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/mud.json b/src/main/resources/data/naturesaura/recipe/altar/mud.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/altar/mud.json rename to src/main/resources/data/naturesaura/recipe/altar/mud.json index 9116aaae..fbecc418 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/mud.json +++ b/src/main/resources/data/naturesaura/recipe/altar/mud.json @@ -4,11 +4,11 @@ "item": "minecraft:packed_mud" }, "output": { - "item": "minecraft:mud" + "id": "minecraft:mud" }, "catalyst": { "item": "naturesaura:crushing_catalyst" }, "aura": 2000, "time": 20 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/nether_wart.json b/src/main/resources/data/naturesaura/recipe/altar/nether_wart.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/nether_wart.json rename to src/main/resources/data/naturesaura/recipe/altar/nether_wart.json index e45509ba..549c8b97 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/nether_wart.json +++ b/src/main/resources/data/naturesaura/recipe/altar/nether_wart.json @@ -4,11 +4,11 @@ "item": "minecraft:crimson_fungus" }, "output": { - "item": "minecraft:nether_wart" + "id": "minecraft:nether_wart" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 30000, "time": 250 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/nether_wart_crushing.json b/src/main/resources/data/naturesaura/recipe/altar/nether_wart_crushing.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/nether_wart_crushing.json rename to src/main/resources/data/naturesaura/recipe/altar/nether_wart_crushing.json index ead5bc52..00f8848c 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/nether_wart_crushing.json +++ b/src/main/resources/data/naturesaura/recipe/altar/nether_wart_crushing.json @@ -4,11 +4,11 @@ "item": "minecraft:nether_wart_block" }, "output": { - "item": "minecraft:nether_wart" + "id": "minecraft:nether_wart" }, "catalyst": { "item": "naturesaura:crushing_catalyst" }, "aura": 25000, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/potato.json b/src/main/resources/data/naturesaura/recipe/altar/potato.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/altar/potato.json rename to src/main/resources/data/naturesaura/recipe/altar/potato.json index 5dfde1dd..59d7d55f 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/potato.json +++ b/src/main/resources/data/naturesaura/recipe/altar/potato.json @@ -4,11 +4,11 @@ "item": "minecraft:poisonous_potato" }, "output": { - "item": "minecraft:potato" + "id": "minecraft:potato" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 10000, "time": 50 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/prismarine.json b/src/main/resources/data/naturesaura/recipe/altar/prismarine.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/altar/prismarine.json rename to src/main/resources/data/naturesaura/recipe/altar/prismarine.json index 03de0a58..76267832 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/prismarine.json +++ b/src/main/resources/data/naturesaura/recipe/altar/prismarine.json @@ -4,11 +4,11 @@ "item": "minecraft:quartz" }, "output": { - "item": "minecraft:prismarine_shard" + "id": "minecraft:prismarine_shard" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 55000, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/prismarine_crystal.json b/src/main/resources/data/naturesaura/recipe/altar/prismarine_crystal.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/altar/prismarine_crystal.json rename to src/main/resources/data/naturesaura/recipe/altar/prismarine_crystal.json index e666d54b..d3609a2b 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/prismarine_crystal.json +++ b/src/main/resources/data/naturesaura/recipe/altar/prismarine_crystal.json @@ -4,11 +4,11 @@ "item": "minecraft:prismarine_shard" }, "output": { - "item": "minecraft:prismarine_crystals" + "id": "minecraft:prismarine_crystals" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 55000, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/rabbit_foot.json b/src/main/resources/data/naturesaura/recipe/altar/rabbit_foot.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/rabbit_foot.json rename to src/main/resources/data/naturesaura/recipe/altar/rabbit_foot.json index ef80fc55..a8924204 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/rabbit_foot.json +++ b/src/main/resources/data/naturesaura/recipe/altar/rabbit_foot.json @@ -4,11 +4,11 @@ "item": "minecraft:rabbit_stew" }, "output": { - "item": "minecraft:rabbit_foot" + "id": "minecraft:rabbit_foot" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 15000, "time": 80 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/sand.json b/src/main/resources/data/naturesaura/recipe/altar/sand.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/altar/sand.json rename to src/main/resources/data/naturesaura/recipe/altar/sand.json index 40094f64..bb28c138 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/sand.json +++ b/src/main/resources/data/naturesaura/recipe/altar/sand.json @@ -4,11 +4,11 @@ "item": "minecraft:cobblestone" }, "output": { - "item": "minecraft:sand" + "id": "minecraft:sand" }, "catalyst": { "item": "naturesaura:crushing_catalyst" }, "aura": 3000, "time": 40 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/soul_sand.json b/src/main/resources/data/naturesaura/recipe/altar/soul_sand.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/soul_sand.json rename to src/main/resources/data/naturesaura/recipe/altar/soul_sand.json index a524e787..93a40318 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/soul_sand.json +++ b/src/main/resources/data/naturesaura/recipe/altar/soul_sand.json @@ -4,11 +4,11 @@ "item": "minecraft:sand" }, "output": { - "item": "minecraft:soul_sand" + "id": "minecraft:soul_sand" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 5000, "time": 100 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/soul_sand_crushing.json b/src/main/resources/data/naturesaura/recipe/altar/soul_sand_crushing.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/altar/soul_sand_crushing.json rename to src/main/resources/data/naturesaura/recipe/altar/soul_sand_crushing.json index c179a8c6..8a12d461 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/soul_sand_crushing.json +++ b/src/main/resources/data/naturesaura/recipe/altar/soul_sand_crushing.json @@ -4,11 +4,11 @@ "item": "minecraft:soul_soil" }, "output": { - "item": "minecraft:soul_sand" + "id": "minecraft:soul_sand" }, "catalyst": { "item": "naturesaura:crushing_catalyst" }, "aura": 6000, "time": 40 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/sugar.json b/src/main/resources/data/naturesaura/recipe/altar/sugar.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/altar/sugar.json rename to src/main/resources/data/naturesaura/recipe/altar/sugar.json index 861a119b..8927419f 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/sugar.json +++ b/src/main/resources/data/naturesaura/recipe/altar/sugar.json @@ -4,7 +4,7 @@ "item": "minecraft:sugar_cane" }, "output": { - "item": "minecraft:sugar", + "id": "minecraft:sugar", "count": 3 }, "catalyst": { @@ -12,4 +12,4 @@ }, "aura": 3000, "time": 40 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json b/src/main/resources/data/naturesaura/recipe/altar/tainted_gold.json similarity index 77% rename from src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json rename to src/main/resources/data/naturesaura/recipe/altar/tainted_gold.json index 87cc63ac..6096cb61 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold.json +++ b/src/main/resources/data/naturesaura/recipe/altar/tainted_gold.json @@ -4,8 +4,8 @@ "item": "minecraft:gold_ingot" }, "output": { - "item": "naturesaura:tainted_gold" + "id": "naturesaura:tainted_gold" }, "aura": 3000, "time": 300 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json b/src/main/resources/data/naturesaura/recipe/altar/tainted_gold_block.json similarity index 75% rename from src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json rename to src/main/resources/data/naturesaura/recipe/altar/tainted_gold_block.json index abb84029..42d0b392 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/tainted_gold_block.json +++ b/src/main/resources/data/naturesaura/recipe/altar/tainted_gold_block.json @@ -4,8 +4,8 @@ "item": "minecraft:gold_block" }, "output": { - "item": "naturesaura:tainted_gold_block" + "id": "naturesaura:tainted_gold_block" }, "aura": 27000, "time": 2625 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/warped_fungus.json b/src/main/resources/data/naturesaura/recipe/altar/warped_fungus.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/altar/warped_fungus.json rename to src/main/resources/data/naturesaura/recipe/altar/warped_fungus.json index a0f1122b..dbd820e2 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/warped_fungus.json +++ b/src/main/resources/data/naturesaura/recipe/altar/warped_fungus.json @@ -4,11 +4,11 @@ "item": "minecraft:brown_mushroom" }, "output": { - "item": "minecraft:warped_fungus" + "id": "minecraft:warped_fungus" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 30000, "time": 250 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/water.json b/src/main/resources/data/naturesaura/recipe/altar/water.json similarity index 67% rename from src/main/resources/data/naturesaura/recipes/altar/water.json rename to src/main/resources/data/naturesaura/recipe/altar/water.json index 769b5286..88f86206 100644 --- a/src/main/resources/data/naturesaura/recipes/altar/water.json +++ b/src/main/resources/data/naturesaura/recipe/altar/water.json @@ -4,14 +4,14 @@ "item": "minecraft:glass_bottle" }, "output": { - "nbt": { - "Potion": "minecraft:water" + "components": { + "minecraft:potion_contents": "minecraft:water" }, - "item": "minecraft:potion" + "id": "minecraft:potion" }, "catalyst": { "item": "naturesaura:conversion_catalyst" }, "aura": 25000, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ancient_bark.json b/src/main/resources/data/naturesaura/recipe/ancient_bark.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/ancient_bark.json rename to src/main/resources/data/naturesaura/recipe/ancient_bark.json index bff10d72..c8bca78f 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_bark.json +++ b/src/main/resources/data/naturesaura/recipe/ancient_bark.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "naturesaura:ancient_bark", + "id": "naturesaura:ancient_bark", "count": 3 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ancient_planks.json b/src/main/resources/data/naturesaura/recipe/ancient_planks.json similarity index 81% rename from src/main/resources/data/naturesaura/recipes/ancient_planks.json rename to src/main/resources/data/naturesaura/recipe/ancient_planks.json index 8ea3b785..4ee544b3 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_planks.json +++ b/src/main/resources/data/naturesaura/recipe/ancient_planks.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:ancient_planks", + "id": "naturesaura:ancient_planks", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json b/src/main/resources/data/naturesaura/recipe/ancient_planks_from_bark.json similarity index 81% rename from src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json rename to src/main/resources/data/naturesaura/recipe/ancient_planks_from_bark.json index 55f58bf3..139f8e99 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json +++ b/src/main/resources/data/naturesaura/recipe/ancient_planks_from_bark.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:ancient_planks", + "id": "naturesaura:ancient_planks", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ancient_slab.json b/src/main/resources/data/naturesaura/recipe/ancient_slab.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/ancient_slab.json rename to src/main/resources/data/naturesaura/recipe/ancient_slab.json index 1e1c5a30..f71e0380 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_slab.json +++ b/src/main/resources/data/naturesaura/recipe/ancient_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:ancient_slab", + "id": "naturesaura:ancient_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ancient_stairs.json b/src/main/resources/data/naturesaura/recipe/ancient_stairs.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/ancient_stairs.json rename to src/main/resources/data/naturesaura/recipe/ancient_stairs.json index 0f993627..cebf3a78 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_stairs.json +++ b/src/main/resources/data/naturesaura/recipe/ancient_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "naturesaura:ancient_stairs", + "id": "naturesaura:ancient_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ancient_stick.json b/src/main/resources/data/naturesaura/recipe/ancient_stick.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/ancient_stick.json rename to src/main/resources/data/naturesaura/recipe/ancient_stick.json index 8f74b793..77c10d5b 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_stick.json +++ b/src/main/resources/data/naturesaura/recipe/ancient_stick.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "naturesaura:ancient_stick", + "id": "naturesaura:ancient_stick", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/animal_container.json b/src/main/resources/data/naturesaura/recipe/animal_container.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/animal_container.json rename to src/main/resources/data/naturesaura/recipe/animal_container.json index 8b1a5cf3..02cfb434 100644 --- a/src/main/resources/data/naturesaura/recipes/animal_container.json +++ b/src/main/resources/data/naturesaura/recipe/animal_container.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:animal_container" + "id": "naturesaura:animal_container" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/animal_generator.json b/src/main/resources/data/naturesaura/recipe/animal_generator.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/animal_generator.json rename to src/main/resources/data/naturesaura/recipe/animal_generator.json index 39befe7f..1ea0cfca 100644 --- a/src/main/resources/data/naturesaura/recipes/animal_generator.json +++ b/src/main/resources/data/naturesaura/recipe/animal_generator.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:animal_generator" + "id": "naturesaura:animal_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner.json b/src/main/resources/data/naturesaura/recipe/animal_spawner.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/animal_spawner.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner.json index 99269b3a..12d8e121 100644 --- a/src/main/resources/data/naturesaura/recipes/animal_spawner.json +++ b/src/main/resources/data/naturesaura/recipe/animal_spawner.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:animal_spawner" + "id": "naturesaura:animal_spawner" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/bat.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/bat.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/bat.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/bat.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/bee.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/bee.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/bee.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/bee.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/blaze.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/blaze.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/blaze.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/blaze.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/cat.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/cat.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/cat.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/cat.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/cave_spider.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/cave_spider.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/cave_spider.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/cave_spider.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/chicken.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/chicken.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/chicken.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/chicken.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/cow.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/cow.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/cow.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/cow.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/creeper.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/creeper.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/creeper.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/creeper.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/dolphin.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/dolphin.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/dolphin.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/dolphin.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/donkey.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/donkey.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/donkey.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/donkey.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/enderman.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/enderman.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/enderman.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/enderman.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/endermite.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/endermite.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/endermite.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/endermite.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/fox.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/fox.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/fox.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/fox.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/ghast.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/ghast.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/ghast.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/ghast.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/guardian.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/guardian.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/guardian.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/guardian.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/hoglin.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/hoglin.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/hoglin.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/hoglin.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/horse.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/horse.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/horse.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/horse.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/husk.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/husk.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/husk.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/husk.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/llama.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/llama.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/llama.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/llama.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/magma_cube.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/magma_cube.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/magma_cube.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/magma_cube.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/mooshroom.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/mooshroom.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/mooshroom.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/mooshroom.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/mule.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/mule.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/mule.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/mule.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/ocelot.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/ocelot.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/ocelot.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/ocelot.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/panda.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/panda.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/panda.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/panda.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/parrot.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/parrot.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/parrot.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/parrot.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/phantom.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/phantom.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/phantom.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/phantom.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/pig.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/pig.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/pig.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/pig.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/piglin.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/piglin.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/piglin.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/piglin.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/piglin_brute.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/piglin_brute.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/piglin_brute.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/piglin_brute.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/polar_bear.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/polar_bear.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/polar_bear.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/polar_bear.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/rabbit.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/rabbit.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/rabbit.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/rabbit.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_black.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_black.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_black.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_black.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_blue.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_blue.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_blue.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_blue.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_brown.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_brown.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_brown.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_brown.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_cyan.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_cyan.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_cyan.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_cyan.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_gray.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_gray.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_gray.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_gray.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_green.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_green.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_green.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_green.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_light_blue.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_light_blue.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_light_blue.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_light_blue.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_light_gray.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_light_gray.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_light_gray.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_light_gray.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_lime.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_lime.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_lime.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_lime.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_magenta.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_magenta.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_magenta.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_magenta.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_orange.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_orange.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_orange.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_orange.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_pink.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_pink.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_pink.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_pink.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_purple.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_purple.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_purple.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_purple.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_red.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_red.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_red.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_red.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_white.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_white.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_white.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_white.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_yellow.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_yellow.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/sheep_yellow.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/sheep_yellow.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/shulker.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/shulker.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/shulker.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/shulker.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/silverfish.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/silverfish.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/silverfish.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/silverfish.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/skeleton.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/skeleton.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/skeleton.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/skeleton.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/slime.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/slime.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/slime.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/slime.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/spider.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/spider.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/spider.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/spider.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/squid.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/squid.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/squid.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/squid.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/stray.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/stray.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/stray.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/stray.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/turtle.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/turtle.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/turtle.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/turtle.json index 10c27df7..c2b1b86f 100644 --- a/src/main/resources/data/naturesaura/recipes/animal_spawner/turtle.json +++ b/src/main/resources/data/naturesaura/recipe/animal_spawner/turtle.json @@ -5,7 +5,7 @@ "item": "naturesaura:birth_spirit" }, { - "item": "minecraft:scute" + "item": "minecraft:turtle_scute" }, { "item": "minecraft:seagrass" @@ -14,4 +14,4 @@ "entity": "minecraft:turtle", "aura": 100000, "time": 150 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/witch.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/witch.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/witch.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/witch.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/wither_skeleton.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/wither_skeleton.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/wither_skeleton.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/wither_skeleton.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/wolf.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/wolf.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/wolf.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/wolf.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/zombie.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/zombie.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/zombie.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/zombie.json diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner/zombified_piglin.json b/src/main/resources/data/naturesaura/recipe/animal_spawner/zombified_piglin.json similarity index 100% rename from src/main/resources/data/naturesaura/recipes/animal_spawner/zombified_piglin.json rename to src/main/resources/data/naturesaura/recipe/animal_spawner/zombified_piglin.json diff --git a/src/main/resources/data/naturesaura/recipes/aura_cache.json b/src/main/resources/data/naturesaura/recipe/aura_cache.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/aura_cache.json rename to src/main/resources/data/naturesaura/recipe/aura_cache.json index bea2fc78..64b34201 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_cache.json +++ b/src/main/resources/data/naturesaura/recipe/aura_cache.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:aura_cache" + "id": "naturesaura:aura_cache" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/aura_detector.json b/src/main/resources/data/naturesaura/recipe/aura_detector.json similarity index 88% rename from src/main/resources/data/naturesaura/recipes/aura_detector.json rename to src/main/resources/data/naturesaura/recipe/aura_detector.json index 7e6ac334..a18113d8 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_detector.json +++ b/src/main/resources/data/naturesaura/recipe/aura_detector.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:aura_detector" + "id": "naturesaura:aura_detector" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/aura_timer.json b/src/main/resources/data/naturesaura/recipe/aura_timer.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/aura_timer.json rename to src/main/resources/data/naturesaura/recipe/aura_timer.json index 89689e4a..30ba6086 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_timer.json +++ b/src/main/resources/data/naturesaura/recipe/aura_timer.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:aura_timer" + "id": "naturesaura:aura_timer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/aura_trove.json b/src/main/resources/data/naturesaura/recipe/aura_trove.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/aura_trove.json rename to src/main/resources/data/naturesaura/recipe/aura_trove.json index de297ff9..dd848075 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_trove.json +++ b/src/main/resources/data/naturesaura/recipe/aura_trove.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:aura_trove" + "id": "naturesaura:aura_trove" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/auto_crafter.json b/src/main/resources/data/naturesaura/recipe/auto_crafter.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/auto_crafter.json rename to src/main/resources/data/naturesaura/recipe/auto_crafter.json index 15ce1b17..66e9d829 100644 --- a/src/main/resources/data/naturesaura/recipes/auto_crafter.json +++ b/src/main/resources/data/naturesaura/recipe/auto_crafter.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:auto_crafter" + "id": "naturesaura:auto_crafter" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/blast_furnace_booster.json b/src/main/resources/data/naturesaura/recipe/blast_furnace_booster.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/blast_furnace_booster.json rename to src/main/resources/data/naturesaura/recipe/blast_furnace_booster.json index 4c06706b..93d71b3d 100644 --- a/src/main/resources/data/naturesaura/recipes/blast_furnace_booster.json +++ b/src/main/resources/data/naturesaura/recipe/blast_furnace_booster.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:blast_furnace_booster" + "id": "naturesaura:blast_furnace_booster" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/book.json b/src/main/resources/data/naturesaura/recipe/book.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/book.json rename to src/main/resources/data/naturesaura/recipe/book.json index bfadfab5..4f5f023a 100644 --- a/src/main/resources/data/naturesaura/recipes/book.json +++ b/src/main/resources/data/naturesaura/recipe/book.json @@ -15,9 +15,9 @@ } ], "result": { - "item": "patchouli:guide_book", + "id": "patchouli:guide_book", "nbt": { "patchouli:book": "naturesaura:book" } } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json b/src/main/resources/data/naturesaura/recipe/bottle_two_the_rebottling.json similarity index 79% rename from src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json rename to src/main/resources/data/naturesaura/recipe/bottle_two_the_rebottling.json index d6c83d76..977679ed 100644 --- a/src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json +++ b/src/main/resources/data/naturesaura/recipe/bottle_two_the_rebottling.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "naturesaura:bottle_two_the_rebottling" + "id": "naturesaura:bottle_two_the_rebottling" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipe/calling_spirit.json b/src/main/resources/data/naturesaura/recipe/calling_spirit.json new file mode 100644 index 00000000..c31b2e23 --- /dev/null +++ b/src/main/resources/data/naturesaura/recipe/calling_spirit.json @@ -0,0 +1,41 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " O ", + "GDH", + " N " + ], + "key": { + "G": { + "item": "naturesaura:infused_iron" + }, + "H": { + "item": "naturesaura:tainted_gold" + }, + "O": { + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:overworld" + } + }, + "items": "naturesaura:aura_bottle" + }, + "N": { + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" + }, + "D": { + "item": "minecraft:diamond" + } + }, + "result": { + "id": "naturesaura:calling_spirit", + "count": 3 + } +} diff --git a/src/main/resources/data/naturesaura/recipes/cave_finder.json b/src/main/resources/data/naturesaura/recipe/cave_finder.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/cave_finder.json rename to src/main/resources/data/naturesaura/recipe/cave_finder.json index c37ea02f..952f3a70 100644 --- a/src/main/resources/data/naturesaura/recipes/cave_finder.json +++ b/src/main/resources/data/naturesaura/recipe/cave_finder.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:cave_finder" + "id": "naturesaura:cave_finder" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/chorus_generator.json b/src/main/resources/data/naturesaura/recipe/chorus_generator.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/chorus_generator.json rename to src/main/resources/data/naturesaura/recipe/chorus_generator.json index 759c584d..6b4632d0 100644 --- a/src/main/resources/data/naturesaura/recipes/chorus_generator.json +++ b/src/main/resources/data/naturesaura/recipe/chorus_generator.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:chorus_generator" + "id": "naturesaura:chorus_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/chunk_loader.json b/src/main/resources/data/naturesaura/recipe/chunk_loader.json similarity index 65% rename from src/main/resources/data/naturesaura/recipes/chunk_loader.json rename to src/main/resources/data/naturesaura/recipe/chunk_loader.json index 47722d13..c82da624 100644 --- a/src/main/resources/data/naturesaura/recipes/chunk_loader.json +++ b/src/main/resources/data/naturesaura/recipe/chunk_loader.json @@ -16,18 +16,20 @@ "item": "minecraft:obsidian" }, "N": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" }, "S": { "item": "minecraft:spyglass" } }, "result": { - "item": "naturesaura:chunk_loader" + "id": "naturesaura:chunk_loader" }, "conditions": [ { @@ -35,4 +37,4 @@ "config": "chunkLoader" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/color_changer.json b/src/main/resources/data/naturesaura/recipe/color_changer.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/color_changer.json rename to src/main/resources/data/naturesaura/recipe/color_changer.json index b7e3d277..6ac0edad 100644 --- a/src/main/resources/data/naturesaura/recipes/color_changer.json +++ b/src/main/resources/data/naturesaura/recipe/color_changer.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:color_changer" + "id": "naturesaura:color_changer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipe/crimson_meal.json b/src/main/resources/data/naturesaura/recipe/crimson_meal.json new file mode 100644 index 00000000..b8c43cf8 --- /dev/null +++ b/src/main/resources/data/naturesaura/recipe/crimson_meal.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "OOO", + "OEO", + "OOO" + ], + "key": { + "E": { + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" + }, + "O": { + "item": "minecraft:bone_meal" + } + }, + "result": { + "id": "naturesaura:crimson_meal", + "count": 8 + } +} diff --git a/src/main/resources/data/naturesaura/recipes/death_ring.json b/src/main/resources/data/naturesaura/recipe/death_ring.json similarity index 65% rename from src/main/resources/data/naturesaura/recipes/death_ring.json rename to src/main/resources/data/naturesaura/recipe/death_ring.json index 90dedb81..4d7e0f4c 100644 --- a/src/main/resources/data/naturesaura/recipes/death_ring.json +++ b/src/main/resources/data/naturesaura/recipe/death_ring.json @@ -19,17 +19,19 @@ "item": "naturesaura:token_euphoria" }, "N": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" }, "K": { "item": "minecraft:wither_skeleton_skull" } }, "result": { - "item": "naturesaura:death_ring" + "id": "naturesaura:death_ring" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_axe.json b/src/main/resources/data/naturesaura/recipe/depth_axe.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/depth_axe.json rename to src/main/resources/data/naturesaura/recipe/depth_axe.json index 1929489b..974a34e3 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_axe.json +++ b/src/main/resources/data/naturesaura/recipe/depth_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:depth_axe" + "id": "naturesaura:depth_axe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_chest.json b/src/main/resources/data/naturesaura/recipe/depth_chest.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/depth_chest.json rename to src/main/resources/data/naturesaura/recipe/depth_chest.json index 8ec20037..7d99f440 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_chest.json +++ b/src/main/resources/data/naturesaura/recipe/depth_chest.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:depth_chest" + "id": "naturesaura:depth_chest" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_helmet.json b/src/main/resources/data/naturesaura/recipe/depth_helmet.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/depth_helmet.json rename to src/main/resources/data/naturesaura/recipe/depth_helmet.json index 25842355..c8a33e60 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_helmet.json +++ b/src/main/resources/data/naturesaura/recipe/depth_helmet.json @@ -13,6 +13,6 @@ } }, "result": { - "item": "naturesaura:depth_helmet" + "id": "naturesaura:depth_helmet" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_hoe.json b/src/main/resources/data/naturesaura/recipe/depth_hoe.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/depth_hoe.json rename to src/main/resources/data/naturesaura/recipe/depth_hoe.json index a92c2e06..1a40a820 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_hoe.json +++ b/src/main/resources/data/naturesaura/recipe/depth_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:depth_hoe" + "id": "naturesaura:depth_hoe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_ingot.json b/src/main/resources/data/naturesaura/recipe/depth_ingot.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/depth_ingot.json rename to src/main/resources/data/naturesaura/recipe/depth_ingot.json index 632cce20..30da08d8 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_ingot.json +++ b/src/main/resources/data/naturesaura/recipe/depth_ingot.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:depth_ingot", + "id": "naturesaura:depth_ingot", "count": 9 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_ingot_block.json b/src/main/resources/data/naturesaura/recipe/depth_ingot_block.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/depth_ingot_block.json rename to src/main/resources/data/naturesaura/recipe/depth_ingot_block.json index a1369190..bd8c2536 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_ingot_block.json +++ b/src/main/resources/data/naturesaura/recipe/depth_ingot_block.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:depth_ingot_block" + "id": "naturesaura:depth_ingot_block" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_ingot_creation.json b/src/main/resources/data/naturesaura/recipe/depth_ingot_creation.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/depth_ingot_creation.json rename to src/main/resources/data/naturesaura/recipe/depth_ingot_creation.json index 2f799a29..e788f171 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_ingot_creation.json +++ b/src/main/resources/data/naturesaura/recipe/depth_ingot_creation.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:depth_ingot" + "id": "naturesaura:depth_ingot" } } diff --git a/src/main/resources/data/naturesaura/recipes/depth_pants.json b/src/main/resources/data/naturesaura/recipe/depth_pants.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/depth_pants.json rename to src/main/resources/data/naturesaura/recipe/depth_pants.json index c39662ad..c8456073 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_pants.json +++ b/src/main/resources/data/naturesaura/recipe/depth_pants.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:depth_pants" + "id": "naturesaura:depth_pants" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_pickaxe.json b/src/main/resources/data/naturesaura/recipe/depth_pickaxe.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/depth_pickaxe.json rename to src/main/resources/data/naturesaura/recipe/depth_pickaxe.json index a4f0467b..b30d345c 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_pickaxe.json +++ b/src/main/resources/data/naturesaura/recipe/depth_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:depth_pickaxe" + "id": "naturesaura:depth_pickaxe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_shoes.json b/src/main/resources/data/naturesaura/recipe/depth_shoes.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/depth_shoes.json rename to src/main/resources/data/naturesaura/recipe/depth_shoes.json index 73c308a3..04543d8a 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_shoes.json +++ b/src/main/resources/data/naturesaura/recipe/depth_shoes.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "naturesaura:depth_shoes" + "id": "naturesaura:depth_shoes" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_shovel.json b/src/main/resources/data/naturesaura/recipe/depth_shovel.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/depth_shovel.json rename to src/main/resources/data/naturesaura/recipe/depth_shovel.json index 50a1beb6..f2d74dd0 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_shovel.json +++ b/src/main/resources/data/naturesaura/recipe/depth_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:depth_shovel" + "id": "naturesaura:depth_shovel" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/depth_sword.json b/src/main/resources/data/naturesaura/recipe/depth_sword.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/depth_sword.json rename to src/main/resources/data/naturesaura/recipe/depth_sword.json index 92913bea..42e76701 100644 --- a/src/main/resources/data/naturesaura/recipes/depth_sword.json +++ b/src/main/resources/data/naturesaura/recipe/depth_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:depth_sword" + "id": "naturesaura:depth_sword" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/dimension_rail_end.json b/src/main/resources/data/naturesaura/recipe/dimension_rail_end.json similarity index 56% rename from src/main/resources/data/naturesaura/recipes/dimension_rail_end.json rename to src/main/resources/data/naturesaura/recipe/dimension_rail_end.json index 9e86c744..cc580cf4 100644 --- a/src/main/resources/data/naturesaura/recipes/dimension_rail_end.json +++ b/src/main/resources/data/naturesaura/recipe/dimension_rail_end.json @@ -10,11 +10,13 @@ "item": "naturesaura:token_rage" }, "O": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" }, "S": { "tag": "forge:rods/wooden" @@ -24,6 +26,6 @@ } }, "result": { - "item": "naturesaura:dimension_rail_end" + "id": "naturesaura:dimension_rail_end" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json b/src/main/resources/data/naturesaura/recipe/dimension_rail_nether.json similarity index 55% rename from src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json rename to src/main/resources/data/naturesaura/recipe/dimension_rail_nether.json index 90e59381..64e8a781 100644 --- a/src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json +++ b/src/main/resources/data/naturesaura/recipe/dimension_rail_nether.json @@ -10,11 +10,13 @@ "item": "naturesaura:token_terror" }, "O": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" }, "S": { "tag": "forge:rods/wooden" @@ -24,6 +26,6 @@ } }, "result": { - "item": "naturesaura:dimension_rail_nether" + "id": "naturesaura:dimension_rail_nether" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json b/src/main/resources/data/naturesaura/recipe/dimension_rail_overworld.json similarity index 55% rename from src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json rename to src/main/resources/data/naturesaura/recipe/dimension_rail_overworld.json index 4bbc4a94..e2fcc43e 100644 --- a/src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json +++ b/src/main/resources/data/naturesaura/recipe/dimension_rail_overworld.json @@ -10,11 +10,13 @@ "item": "naturesaura:token_euphoria" }, "O": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:overworld" + } + }, + "items": "naturesaura:aura_bottle" }, "S": { "tag": "forge:rods/wooden" @@ -24,6 +26,6 @@ } }, "result": { - "item": "naturesaura:dimension_rail_overworld" + "id": "naturesaura:dimension_rail_overworld" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/end_city_finder.json b/src/main/resources/data/naturesaura/recipe/end_city_finder.json similarity index 51% rename from src/main/resources/data/naturesaura/recipes/end_city_finder.json rename to src/main/resources/data/naturesaura/recipe/end_city_finder.json index 8ddee1ec..086af767 100644 --- a/src/main/resources/data/naturesaura/recipes/end_city_finder.json +++ b/src/main/resources/data/naturesaura/recipe/end_city_finder.json @@ -13,14 +13,16 @@ "item": "minecraft:chorus_fruit" }, "B": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" } }, "result": { - "item": "naturesaura:end_city_finder" + "id": "naturesaura:end_city_finder" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ender_access.json b/src/main/resources/data/naturesaura/recipe/ender_access.json similarity index 51% rename from src/main/resources/data/naturesaura/recipes/ender_access.json rename to src/main/resources/data/naturesaura/recipe/ender_access.json index c6ed2101..87ff0870 100644 --- a/src/main/resources/data/naturesaura/recipes/ender_access.json +++ b/src/main/resources/data/naturesaura/recipe/ender_access.json @@ -13,14 +13,16 @@ "item": "minecraft:ender_eye" }, "D": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" } }, "result": { - "item": "naturesaura:ender_access" + "id": "naturesaura:ender_access" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/ender_crate.json b/src/main/resources/data/naturesaura/recipe/ender_crate.json similarity index 56% rename from src/main/resources/data/naturesaura/recipes/ender_crate.json rename to src/main/resources/data/naturesaura/recipe/ender_crate.json index 038342b9..07f50446 100644 --- a/src/main/resources/data/naturesaura/recipes/ender_crate.json +++ b/src/main/resources/data/naturesaura/recipe/ender_crate.json @@ -13,17 +13,19 @@ "item": "minecraft:ender_eye" }, "D": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" }, "O": { "item": "minecraft:obsidian" } }, "result": { - "item": "naturesaura:ender_crate" + "id": "naturesaura:ender_crate" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/farming_stencil.json b/src/main/resources/data/naturesaura/recipe/farming_stencil.json similarity index 88% rename from src/main/resources/data/naturesaura/recipes/farming_stencil.json rename to src/main/resources/data/naturesaura/recipe/farming_stencil.json index 410e73df..5b1c2f57 100644 --- a/src/main/resources/data/naturesaura/recipes/farming_stencil.json +++ b/src/main/resources/data/naturesaura/recipe/farming_stencil.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:farming_stencil" + "id": "naturesaura:farming_stencil" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/field_creator.json b/src/main/resources/data/naturesaura/recipe/field_creator.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/field_creator.json rename to src/main/resources/data/naturesaura/recipe/field_creator.json index 895c68f8..9ef0a939 100644 --- a/src/main/resources/data/naturesaura/recipes/field_creator.json +++ b/src/main/resources/data/naturesaura/recipe/field_creator.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "naturesaura:field_creator", + "id": "naturesaura:field_creator", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/firework_generator.json b/src/main/resources/data/naturesaura/recipe/firework_generator.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/firework_generator.json rename to src/main/resources/data/naturesaura/recipe/firework_generator.json index ea1d1d23..6ff4b981 100644 --- a/src/main/resources/data/naturesaura/recipes/firework_generator.json +++ b/src/main/resources/data/naturesaura/recipe/firework_generator.json @@ -29,6 +29,6 @@ } }, "result": { - "item": "naturesaura:firework_generator" + "id": "naturesaura:firework_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/flower_generator.json b/src/main/resources/data/naturesaura/recipe/flower_generator.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/flower_generator.json rename to src/main/resources/data/naturesaura/recipe/flower_generator.json index 5de22b02..d1be4e92 100644 --- a/src/main/resources/data/naturesaura/recipes/flower_generator.json +++ b/src/main/resources/data/naturesaura/recipe/flower_generator.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:flower_generator" + "id": "naturesaura:flower_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/fortress_finder.json b/src/main/resources/data/naturesaura/recipe/fortress_finder.json similarity index 51% rename from src/main/resources/data/naturesaura/recipes/fortress_finder.json rename to src/main/resources/data/naturesaura/recipe/fortress_finder.json index 5b125f01..370f4900 100644 --- a/src/main/resources/data/naturesaura/recipes/fortress_finder.json +++ b/src/main/resources/data/naturesaura/recipe/fortress_finder.json @@ -10,17 +10,19 @@ "item": "minecraft:ender_pearl" }, "C": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" }, "B": { "item": "minecraft:nether_brick" } }, "result": { - "item": "naturesaura:fortress_finder" + "id": "naturesaura:fortress_finder" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/generator_limit_remover.json b/src/main/resources/data/naturesaura/recipe/generator_limit_remover.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/generator_limit_remover.json rename to src/main/resources/data/naturesaura/recipe/generator_limit_remover.json index 714760e6..89208317 100644 --- a/src/main/resources/data/naturesaura/recipes/generator_limit_remover.json +++ b/src/main/resources/data/naturesaura/recipe/generator_limit_remover.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "naturesaura:generator_limit_remover" + "id": "naturesaura:generator_limit_remover" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/gold_brick.json b/src/main/resources/data/naturesaura/recipe/gold_brick.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/gold_brick.json rename to src/main/resources/data/naturesaura/recipe/gold_brick.json index b0399c58..c36f9139 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_brick.json +++ b/src/main/resources/data/naturesaura/recipe/gold_brick.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "naturesaura:gold_brick" + "id": "naturesaura:gold_brick" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/gold_fiber.json b/src/main/resources/data/naturesaura/recipe/gold_fiber.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/gold_fiber.json rename to src/main/resources/data/naturesaura/recipe/gold_fiber.json index 71498463..a4d56f86 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_fiber.json +++ b/src/main/resources/data/naturesaura/recipe/gold_fiber.json @@ -17,7 +17,7 @@ } }, "result": { - "item": "naturesaura:gold_fiber", + "id": "naturesaura:gold_fiber", "count": 4 } } diff --git a/src/main/resources/data/naturesaura/recipes/gold_nether_brick.json b/src/main/resources/data/naturesaura/recipe/gold_nether_brick.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/gold_nether_brick.json rename to src/main/resources/data/naturesaura/recipe/gold_nether_brick.json index 8ebcef60..2337bc5c 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_nether_brick.json +++ b/src/main/resources/data/naturesaura/recipe/gold_nether_brick.json @@ -9,6 +9,6 @@ } ], "result": { - "item": "naturesaura:gold_nether_brick" + "id": "naturesaura:gold_nether_brick" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/gold_powder.json b/src/main/resources/data/naturesaura/recipe/gold_powder.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/gold_powder.json rename to src/main/resources/data/naturesaura/recipe/gold_powder.json index 82217dd5..ec6f402e 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_powder.json +++ b/src/main/resources/data/naturesaura/recipe/gold_powder.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:gold_powder", + "id": "naturesaura:gold_powder", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/grated_chute.json b/src/main/resources/data/naturesaura/recipe/grated_chute.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/grated_chute.json rename to src/main/resources/data/naturesaura/recipe/grated_chute.json index 04c26aa7..ea303387 100644 --- a/src/main/resources/data/naturesaura/recipes/grated_chute.json +++ b/src/main/resources/data/naturesaura/recipe/grated_chute.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:grated_chute" + "id": "naturesaura:grated_chute" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/hopper_upgrade.json b/src/main/resources/data/naturesaura/recipe/hopper_upgrade.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/hopper_upgrade.json rename to src/main/resources/data/naturesaura/recipe/hopper_upgrade.json index 0421d5cf..28d430ab 100644 --- a/src/main/resources/data/naturesaura/recipes/hopper_upgrade.json +++ b/src/main/resources/data/naturesaura/recipe/hopper_upgrade.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:hopper_upgrade" + "id": "naturesaura:hopper_upgrade" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_axe.json b/src/main/resources/data/naturesaura/recipe/infused_axe.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/infused_axe.json rename to src/main/resources/data/naturesaura/recipe/infused_axe.json index 878a83ec..333900a4 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_axe.json +++ b/src/main/resources/data/naturesaura/recipe/infused_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_axe" + "id": "naturesaura:infused_iron_axe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_brick.json b/src/main/resources/data/naturesaura/recipe/infused_brick.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/infused_brick.json rename to src/main/resources/data/naturesaura/recipe/infused_brick.json index f84a6fe6..7fa6a65a 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_brick.json +++ b/src/main/resources/data/naturesaura/recipe/infused_brick.json @@ -10,7 +10,7 @@ } }, "result": { - "item": "naturesaura:infused_brick", + "id": "naturesaura:infused_brick", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_brick_slab.json b/src/main/resources/data/naturesaura/recipe/infused_brick_slab.json similarity index 80% rename from src/main/resources/data/naturesaura/recipes/infused_brick_slab.json rename to src/main/resources/data/naturesaura/recipe/infused_brick_slab.json index 7ba4415b..2b520042 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_brick_slab.json +++ b/src/main/resources/data/naturesaura/recipe/infused_brick_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:infused_brick_slab", + "id": "naturesaura:infused_brick_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json b/src/main/resources/data/naturesaura/recipe/infused_brick_stairs.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json rename to src/main/resources/data/naturesaura/recipe/infused_brick_stairs.json index 8c0f5ff0..15bb6553 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json +++ b/src/main/resources/data/naturesaura/recipe/infused_brick_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "naturesaura:infused_brick_stairs", + "id": "naturesaura:infused_brick_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_chest.json b/src/main/resources/data/naturesaura/recipe/infused_chest.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/infused_chest.json rename to src/main/resources/data/naturesaura/recipe/infused_chest.json index e520ca4f..2999801e 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_chest.json +++ b/src/main/resources/data/naturesaura/recipe/infused_chest.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_chest" + "id": "naturesaura:infused_iron_chest" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_helmet.json b/src/main/resources/data/naturesaura/recipe/infused_helmet.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/infused_helmet.json rename to src/main/resources/data/naturesaura/recipe/infused_helmet.json index 5b2d6125..14bf7b36 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_helmet.json +++ b/src/main/resources/data/naturesaura/recipe/infused_helmet.json @@ -13,6 +13,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_helmet" + "id": "naturesaura:infused_iron_helmet" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_hoe.json b/src/main/resources/data/naturesaura/recipe/infused_hoe.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/infused_hoe.json rename to src/main/resources/data/naturesaura/recipe/infused_hoe.json index f5fa0773..9e947c4a 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_hoe.json +++ b/src/main/resources/data/naturesaura/recipe/infused_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_hoe" + "id": "naturesaura:infused_iron_hoe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_iron.json b/src/main/resources/data/naturesaura/recipe/infused_iron.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/infused_iron.json rename to src/main/resources/data/naturesaura/recipe/infused_iron.json index 58fab6bf..6af2ff30 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_iron.json +++ b/src/main/resources/data/naturesaura/recipe/infused_iron.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:infused_iron", + "id": "naturesaura:infused_iron", "count": 9 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_iron_block.json b/src/main/resources/data/naturesaura/recipe/infused_iron_block.json similarity index 81% rename from src/main/resources/data/naturesaura/recipes/infused_iron_block.json rename to src/main/resources/data/naturesaura/recipe/infused_iron_block.json index 37523b33..9fffa602 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_iron_block.json +++ b/src/main/resources/data/naturesaura/recipe/infused_iron_block.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_block" + "id": "naturesaura:infused_iron_block" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_pants.json b/src/main/resources/data/naturesaura/recipe/infused_pants.json similarity index 81% rename from src/main/resources/data/naturesaura/recipes/infused_pants.json rename to src/main/resources/data/naturesaura/recipe/infused_pants.json index c13c5485..7ee0f794 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_pants.json +++ b/src/main/resources/data/naturesaura/recipe/infused_pants.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_pants" + "id": "naturesaura:infused_iron_pants" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_pickaxe.json b/src/main/resources/data/naturesaura/recipe/infused_pickaxe.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/infused_pickaxe.json rename to src/main/resources/data/naturesaura/recipe/infused_pickaxe.json index 8f3daed1..20c7e3e4 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_pickaxe.json +++ b/src/main/resources/data/naturesaura/recipe/infused_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_pickaxe" + "id": "naturesaura:infused_iron_pickaxe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_shoes.json b/src/main/resources/data/naturesaura/recipe/infused_shoes.json similarity index 80% rename from src/main/resources/data/naturesaura/recipes/infused_shoes.json rename to src/main/resources/data/naturesaura/recipe/infused_shoes.json index 8b1480b4..cb9846aa 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_shoes.json +++ b/src/main/resources/data/naturesaura/recipe/infused_shoes.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_shoes" + "id": "naturesaura:infused_iron_shoes" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_shovel.json b/src/main/resources/data/naturesaura/recipe/infused_shovel.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/infused_shovel.json rename to src/main/resources/data/naturesaura/recipe/infused_shovel.json index af8c042b..30637051 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_shovel.json +++ b/src/main/resources/data/naturesaura/recipe/infused_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_shovel" + "id": "naturesaura:infused_iron_shovel" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_slab.json b/src/main/resources/data/naturesaura/recipe/infused_slab.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/infused_slab.json rename to src/main/resources/data/naturesaura/recipe/infused_slab.json index 6c413822..9cad2f2e 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_slab.json +++ b/src/main/resources/data/naturesaura/recipe/infused_slab.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:infused_slab", + "id": "naturesaura:infused_slab", "count": 6 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_stairs.json b/src/main/resources/data/naturesaura/recipe/infused_stairs.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/infused_stairs.json rename to src/main/resources/data/naturesaura/recipe/infused_stairs.json index 4382a1d3..b8a92297 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_stairs.json +++ b/src/main/resources/data/naturesaura/recipe/infused_stairs.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "naturesaura:infused_stairs", + "id": "naturesaura:infused_stairs", "count": 4 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/infused_sword.json b/src/main/resources/data/naturesaura/recipe/infused_sword.json similarity index 85% rename from src/main/resources/data/naturesaura/recipes/infused_sword.json rename to src/main/resources/data/naturesaura/recipe/infused_sword.json index 1c893f0a..6522e3ad 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_sword.json +++ b/src/main/resources/data/naturesaura/recipe/infused_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:infused_iron_sword" + "id": "naturesaura:infused_iron_sword" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/item_distributor.json b/src/main/resources/data/naturesaura/recipe/item_distributor.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/item_distributor.json rename to src/main/resources/data/naturesaura/recipe/item_distributor.json index 29e715df..e1869b2a 100644 --- a/src/main/resources/data/naturesaura/recipes/item_distributor.json +++ b/src/main/resources/data/naturesaura/recipe/item_distributor.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:item_distributor" + "id": "naturesaura:item_distributor" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/light_staff.json b/src/main/resources/data/naturesaura/recipe/light_staff.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/light_staff.json rename to src/main/resources/data/naturesaura/recipe/light_staff.json index 9f05b490..6fd8928a 100644 --- a/src/main/resources/data/naturesaura/recipes/light_staff.json +++ b/src/main/resources/data/naturesaura/recipe/light_staff.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:light_staff" + "id": "naturesaura:light_staff" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/loot_finder.json b/src/main/resources/data/naturesaura/recipe/loot_finder.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/loot_finder.json rename to src/main/resources/data/naturesaura/recipe/loot_finder.json index eb09cb1f..a4a44d62 100644 --- a/src/main/resources/data/naturesaura/recipes/loot_finder.json +++ b/src/main/resources/data/naturesaura/recipe/loot_finder.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:loot_finder" + "id": "naturesaura:loot_finder" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/lower_limiter.json b/src/main/resources/data/naturesaura/recipe/lower_limiter.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/lower_limiter.json rename to src/main/resources/data/naturesaura/recipe/lower_limiter.json index 0e65859e..fced0b34 100644 --- a/src/main/resources/data/naturesaura/recipes/lower_limiter.json +++ b/src/main/resources/data/naturesaura/recipe/lower_limiter.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "naturesaura:lower_limiter" + "id": "naturesaura:lower_limiter" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/moss_generator.json b/src/main/resources/data/naturesaura/recipe/moss_generator.json similarity index 88% rename from src/main/resources/data/naturesaura/recipes/moss_generator.json rename to src/main/resources/data/naturesaura/recipe/moss_generator.json index e11b76e1..31d3d5f6 100644 --- a/src/main/resources/data/naturesaura/recipes/moss_generator.json +++ b/src/main/resources/data/naturesaura/recipe/moss_generator.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:moss_generator" + "id": "naturesaura:moss_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/mover_cart.json b/src/main/resources/data/naturesaura/recipe/mover_cart.json similarity index 64% rename from src/main/resources/data/naturesaura/recipes/mover_cart.json rename to src/main/resources/data/naturesaura/recipe/mover_cart.json index f34f8550..a92b7e86 100644 --- a/src/main/resources/data/naturesaura/recipes/mover_cart.json +++ b/src/main/resources/data/naturesaura/recipe/mover_cart.json @@ -7,11 +7,13 @@ ], "key": { "B": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" }, "I": { "item": "naturesaura:infused_iron" @@ -30,6 +32,6 @@ } }, "result": { - "item": "naturesaura:mover_cart" + "id": "naturesaura:mover_cart" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/netherite_finder.json b/src/main/resources/data/naturesaura/recipe/netherite_finder.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/netherite_finder.json rename to src/main/resources/data/naturesaura/recipe/netherite_finder.json index b544297a..32e5a271 100644 --- a/src/main/resources/data/naturesaura/recipes/netherite_finder.json +++ b/src/main/resources/data/naturesaura/recipe/netherite_finder.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:netherite_finder" + "id": "naturesaura:netherite_finder" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/oak_generator.json b/src/main/resources/data/naturesaura/recipe/oak_generator.json similarity index 63% rename from src/main/resources/data/naturesaura/recipes/oak_generator.json rename to src/main/resources/data/naturesaura/recipe/oak_generator.json index 7a3879f2..56f27ac7 100644 --- a/src/main/resources/data/naturesaura/recipes/oak_generator.json +++ b/src/main/resources/data/naturesaura/recipe/oak_generator.json @@ -13,11 +13,13 @@ "tag": "minecraft:saplings" }, "B": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:overworld" + } + }, + "items": "naturesaura:aura_bottle" }, "M": { "item": "minecraft:bone_meal" @@ -30,6 +32,6 @@ } }, "result": { - "item": "naturesaura:oak_generator" + "id": "naturesaura:oak_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/clock_hand.json b/src/main/resources/data/naturesaura/recipe/offering/clock_hand.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/offering/clock_hand.json rename to src/main/resources/data/naturesaura/recipe/offering/clock_hand.json index 4decce5a..b1c02e80 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/clock_hand.json +++ b/src/main/resources/data/naturesaura/recipe/offering/clock_hand.json @@ -7,6 +7,6 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:clock_hand" + "id": "naturesaura:clock_hand" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/sky_ingot.json b/src/main/resources/data/naturesaura/recipe/offering/sky_ingot.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/offering/sky_ingot.json rename to src/main/resources/data/naturesaura/recipe/offering/sky_ingot.json index b780f4cd..077afbe5 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/sky_ingot.json +++ b/src/main/resources/data/naturesaura/recipe/offering/sky_ingot.json @@ -7,6 +7,6 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:sky_ingot" + "id": "naturesaura:sky_ingot" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/sky_ingot_from_gold.json b/src/main/resources/data/naturesaura/recipe/offering/sky_ingot_from_gold.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/offering/sky_ingot_from_gold.json rename to src/main/resources/data/naturesaura/recipe/offering/sky_ingot_from_gold.json index e25abe76..86247160 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/sky_ingot_from_gold.json +++ b/src/main/resources/data/naturesaura/recipe/offering/sky_ingot_from_gold.json @@ -7,7 +7,7 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:sky_ingot", + "id": "naturesaura:sky_ingot", "count": 2 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/token_euphoria.json b/src/main/resources/data/naturesaura/recipe/offering/token_euphoria.json similarity index 80% rename from src/main/resources/data/naturesaura/recipes/offering/token_euphoria.json rename to src/main/resources/data/naturesaura/recipe/offering/token_euphoria.json index 49eb8def..15c9ff66 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/token_euphoria.json +++ b/src/main/resources/data/naturesaura/recipe/offering/token_euphoria.json @@ -7,6 +7,6 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:token_euphoria" + "id": "naturesaura:token_euphoria" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/token_grief.json b/src/main/resources/data/naturesaura/recipe/offering/token_grief.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/offering/token_grief.json rename to src/main/resources/data/naturesaura/recipe/offering/token_grief.json index 2590adae..a86cc53a 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/token_grief.json +++ b/src/main/resources/data/naturesaura/recipe/offering/token_grief.json @@ -7,6 +7,6 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:token_grief" + "id": "naturesaura:token_grief" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/token_rage.json b/src/main/resources/data/naturesaura/recipe/offering/token_rage.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/offering/token_rage.json rename to src/main/resources/data/naturesaura/recipe/offering/token_rage.json index 99bfca21..0890f511 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/token_rage.json +++ b/src/main/resources/data/naturesaura/recipe/offering/token_rage.json @@ -7,6 +7,6 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:token_rage" + "id": "naturesaura:token_rage" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering/token_terror.json b/src/main/resources/data/naturesaura/recipe/offering/token_terror.json similarity index 81% rename from src/main/resources/data/naturesaura/recipes/offering/token_terror.json rename to src/main/resources/data/naturesaura/recipe/offering/token_terror.json index d325e7d2..2191f696 100644 --- a/src/main/resources/data/naturesaura/recipes/offering/token_terror.json +++ b/src/main/resources/data/naturesaura/recipe/offering/token_terror.json @@ -7,6 +7,6 @@ "item": "naturesaura:calling_spirit" }, "output": { - "item": "naturesaura:token_terror" + "id": "naturesaura:token_terror" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/offering_table.json b/src/main/resources/data/naturesaura/recipe/offering_table.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/offering_table.json rename to src/main/resources/data/naturesaura/recipe/offering_table.json index 33475073..4b1809a0 100644 --- a/src/main/resources/data/naturesaura/recipes/offering_table.json +++ b/src/main/resources/data/naturesaura/recipe/offering_table.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:offering_table" + "id": "naturesaura:offering_table" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/outpost_finder.json b/src/main/resources/data/naturesaura/recipe/outpost_finder.json similarity index 51% rename from src/main/resources/data/naturesaura/recipes/outpost_finder.json rename to src/main/resources/data/naturesaura/recipe/outpost_finder.json index 7641430d..0ff2fa58 100644 --- a/src/main/resources/data/naturesaura/recipes/outpost_finder.json +++ b/src/main/resources/data/naturesaura/recipe/outpost_finder.json @@ -13,14 +13,16 @@ "item": "minecraft:tripwire_hook" }, "B": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:overworld" + } + }, + "items": "naturesaura:aura_bottle" } }, "result": { - "item": "naturesaura:outpost_finder" + "id": "naturesaura:outpost_finder" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/pet_reviver.json b/src/main/resources/data/naturesaura/recipe/pet_reviver.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/pet_reviver.json rename to src/main/resources/data/naturesaura/recipe/pet_reviver.json index 6d58fd22..d5c52aea 100644 --- a/src/main/resources/data/naturesaura/recipes/pet_reviver.json +++ b/src/main/resources/data/naturesaura/recipe/pet_reviver.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:pet_reviver" + "id": "naturesaura:pet_reviver" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/pickup_stopper.json b/src/main/resources/data/naturesaura/recipe/pickup_stopper.json similarity index 88% rename from src/main/resources/data/naturesaura/recipes/pickup_stopper.json rename to src/main/resources/data/naturesaura/recipe/pickup_stopper.json index 2deb8946..19efabcf 100644 --- a/src/main/resources/data/naturesaura/recipes/pickup_stopper.json +++ b/src/main/resources/data/naturesaura/recipe/pickup_stopper.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:pickup_stopper" + "id": "naturesaura:pickup_stopper" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/placer.json b/src/main/resources/data/naturesaura/recipe/placer.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/placer.json rename to src/main/resources/data/naturesaura/recipe/placer.json index 3a7554ca..6a3fb701 100644 --- a/src/main/resources/data/naturesaura/recipes/placer.json +++ b/src/main/resources/data/naturesaura/recipe/placer.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:placer" + "id": "naturesaura:placer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/potion_generator.json b/src/main/resources/data/naturesaura/recipe/potion_generator.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/potion_generator.json rename to src/main/resources/data/naturesaura/recipe/potion_generator.json index d998c57b..3721ba60 100644 --- a/src/main/resources/data/naturesaura/recipes/potion_generator.json +++ b/src/main/resources/data/naturesaura/recipe/potion_generator.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:potion_generator" + "id": "naturesaura:potion_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/powder_placer.json b/src/main/resources/data/naturesaura/recipe/powder_placer.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/powder_placer.json rename to src/main/resources/data/naturesaura/recipe/powder_placer.json index c1e016d1..98e6bc51 100644 --- a/src/main/resources/data/naturesaura/recipes/powder_placer.json +++ b/src/main/resources/data/naturesaura/recipe/powder_placer.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:powder_placer" + "id": "naturesaura:powder_placer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/projectile_generator.json b/src/main/resources/data/naturesaura/recipe/projectile_generator.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/projectile_generator.json rename to src/main/resources/data/naturesaura/recipe/projectile_generator.json index 6a4c15cd..aec24ce2 100644 --- a/src/main/resources/data/naturesaura/recipes/projectile_generator.json +++ b/src/main/resources/data/naturesaura/recipe/projectile_generator.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "naturesaura:projectile_generator" + "id": "naturesaura:projectile_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/range_visualizer.json b/src/main/resources/data/naturesaura/recipe/range_visualizer.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/range_visualizer.json rename to src/main/resources/data/naturesaura/recipe/range_visualizer.json index 33433b52..a2d14035 100644 --- a/src/main/resources/data/naturesaura/recipes/range_visualizer.json +++ b/src/main/resources/data/naturesaura/recipe/range_visualizer.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:range_visualizer" + "id": "naturesaura:range_visualizer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/rf_converter.json b/src/main/resources/data/naturesaura/recipe/rf_converter.json similarity index 93% rename from src/main/resources/data/naturesaura/recipes/rf_converter.json rename to src/main/resources/data/naturesaura/recipe/rf_converter.json index 01c245e1..af226bc6 100644 --- a/src/main/resources/data/naturesaura/recipes/rf_converter.json +++ b/src/main/resources/data/naturesaura/recipe/rf_converter.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "naturesaura:rf_converter" + "id": "naturesaura:rf_converter" }, "conditions": [ { @@ -31,4 +31,4 @@ "config": "rfConverter" } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/shockwave_creator.json b/src/main/resources/data/naturesaura/recipe/shockwave_creator.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/shockwave_creator.json rename to src/main/resources/data/naturesaura/recipe/shockwave_creator.json index 4a1f012d..4533ff94 100644 --- a/src/main/resources/data/naturesaura/recipes/shockwave_creator.json +++ b/src/main/resources/data/naturesaura/recipe/shockwave_creator.json @@ -23,6 +23,6 @@ } }, "result": { - "item": "naturesaura:shockwave_creator" + "id": "naturesaura:shockwave_creator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_axe.json b/src/main/resources/data/naturesaura/recipe/sky_axe.json similarity index 88% rename from src/main/resources/data/naturesaura/recipes/sky_axe.json rename to src/main/resources/data/naturesaura/recipe/sky_axe.json index 19485208..329e7cc8 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_axe.json +++ b/src/main/resources/data/naturesaura/recipe/sky_axe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:sky_axe" + "id": "naturesaura:sky_axe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_chest.json b/src/main/resources/data/naturesaura/recipe/sky_chest.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/sky_chest.json rename to src/main/resources/data/naturesaura/recipe/sky_chest.json index cd74e1ca..79e16a38 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_chest.json +++ b/src/main/resources/data/naturesaura/recipe/sky_chest.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:sky_chest" + "id": "naturesaura:sky_chest" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_helmet.json b/src/main/resources/data/naturesaura/recipe/sky_helmet.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/sky_helmet.json rename to src/main/resources/data/naturesaura/recipe/sky_helmet.json index 94acb4fe..25b77408 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_helmet.json +++ b/src/main/resources/data/naturesaura/recipe/sky_helmet.json @@ -13,6 +13,6 @@ } }, "result": { - "item": "naturesaura:sky_helmet" + "id": "naturesaura:sky_helmet" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_hoe.json b/src/main/resources/data/naturesaura/recipe/sky_hoe.json similarity index 88% rename from src/main/resources/data/naturesaura/recipes/sky_hoe.json rename to src/main/resources/data/naturesaura/recipe/sky_hoe.json index 433c157b..abeee2a1 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_hoe.json +++ b/src/main/resources/data/naturesaura/recipe/sky_hoe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:sky_hoe" + "id": "naturesaura:sky_hoe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_ingot.json b/src/main/resources/data/naturesaura/recipe/sky_ingot.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/sky_ingot.json rename to src/main/resources/data/naturesaura/recipe/sky_ingot.json index c9aa5eba..d882076f 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_ingot.json +++ b/src/main/resources/data/naturesaura/recipe/sky_ingot.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:sky_ingot", + "id": "naturesaura:sky_ingot", "count": 9 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_ingot_block.json b/src/main/resources/data/naturesaura/recipe/sky_ingot_block.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/sky_ingot_block.json rename to src/main/resources/data/naturesaura/recipe/sky_ingot_block.json index f9bc4312..512e17a8 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_ingot_block.json +++ b/src/main/resources/data/naturesaura/recipe/sky_ingot_block.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:sky_ingot_block" + "id": "naturesaura:sky_ingot_block" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_pants.json b/src/main/resources/data/naturesaura/recipe/sky_pants.json similarity index 84% rename from src/main/resources/data/naturesaura/recipes/sky_pants.json rename to src/main/resources/data/naturesaura/recipe/sky_pants.json index 687bbec2..22d88651 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_pants.json +++ b/src/main/resources/data/naturesaura/recipe/sky_pants.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:sky_pants" + "id": "naturesaura:sky_pants" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_pickaxe.json b/src/main/resources/data/naturesaura/recipe/sky_pickaxe.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/sky_pickaxe.json rename to src/main/resources/data/naturesaura/recipe/sky_pickaxe.json index 3110ef52..11af2e1c 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_pickaxe.json +++ b/src/main/resources/data/naturesaura/recipe/sky_pickaxe.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:sky_pickaxe" + "id": "naturesaura:sky_pickaxe" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_shoes.json b/src/main/resources/data/naturesaura/recipe/sky_shoes.json similarity index 83% rename from src/main/resources/data/naturesaura/recipes/sky_shoes.json rename to src/main/resources/data/naturesaura/recipe/sky_shoes.json index d900f647..0f263718 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_shoes.json +++ b/src/main/resources/data/naturesaura/recipe/sky_shoes.json @@ -10,6 +10,6 @@ } }, "result": { - "item": "naturesaura:sky_shoes" + "id": "naturesaura:sky_shoes" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_shovel.json b/src/main/resources/data/naturesaura/recipe/sky_shovel.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/sky_shovel.json rename to src/main/resources/data/naturesaura/recipe/sky_shovel.json index 4fab1a81..150f4d68 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_shovel.json +++ b/src/main/resources/data/naturesaura/recipe/sky_shovel.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:sky_shovel" + "id": "naturesaura:sky_shovel" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/sky_sword.json b/src/main/resources/data/naturesaura/recipe/sky_sword.json similarity index 87% rename from src/main/resources/data/naturesaura/recipes/sky_sword.json rename to src/main/resources/data/naturesaura/recipe/sky_sword.json index ce21de0b..520cb058 100644 --- a/src/main/resources/data/naturesaura/recipes/sky_sword.json +++ b/src/main/resources/data/naturesaura/recipe/sky_sword.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "naturesaura:sky_sword" + "id": "naturesaura:sky_sword" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/slime_split_generator.json b/src/main/resources/data/naturesaura/recipe/slime_split_generator.json similarity index 60% rename from src/main/resources/data/naturesaura/recipes/slime_split_generator.json rename to src/main/resources/data/naturesaura/recipe/slime_split_generator.json index e1f25992..56d94fd6 100644 --- a/src/main/resources/data/naturesaura/recipes/slime_split_generator.json +++ b/src/main/resources/data/naturesaura/recipe/slime_split_generator.json @@ -16,17 +16,19 @@ "item": "naturesaura:token_sorrow" }, "N": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" }, "I": { "item": "naturesaura:tainted_gold" } }, "result": { - "item": "naturesaura:slime_split_generator" + "id": "naturesaura:slime_split_generator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/snow_creator.json b/src/main/resources/data/naturesaura/recipe/snow_creator.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/snow_creator.json rename to src/main/resources/data/naturesaura/recipe/snow_creator.json index 0062ae94..9df952b4 100644 --- a/src/main/resources/data/naturesaura/recipes/snow_creator.json +++ b/src/main/resources/data/naturesaura/recipe/snow_creator.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:snow_creator" + "id": "naturesaura:snow_creator" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/spawn_lamp.json b/src/main/resources/data/naturesaura/recipe/spawn_lamp.json similarity index 60% rename from src/main/resources/data/naturesaura/recipes/spawn_lamp.json rename to src/main/resources/data/naturesaura/recipe/spawn_lamp.json index 449d7fce..5979b0ca 100644 --- a/src/main/resources/data/naturesaura/recipes/spawn_lamp.json +++ b/src/main/resources/data/naturesaura/recipe/spawn_lamp.json @@ -19,14 +19,16 @@ "item": "minecraft:glowstone" }, "E": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:end" - } + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:end" + } + }, + "items": "naturesaura:aura_bottle" } }, "result": { - "item": "naturesaura:spawn_lamp" + "id": "naturesaura:spawn_lamp" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/spring.json b/src/main/resources/data/naturesaura/recipe/spring.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/spring.json rename to src/main/resources/data/naturesaura/recipe/spring.json index 0ab7a40b..ffafd774 100644 --- a/src/main/resources/data/naturesaura/recipes/spring.json +++ b/src/main/resources/data/naturesaura/recipe/spring.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "naturesaura:spring" + "id": "naturesaura:spring" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tainted_gold.json b/src/main/resources/data/naturesaura/recipe/tainted_gold.json similarity index 82% rename from src/main/resources/data/naturesaura/recipes/tainted_gold.json rename to src/main/resources/data/naturesaura/recipe/tainted_gold.json index 63b9808b..153c1758 100644 --- a/src/main/resources/data/naturesaura/recipes/tainted_gold.json +++ b/src/main/resources/data/naturesaura/recipe/tainted_gold.json @@ -9,7 +9,7 @@ } }, "result": { - "item": "naturesaura:tainted_gold", + "id": "naturesaura:tainted_gold", "count": 9 } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tainted_gold_block.json b/src/main/resources/data/naturesaura/recipe/tainted_gold_block.json similarity index 81% rename from src/main/resources/data/naturesaura/recipes/tainted_gold_block.json rename to src/main/resources/data/naturesaura/recipe/tainted_gold_block.json index 2c994c69..25c4af5a 100644 --- a/src/main/resources/data/naturesaura/recipes/tainted_gold_block.json +++ b/src/main/resources/data/naturesaura/recipe/tainted_gold_block.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "naturesaura:tainted_gold_block" + "id": "naturesaura:tainted_gold_block" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/time_changer.json b/src/main/resources/data/naturesaura/recipe/time_changer.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/time_changer.json rename to src/main/resources/data/naturesaura/recipe/time_changer.json index 42e26a03..ec0ed5b0 100644 --- a/src/main/resources/data/naturesaura/recipes/time_changer.json +++ b/src/main/resources/data/naturesaura/recipe/time_changer.json @@ -20,6 +20,6 @@ } }, "result": { - "item": "naturesaura:time_changer" + "id": "naturesaura:time_changer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/ancient_sapling.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/ancient_sapling.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/ancient_sapling.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/ancient_sapling.json index 675ccf0a..9238b259 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/ancient_sapling.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/ancient_sapling.json @@ -24,8 +24,8 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:ancient_sapling", + "id": "naturesaura:ancient_sapling", "count": 2 }, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/animal_powder.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/animal_powder.json similarity index 72% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/animal_powder.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/animal_powder.json index 77396629..6c516f97 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/animal_powder.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/animal_powder.json @@ -18,11 +18,13 @@ "item": "minecraft:jungle_sapling" }, "output": { - "nbt": { - "effect": "naturesaura:animal" + "components": { + "naturesaura:effect_powder_data": { + "effect": "naturesaura:animal" + } }, - "item": "naturesaura:effect_powder", + "id": "naturesaura:effect_powder", "count": 8 }, "time": 400 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/break_prevention.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/break_prevention.json similarity index 89% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/break_prevention.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/break_prevention.json index 2e0366de..a3369ad2 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/break_prevention.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/break_prevention.json @@ -18,7 +18,7 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:break_prevention" + "id": "naturesaura:break_prevention" }, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/cache_powder.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/cache_powder.json similarity index 71% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/cache_powder.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/cache_powder.json index 8a6ceb95..95fc6ff8 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/cache_powder.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/cache_powder.json @@ -18,11 +18,13 @@ "item": "minecraft:oak_sapling" }, "output": { - "nbt": { - "effect": "naturesaura:cache_recharge" + "components": { + "naturesaura:effect_powder_data": { + "effect": "naturesaura:cache_recharge" + } }, - "item": "naturesaura:effect_powder", + "id": "naturesaura:effect_powder", "count": 32 }, "time": 400 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/conversion_catalyst.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/conversion_catalyst.json similarity index 91% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/conversion_catalyst.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/conversion_catalyst.json index f7e421b8..50d702dc 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/conversion_catalyst.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/conversion_catalyst.json @@ -24,7 +24,7 @@ "item": "minecraft:jungle_sapling" }, "output": { - "item": "naturesaura:conversion_catalyst" + "id": "naturesaura:conversion_catalyst" }, "time": 600 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/crushing_catalyst.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/crushing_catalyst.json similarity index 90% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/crushing_catalyst.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/crushing_catalyst.json index 1c54911b..15431856 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/crushing_catalyst.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/crushing_catalyst.json @@ -21,7 +21,7 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:crushing_catalyst" + "id": "naturesaura:crushing_catalyst" }, "time": 600 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/eye.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/eye.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/eye.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/eye.json index 6f5e8c8f..189b4e79 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/eye.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/eye.json @@ -18,7 +18,7 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:eye" + "id": "naturesaura:eye" }, "time": 250 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/eye_improved.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/eye_improved.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/eye_improved.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/eye_improved.json index 958d1cfa..0cb31040 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/eye_improved.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/eye_improved.json @@ -24,7 +24,7 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:eye_improved" + "id": "naturesaura:eye_improved" }, "time": 500 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/furnace_heater.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/furnace_heater.json similarity index 93% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/furnace_heater.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/furnace_heater.json index 5786cbf7..bf27ac43 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/furnace_heater.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/furnace_heater.json @@ -30,7 +30,7 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:furnace_heater" + "id": "naturesaura:furnace_heater" }, "time": 600 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/nature_altar.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/nature_altar.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/nature_altar.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/nature_altar.json index d8a3a9bb..59b0f0ea 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/nature_altar.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/nature_altar.json @@ -24,7 +24,7 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:nature_altar" + "id": "naturesaura:nature_altar" }, "time": 500 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/nether_grass_powder.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/nether_grass_powder.json similarity index 64% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/nether_grass_powder.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/nether_grass_powder.json index 46151e88..e718cf67 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/nether_grass_powder.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/nether_grass_powder.json @@ -11,18 +11,20 @@ "item": "minecraft:netherrack" }, { - "item": "minecraft:grass" + "item": "minecraft:tall_grass" } ], "sapling": { "item": "minecraft:oak_sapling" }, "output": { - "nbt": { - "effect": "naturesaura:nether_grass" + "components": { + "naturesaura:effect_powder_data": { + "effect": "naturesaura:nether_grass" + } }, - "item": "naturesaura:effect_powder", + "id": "naturesaura:effect_powder", "count": 24 }, "time": 400 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/ore_spawn_powder.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/ore_spawn_powder.json similarity index 71% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/ore_spawn_powder.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/ore_spawn_powder.json index 1efabdf7..e0440b99 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/ore_spawn_powder.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/ore_spawn_powder.json @@ -18,11 +18,13 @@ "item": "minecraft:oak_sapling" }, "output": { - "nbt": { - "effect": "naturesaura:ore_spawn" + "components": { + "naturesaura:effect_powder_data": { + "effect": "naturesaura:ore_spawn" + } }, - "item": "naturesaura:effect_powder", + "id": "naturesaura:effect_powder", "count": 4 }, "time": 400 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/plant_powder.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/plant_powder.json similarity index 71% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/plant_powder.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/plant_powder.json index b1571caf..32b2f59b 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/plant_powder.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/plant_powder.json @@ -18,11 +18,13 @@ "item": "minecraft:oak_sapling" }, "output": { - "nbt": { - "effect": "naturesaura:plant_boost" + "components": { + "naturesaura:effect_powder_data": { + "effect": "naturesaura:plant_boost" + } }, - "item": "naturesaura:effect_powder", + "id": "naturesaura:effect_powder", "count": 24 }, "time": 400 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_anger.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_anger.json similarity index 64% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/token_anger.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/token_anger.json index 2c1d99a0..7ef64661 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_anger.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_anger.json @@ -2,10 +2,13 @@ "type": "naturesaura:tree_ritual", "ingredients": [ { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "count": 1, - "nbt": "{stored_type:\"naturesaura:nether\"}" + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" }, { "item": "naturesaura:gold_leaf" @@ -27,8 +30,8 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:token_anger", + "id": "naturesaura:token_anger", "count": 2 }, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_fear.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_fear.json similarity index 63% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/token_fear.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/token_fear.json index 7f74e977..0dc49c99 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_fear.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_fear.json @@ -2,10 +2,13 @@ "type": "naturesaura:tree_ritual", "ingredients": [ { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "count": 1, - "nbt": "{stored_type:\"naturesaura:nether\"}" + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:nether" + } + }, + "items": "naturesaura:aura_bottle" }, { "item": "naturesaura:gold_leaf" @@ -27,8 +30,8 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:token_fear", + "id": "naturesaura:token_fear", "count": 2 }, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_joy.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_joy.json similarity index 63% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/token_joy.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/token_joy.json index b961bca7..bb902d9e 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_joy.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_joy.json @@ -2,10 +2,13 @@ "type": "naturesaura:tree_ritual", "ingredients": [ { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "count": 1, - "nbt": "{stored_type:\"naturesaura:overworld\"}" + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:overworld" + } + }, + "items": "naturesaura:aura_bottle" }, { "item": "naturesaura:gold_leaf" @@ -27,8 +30,8 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:token_joy", + "id": "naturesaura:token_joy", "count": 2 }, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_sorrow.json b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_sorrow.json similarity index 71% rename from src/main/resources/data/naturesaura/recipes/tree_ritual/token_sorrow.json rename to src/main/resources/data/naturesaura/recipe/tree_ritual/token_sorrow.json index 85f9f7d3..9659d6b4 100644 --- a/src/main/resources/data/naturesaura/recipes/tree_ritual/token_sorrow.json +++ b/src/main/resources/data/naturesaura/recipe/tree_ritual/token_sorrow.json @@ -2,10 +2,13 @@ "type": "naturesaura:tree_ritual", "ingredients": [ { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "count": 1, - "nbt": "{stored_type:\"naturesaura:overworld\"}" + "type": "neoforge:components", + "components": { + "naturesaura:aura_bottle_data": { + "aura_type": "naturesaura:overworld" + } + }, + "items": "naturesaura:aura_bottle" }, { "item": "naturesaura:gold_leaf" @@ -38,8 +41,8 @@ "item": "minecraft:oak_sapling" }, "output": { - "item": "naturesaura:token_sorrow", + "id": "naturesaura:token_sorrow", "count": 2 }, "time": 200 -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/weather_changer.json b/src/main/resources/data/naturesaura/recipe/weather_changer.json similarity index 92% rename from src/main/resources/data/naturesaura/recipes/weather_changer.json rename to src/main/resources/data/naturesaura/recipe/weather_changer.json index 861ebaa6..df1c75ac 100644 --- a/src/main/resources/data/naturesaura/recipes/weather_changer.json +++ b/src/main/resources/data/naturesaura/recipe/weather_changer.json @@ -26,6 +26,6 @@ } }, "result": { - "item": "naturesaura:weather_changer" + "id": "naturesaura:weather_changer" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/wood_stand.json b/src/main/resources/data/naturesaura/recipe/wood_stand.json similarity index 86% rename from src/main/resources/data/naturesaura/recipes/wood_stand.json rename to src/main/resources/data/naturesaura/recipe/wood_stand.json index a3debbb2..e04a5463 100644 --- a/src/main/resources/data/naturesaura/recipes/wood_stand.json +++ b/src/main/resources/data/naturesaura/recipe/wood_stand.json @@ -13,6 +13,6 @@ } }, "result": { - "item": "naturesaura:wood_stand" + "id": "naturesaura:wood_stand" } -} \ No newline at end of file +} diff --git a/src/main/resources/data/naturesaura/recipes/altar/breath.json b/src/main/resources/data/naturesaura/recipes/altar/breath.json deleted file mode 100644 index a6e09035..00000000 --- a/src/main/resources/data/naturesaura/recipes/altar/breath.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "naturesaura:altar", - "input": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "count": 1, - "nbt": "{stored_type:\"naturesaura:end\"}" - }, - "output": { - "item": "minecraft:dragon_breath" - }, - "catalyst": { - "item": "naturesaura:conversion_catalyst" - }, - "aura": 20000, - "time": 80 -} \ No newline at end of file diff --git a/src/main/resources/data/naturesaura/recipes/calling_spirit.json b/src/main/resources/data/naturesaura/recipes/calling_spirit.json deleted file mode 100644 index 8e28fe25..00000000 --- a/src/main/resources/data/naturesaura/recipes/calling_spirit.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " O ", - "GDH", - " N " - ], - "key": { - "G": { - "item": "naturesaura:infused_iron" - }, - "H": { - "item": "naturesaura:tainted_gold" - }, - "O": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:overworld" - } - }, - "N": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } - }, - "D": { - "item": "minecraft:diamond" - } - }, - "result": { - "item": "naturesaura:calling_spirit", - "count": 3 - } -} \ No newline at end of file diff --git a/src/main/resources/data/naturesaura/recipes/crimson_meal.json b/src/main/resources/data/naturesaura/recipes/crimson_meal.json deleted file mode 100644 index 8a5510eb..00000000 --- a/src/main/resources/data/naturesaura/recipes/crimson_meal.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "OOO", - "OEO", - "OOO" - ], - "key": { - "E": { - "type": "forge:nbt", - "item": "naturesaura:aura_bottle", - "nbt": { - "stored_type": "naturesaura:nether" - } - }, - "O": { - "item": "minecraft:bone_meal" - } - }, - "result": { - "item": "naturesaura:crimson_meal", - "count": 8 - } -} \ No newline at end of file