From 9635ccab5ac1a217b73122c206ba0cc17d25cbc8 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 1 Aug 2022 16:14:37 +0200 Subject: [PATCH] updated to new forge version Also closes #262 --- build.gradle | 14 +- .../naturesaura/blockstates/ancient_bark.json | 26 +- .../blockstates/ancient_leaves.json | 8 +- .../naturesaura/blockstates/ancient_log.json | 26 +- .../blockstates/ancient_planks.json | 8 +- .../blockstates/ancient_sapling.json | 8 +- .../naturesaura/blockstates/ancient_slab.json | 20 +- .../blockstates/ancient_stairs.json | 412 +++++++++--------- .../blockstates/animal_container.json | 8 +- .../blockstates/animal_generator.json | 8 +- .../blockstates/animal_spawner.json | 8 +- .../naturesaura/blockstates/aura_bloom.json | 8 +- .../naturesaura/blockstates/aura_cactus.json | 8 +- .../blockstates/aura_detector.json | 8 +- .../blockstates/aura_mushroom.json | 8 +- .../naturesaura/blockstates/aura_timer.json | 8 +- .../naturesaura/blockstates/auto_crafter.json | 32 +- .../blockstates/blast_furnace_booster.json | 62 +-- .../blockstates/chorus_generator.json | 8 +- .../naturesaura/blockstates/chunk_loader.json | 8 +- .../blockstates/crimson_aura_mushroom.json | 8 +- .../blockstates/decayed_leaves.json | 8 +- .../naturesaura/blockstates/end_flower.json | 8 +- .../naturesaura/blockstates/ender_crate.json | 8 +- .../blockstates/field_creator.json | 8 +- .../blockstates/firework_generator.json | 8 +- .../blockstates/flower_generator.json | 8 +- .../blockstates/furnace_heater.json | 106 ++--- .../blockstates/generator_limit_remover.json | 8 +- .../naturesaura/blockstates/gold_brick.json | 8 +- .../blockstates/gold_nether_brick.json | 8 +- .../blockstates/golden_leaves.json | 8 +- .../blockstates/hopper_upgrade.json | 8 +- .../blockstates/infused_brick.json | 8 +- .../blockstates/infused_brick_slab.json | 20 +- .../blockstates/infused_brick_stairs.json | 412 +++++++++--------- .../blockstates/infused_iron_block.json | 8 +- .../naturesaura/blockstates/infused_slab.json | 20 +- .../blockstates/infused_stairs.json | 412 +++++++++--------- .../blockstates/infused_stone.json | 8 +- .../blockstates/item_distributor.json | 8 +- .../assets/naturesaura/blockstates/light.json | 8 +- .../blockstates/moss_generator.json | 8 +- .../naturesaura/blockstates/nether_grass.json | 8 +- .../blockstates/nether_wart_mushroom.json | 8 +- .../blockstates/oak_generator.json | 8 +- .../blockstates/offering_table.json | 8 +- .../blockstates/pickup_stopper.json | 8 +- .../naturesaura/blockstates/placer.json | 8 +- .../blockstates/potion_generator.json | 8 +- .../blockstates/potted_aura_bloom.json | 8 +- .../blockstates/potted_aura_cactus.json | 8 +- .../blockstates/potted_aura_mushroom.json | 8 +- .../potted_crimson_aura_mushroom.json | 8 +- .../potted_warped_aura_mushroom.json | 8 +- .../blockstates/powder_placer.json | 8 +- .../blockstates/projectile_generator.json | 8 +- .../naturesaura/blockstates/rf_converter.json | 8 +- .../blockstates/slime_split_generator.json | 8 +- .../naturesaura/blockstates/snow_creator.json | 8 +- .../naturesaura/blockstates/spawn_lamp.json | 8 +- .../naturesaura/blockstates/spring.json | 8 +- .../blockstates/tainted_gold_block.json | 8 +- .../naturesaura/blockstates/time_changer.json | 8 +- .../blockstates/warped_aura_mushroom.json | 8 +- .../blockstates/weather_changer.json | 8 +- .../naturesaura/blockstates/wood_stand.json | 8 +- .../models/block/ancient_bark.json | 10 +- .../models/block/ancient_bark_horizontal.json | 10 +- .../naturesaura/models/block/ancient_log.json | 10 +- .../models/block/ancient_log_horizontal.json | 10 +- .../models/block/ancient_planks.json | 8 +- .../models/block/ancient_sapling.json | 9 +- .../models/block/ancient_slab.json | 12 +- .../models/block/ancient_slab_double.json | 8 +- .../models/block/ancient_slab_top.json | 12 +- .../models/block/ancient_stairs.json | 12 +- .../models/block/ancient_stairs_inner.json | 12 +- .../models/block/ancient_stairs_outer.json | 12 +- .../models/block/animal_generator.json | 12 +- .../models/block/animal_spawner.json | 8 +- .../naturesaura/models/block/aura_bloom.json | 9 +- .../naturesaura/models/block/aura_cactus.json | 9 +- .../models/block/aura_detector.json | 8 +- .../models/block/aura_mushroom.json | 9 +- .../models/block/auto_crafter.json | 12 +- .../models/block/chorus_generator.json | 12 +- .../models/block/conversion_catalyst.json | 8 +- .../block/conversion_catalyst_nether.json | 8 +- .../models/block/crimson_aura_mushroom.json | 9 +- .../models/block/crushing_catalyst.json | 8 +- .../block/crushing_catalyst_nether.json | 8 +- .../naturesaura/models/block/end_flower.json | 9 +- .../naturesaura/models/block/ender_crate.json | 12 +- .../models/block/firework_generator.json | 12 +- .../models/block/flower_generator.json | 12 +- .../models/block/generator_limit_remover.json | 12 +- .../naturesaura/models/block/gold_brick.json | 8 +- .../models/block/gold_nether_brick.json | 8 +- .../models/block/hopper_upgrade.json | 8 +- .../models/block/infused_brick.json | 8 +- .../models/block/infused_brick_slab.json | 12 +- .../block/infused_brick_slab_double.json | 8 +- .../models/block/infused_brick_slab_top.json | 12 +- .../models/block/infused_brick_stairs.json | 12 +- .../block/infused_brick_stairs_inner.json | 12 +- .../block/infused_brick_stairs_outer.json | 12 +- .../models/block/infused_iron_block.json | 8 +- .../models/block/infused_slab.json | 12 +- .../models/block/infused_slab_double.json | 8 +- .../models/block/infused_slab_top.json | 12 +- .../models/block/infused_stairs.json | 12 +- .../models/block/infused_stairs_inner.json | 12 +- .../models/block/infused_stairs_outer.json | 12 +- .../models/block/infused_stone.json | 8 +- .../models/block/item_distributor.json | 12 +- .../naturesaura/models/block/light.json | 9 +- .../models/block/moss_generator.json | 8 +- .../models/block/nether_grass.json | 12 +- .../models/block/nether_wart_mushroom.json | 8 +- .../models/block/oak_generator.json | 12 +- .../models/block/pickup_stopper.json | 12 +- .../naturesaura/models/block/placer.json | 12 +- .../models/block/potion_generator.json | 12 +- .../models/block/potted_aura_bloom.json | 9 +- .../models/block/potted_aura_cactus.json | 9 +- .../models/block/potted_aura_mushroom.json | 9 +- .../block/potted_crimson_aura_mushroom.json | 9 +- .../block/potted_warped_aura_mushroom.json | 9 +- .../models/block/projectile_generator.json | 12 +- .../models/block/rf_converter.json | 8 +- .../models/block/slime_split_generator.json | 12 +- .../models/block/snow_creator.json | 12 +- .../models/block/tainted_gold_block.json | 8 +- .../models/block/time_changer.json | 12 +- .../models/block/warped_aura_mushroom.json | 9 +- .../models/block/weather_changer.json | 12 +- .../naturesaura/models/item/ancient_bark.json | 2 +- .../models/item/ancient_leaves.json | 2 +- .../naturesaura/models/item/ancient_log.json | 2 +- .../models/item/ancient_planks.json | 2 +- .../models/item/ancient_sapling.json | 8 +- .../naturesaura/models/item/ancient_slab.json | 2 +- .../models/item/ancient_stairs.json | 2 +- .../models/item/ancient_stick.json | 8 +- .../models/item/animal_container.json | 2 +- .../models/item/animal_generator.json | 2 +- .../models/item/animal_spawner.json | 2 +- .../naturesaura/models/item/aura_bloom.json | 8 +- .../naturesaura/models/item/aura_bottle.json | 10 +- .../naturesaura/models/item/aura_cache.json | 8 +- .../naturesaura/models/item/aura_cactus.json | 8 +- .../models/item/aura_detector.json | 2 +- .../models/item/aura_mushroom.json | 8 +- .../naturesaura/models/item/aura_timer.json | 2 +- .../naturesaura/models/item/aura_trove.json | 8 +- .../naturesaura/models/item/auto_crafter.json | 2 +- .../naturesaura/models/item/birth_spirit.json | 8 +- .../models/item/blast_furnace_booster.json | 2 +- .../item/bottle_two_the_rebottling.json | 8 +- .../models/item/break_prevention.json | 8 +- .../models/item/calling_spirit.json | 8 +- .../naturesaura/models/item/cave_finder.json | 8 +- .../models/item/chorus_generator.json | 2 +- .../naturesaura/models/item/chunk_loader.json | 2 +- .../naturesaura/models/item/clock_hand.json | 8 +- .../models/item/conversion_catalyst.json | 2 +- .../models/item/crimson_aura_mushroom.json | 8 +- .../naturesaura/models/item/crimson_meal.json | 8 +- .../models/item/crushing_catalyst.json | 2 +- .../naturesaura/models/item/death_ring.json | 8 +- .../models/item/decayed_leaves.json | 2 +- .../models/item/dimension_rail_end.json | 8 +- .../models/item/dimension_rail_nether.json | 8 +- .../models/item/dimension_rail_overworld.json | 8 +- .../models/item/effect_powder.json | 8 +- .../models/item/end_city_finder.json | 8 +- .../naturesaura/models/item/end_flower.json | 8 +- .../naturesaura/models/item/ender_access.json | 8 +- .../naturesaura/models/item/ender_crate.json | 2 +- .../assets/naturesaura/models/item/eye.json | 8 +- .../naturesaura/models/item/eye_improved.json | 8 +- .../models/item/farming_stencil.json | 8 +- .../models/item/field_creator.json | 2 +- .../models/item/firework_generator.json | 2 +- .../models/item/flower_generator.json | 2 +- .../models/item/fortress_finder.json | 8 +- .../models/item/furnace_heater.json | 2 +- .../models/item/generator_limit_remover.json | 2 +- .../naturesaura/models/item/gold_brick.json | 2 +- .../naturesaura/models/item/gold_fiber.json | 8 +- .../naturesaura/models/item/gold_leaf.json | 8 +- .../models/item/gold_nether_brick.json | 2 +- .../naturesaura/models/item/gold_powder.json | 8 +- .../models/item/golden_leaves.json | 2 +- .../naturesaura/models/item/grated_chute.json | 2 +- .../models/item/hopper_upgrade.json | 2 +- .../models/item/infused_brick.json | 2 +- .../models/item/infused_brick_slab.json | 2 +- .../models/item/infused_brick_stairs.json | 2 +- .../naturesaura/models/item/infused_iron.json | 8 +- .../models/item/infused_iron_axe.json | 8 +- .../models/item/infused_iron_block.json | 2 +- .../models/item/infused_iron_chest.json | 8 +- .../models/item/infused_iron_helmet.json | 8 +- .../models/item/infused_iron_hoe.json | 8 +- .../models/item/infused_iron_pants.json | 8 +- .../models/item/infused_iron_pickaxe.json | 8 +- .../models/item/infused_iron_shoes.json | 8 +- .../models/item/infused_iron_shovel.json | 8 +- .../models/item/infused_iron_sword.json | 8 +- .../naturesaura/models/item/infused_slab.json | 2 +- .../models/item/infused_stairs.json | 2 +- .../models/item/infused_stone.json | 2 +- .../models/item/item_distributor.json | 2 +- .../naturesaura/models/item/light_staff.json | 8 +- .../naturesaura/models/item/loot_finder.json | 8 +- .../models/item/moss_generator.json | 2 +- .../naturesaura/models/item/mover_cart.json | 8 +- .../models/item/multiblock_maker.json | 8 +- .../naturesaura/models/item/nature_altar.json | 2 +- .../naturesaura/models/item/nether_grass.json | 2 +- .../models/item/nether_wart_mushroom.json | 2 +- .../models/item/netherite_finder.json | 8 +- .../models/item/oak_generator.json | 2 +- .../models/item/offering_table.json | 2 +- .../naturesaura/models/item/pet_reviver.json | 8 +- .../models/item/pickup_stopper.json | 2 +- .../naturesaura/models/item/placer.json | 2 +- .../models/item/potion_generator.json | 2 +- .../models/item/powder_placer.json | 2 +- .../models/item/projectile_generator.json | 2 +- .../models/item/range_visualizer.json | 8 +- .../naturesaura/models/item/rf_converter.json | 2 +- .../models/item/shockwave_creator.json | 8 +- .../naturesaura/models/item/sky_axe.json | 8 +- .../naturesaura/models/item/sky_chest.json | 8 +- .../naturesaura/models/item/sky_helmet.json | 8 +- .../naturesaura/models/item/sky_hoe.json | 8 +- .../naturesaura/models/item/sky_ingot.json | 8 +- .../naturesaura/models/item/sky_pants.json | 8 +- .../naturesaura/models/item/sky_pickaxe.json | 8 +- .../naturesaura/models/item/sky_shoes.json | 8 +- .../naturesaura/models/item/sky_shovel.json | 8 +- .../naturesaura/models/item/sky_sword.json | 8 +- .../models/item/slime_split_generator.json | 2 +- .../naturesaura/models/item/snow_creator.json | 2 +- .../naturesaura/models/item/spawn_lamp.json | 2 +- .../naturesaura/models/item/spring.json | 2 +- .../naturesaura/models/item/tainted_gold.json | 8 +- .../models/item/tainted_gold_block.json | 2 +- .../naturesaura/models/item/time_changer.json | 2 +- .../naturesaura/models/item/token_anger.json | 8 +- .../models/item/token_euphoria.json | 8 +- .../naturesaura/models/item/token_fear.json | 8 +- .../naturesaura/models/item/token_grief.json | 8 +- .../naturesaura/models/item/token_joy.json | 8 +- .../naturesaura/models/item/token_rage.json | 8 +- .../naturesaura/models/item/token_sorrow.json | 8 +- .../naturesaura/models/item/token_terror.json | 8 +- .../models/item/warped_aura_mushroom.json | 8 +- .../models/item/weather_changer.json | 2 +- .../naturesaura/models/item/wood_stand.json | 2 +- .../data/curios/tags/items/belt.json | 1 - .../data/curios/tags/items/charm.json | 1 - .../data/curios/tags/items/necklace.json | 1 - .../data/curios/tags/items/ring.json | 1 - .../data/forge/tags/items/rods/wooden.json | 7 +- .../data/minecraft/tags/blocks/dirt.json | 1 - .../data/minecraft/tags/blocks/leaves.json | 11 +- .../data/minecraft/tags/blocks/logs.json | 9 +- .../data/minecraft/tags/blocks/planks.json | 7 +- .../data/minecraft/tags/blocks/rails.json | 11 +- .../data/minecraft/tags/blocks/slabs.json | 11 +- .../minecraft/tags/blocks/small_flowers.json | 9 +- .../data/minecraft/tags/blocks/stairs.json | 11 +- .../tags/items/cluster_max_harvestables.json | 1 - .../data/minecraft/tags/items/leaves.json | 11 +- .../data/minecraft/tags/items/logs.json | 9 +- .../data/minecraft/tags/items/planks.json | 7 +- .../data/minecraft/tags/items/rails.json | 11 +- .../data/minecraft/tags/items/slabs.json | 11 +- .../data/minecraft/tags/items/stairs.json | 11 +- .../loot_tables/blocks/ancient_bark.json | 12 +- .../loot_tables/blocks/ancient_leaves.json | 16 +- .../loot_tables/blocks/ancient_log.json | 12 +- .../loot_tables/blocks/ancient_planks.json | 12 +- .../loot_tables/blocks/ancient_sapling.json | 12 +- .../loot_tables/blocks/ancient_slab.json | 10 +- .../loot_tables/blocks/ancient_stairs.json | 12 +- .../loot_tables/blocks/animal_container.json | 12 +- .../loot_tables/blocks/animal_generator.json | 12 +- .../loot_tables/blocks/animal_spawner.json | 12 +- .../loot_tables/blocks/aura_bloom.json | 12 +- .../loot_tables/blocks/aura_cactus.json | 12 +- .../loot_tables/blocks/aura_detector.json | 12 +- .../loot_tables/blocks/aura_mushroom.json | 12 +- .../loot_tables/blocks/aura_timer.json | 12 +- .../loot_tables/blocks/auto_crafter.json | 12 +- .../blocks/blast_furnace_booster.json | 12 +- .../loot_tables/blocks/chorus_generator.json | 12 +- .../loot_tables/blocks/chunk_loader.json | 12 +- .../blocks/conversion_catalyst.json | 12 +- .../blocks/crimson_aura_mushroom.json | 12 +- .../loot_tables/blocks/crushing_catalyst.json | 12 +- .../loot_tables/blocks/decayed_leaves.json | 16 +- .../blocks/dimension_rail_end.json | 12 +- .../blocks/dimension_rail_nether.json | 12 +- .../blocks/dimension_rail_overworld.json | 12 +- .../loot_tables/blocks/end_flower.json | 12 +- .../loot_tables/blocks/ender_crate.json | 12 +- .../loot_tables/blocks/field_creator.json | 12 +- .../blocks/firework_generator.json | 12 +- .../loot_tables/blocks/flower_generator.json | 12 +- .../loot_tables/blocks/furnace_heater.json | 12 +- .../blocks/generator_limit_remover.json | 12 +- .../loot_tables/blocks/gold_brick.json | 12 +- .../loot_tables/blocks/gold_nether_brick.json | 12 +- .../loot_tables/blocks/gold_powder.json | 12 +- .../loot_tables/blocks/golden_leaves.json | 16 +- .../loot_tables/blocks/grated_chute.json | 12 +- .../loot_tables/blocks/hopper_upgrade.json | 12 +- .../loot_tables/blocks/infused_brick.json | 12 +- .../blocks/infused_brick_slab.json | 10 +- .../blocks/infused_brick_stairs.json | 12 +- .../blocks/infused_iron_block.json | 12 +- .../loot_tables/blocks/infused_slab.json | 10 +- .../loot_tables/blocks/infused_stairs.json | 12 +- .../loot_tables/blocks/infused_stone.json | 12 +- .../loot_tables/blocks/item_distributor.json | 12 +- .../naturesaura/loot_tables/blocks/light.json | 12 +- .../loot_tables/blocks/moss_generator.json | 12 +- .../loot_tables/blocks/nature_altar.json | 12 +- .../loot_tables/blocks/nether_grass.json | 4 +- .../blocks/nether_wart_mushroom.json | 12 +- .../loot_tables/blocks/oak_generator.json | 12 +- .../loot_tables/blocks/offering_table.json | 12 +- .../loot_tables/blocks/pickup_stopper.json | 12 +- .../loot_tables/blocks/placer.json | 12 +- .../loot_tables/blocks/potion_generator.json | 12 +- .../loot_tables/blocks/potted_aura_bloom.json | 22 +- .../blocks/potted_aura_cactus.json | 22 +- .../blocks/potted_aura_mushroom.json | 22 +- .../blocks/potted_crimson_aura_mushroom.json | 22 +- .../blocks/potted_warped_aura_mushroom.json | 22 +- .../loot_tables/blocks/powder_placer.json | 12 +- .../blocks/projectile_generator.json | 12 +- .../loot_tables/blocks/rf_converter.json | 12 +- .../blocks/slime_split_generator.json | 12 +- .../loot_tables/blocks/snow_creator.json | 12 +- .../loot_tables/blocks/spawn_lamp.json | 12 +- .../loot_tables/blocks/spring.json | 12 +- .../blocks/tainted_gold_block.json | 12 +- .../loot_tables/blocks/time_changer.json | 12 +- .../blocks/warped_aura_mushroom.json | 12 +- .../loot_tables/blocks/weather_changer.json | 12 +- .../loot_tables/blocks/wood_stand.json | 12 +- .../naturesaura/tags/blocks/altar_stone.json | 1 - .../naturesaura/tags/blocks/altar_wood.json | 1 - .../tags/blocks/nether_altar_stone.json | 1 - .../tags/blocks/nether_altar_wood.json | 1 - .../de/ellpeck/naturesaura/ModConfig.java | 2 +- .../blocks/BlockAncientSapling.java | 14 +- .../blocks/BlockAnimalGenerator.java | 11 +- .../naturesaura/blocks/BlockAuraBloom.java | 9 +- .../naturesaura/blocks/BlockAuraTimer.java | 12 +- .../blocks/BlockDecayedLeaves.java | 12 +- .../blocks/BlockDimensionRail.java | 7 +- .../naturesaura/blocks/BlockEndFlower.java | 17 +- .../naturesaura/blocks/BlockEnderCrate.java | 2 +- .../naturesaura/blocks/BlockFieldCreator.java | 8 +- .../naturesaura/blocks/BlockFlowerPot.java | 16 +- .../naturesaura/blocks/BlockGoldPowder.java | 7 +- .../naturesaura/blocks/BlockLight.java | 11 +- .../naturesaura/blocks/BlockOakGenerator.java | 6 +- .../blocks/BlockPickupStopper.java | 2 +- .../blocks/BlockSlimeSplitGenerator.java | 2 +- .../naturesaura/blocks/BlockSpawnLamp.java | 12 +- .../naturesaura/blocks/BlockSpring.java | 8 +- .../naturesaura/blocks/BlockWoodStand.java | 4 +- .../blocks/tiles/BlockEntityFieldCreator.java | 2 +- .../patchouli/ProcessorAnimalSpawner.java | 2 +- .../de/ellpeck/naturesaura/data/ModData.java | 2 +- .../naturesaura/events/ClientEvents.java | 24 +- .../naturesaura/events/CommonEvents.java | 18 +- .../naturesaura/items/ItemAuraBottle.java | 2 +- .../items/ItemBreakPrevention.java | 2 +- .../naturesaura/items/ItemDeathRing.java | 2 +- .../naturesaura/items/ItemEnderAccess.java | 2 +- .../naturesaura/items/ItemPetReviver.java | 8 +- .../items/ItemRangeVisualizer.java | 4 +- .../naturesaura/items/tools/ItemArmor.java | 2 +- .../naturesaura/potion/PotionBreathless.java | 2 +- .../naturesaura/proxy/ClientProxy.java | 13 +- .../recipes/AnimalSpawnerRecipe.java | 6 +- .../naturesaura/reg/ICustomRenderType.java | 10 - .../ellpeck/naturesaura/reg/ModRegistry.java | 2 +- .../naturesaura/models/block/aura_timer.json | 1 + .../models/block/decayed_leaves.json | 1 + .../models/block/dimension_rail_end.json | 1 + .../block/dimension_rail_end_raised_ne.json | 1 + .../block/dimension_rail_end_raised_sw.json | 1 + .../models/block/dimension_rail_nether.json | 1 + .../dimension_rail_nether_raised_ne.json | 1 + .../dimension_rail_nether_raised_sw.json | 1 + .../block/dimension_rail_overworld.json | 1 + .../dimension_rail_overworld_raised_ne.json | 1 + .../dimension_rail_overworld_raised_sw.json | 1 + .../models/block/field_creator.json | 1 + .../naturesaura/models/block/spawn_lamp.json | 1 + .../naturesaura/models/block/spring.json | 1 + 411 files changed, 2338 insertions(+), 2406 deletions(-) delete mode 100644 src/main/java/de/ellpeck/naturesaura/reg/ICustomRenderType.java diff --git a/build.gradle b/build.gradle index 15b554cc..4f729d5d 100644 --- a/build.gradle +++ b/build.gradle @@ -102,16 +102,16 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.19-41.0.45' + minecraft 'net.minecraftforge:forge:1.19-41.1.0' - compileOnly fg.deobf("mezz.jei:jei-1.19-common-api:11.0.0.206") - runtimeOnly fg.deobf("mezz.jei:jei-1.19-forge:11.0.0.206") + compileOnly fg.deobf("mezz.jei:jei-1.19-common-api:11.1.1.239") + runtimeOnly fg.deobf("mezz.jei:jei-1.19-forge:11.1.1.239") - compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.19-73:api") - runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.19-73") + compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.19-75:api") + runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.19-75") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19-5.1.0.2") - compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19-5.1.0.2:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19-5.1.0.4") + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.19-5.1.0.4:api") // TODO Enchantability /* compile fg.deobf("quarris.enchantability:Enchantability:11.0.48")*/ diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json index 3cc331f3..744871e6 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_bark.json @@ -1,16 +1,16 @@ { - "variants": { - "axis=x": { - "model": "naturesaura:block/ancient_bark_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "naturesaura:block/ancient_bark" - }, - "axis=z": { - "model": "naturesaura:block/ancient_bark_horizontal", - "x": 90 - } + "variants": { + "axis=x": { + "model": "naturesaura:block/ancient_bark_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "naturesaura:block/ancient_bark" + }, + "axis=z": { + "model": "naturesaura:block/ancient_bark_horizontal", + "x": 90 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_leaves.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_leaves.json index dea06f8d..e3f6bc62 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_leaves.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_leaves.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/ancient_leaves" - } + "variants": { + "": { + "model": "naturesaura:block/ancient_leaves" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json index 1ce9af18..216a8166 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_log.json @@ -1,16 +1,16 @@ { - "variants": { - "axis=x": { - "model": "naturesaura:block/ancient_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "naturesaura:block/ancient_log" - }, - "axis=z": { - "model": "naturesaura:block/ancient_log_horizontal", - "x": 90 - } + "variants": { + "axis=x": { + "model": "naturesaura:block/ancient_log_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "naturesaura:block/ancient_log" + }, + "axis=z": { + "model": "naturesaura:block/ancient_log_horizontal", + "x": 90 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_planks.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_planks.json index c23cb6cc..ccce607a 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_planks.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_planks.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/ancient_planks" - } + "variants": { + "": { + "model": "naturesaura:block/ancient_planks" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_sapling.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_sapling.json index ad7ed1e3..45d9c7bd 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_sapling.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_sapling.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/ancient_sapling" - } + "variants": { + "": { + "model": "naturesaura:block/ancient_sapling" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_slab.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_slab.json index 1e275ca5..3d2c5ee9 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_slab.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_slab.json @@ -1,13 +1,13 @@ { - "variants": { - "type=top": { - "model": "naturesaura:block/ancient_slab_top" - }, - "type=bottom": { - "model": "naturesaura:block/ancient_slab" - }, - "type=double": { - "model": "naturesaura:block/ancient_slab_double" - } + "variants": { + "type=bottom": { + "model": "naturesaura:block/ancient_slab" + }, + "type=double": { + "model": "naturesaura:block/ancient_slab_double" + }, + "type=top": { + "model": "naturesaura:block/ancient_slab_top" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ancient_stairs.json b/src/generated/resources/assets/naturesaura/blockstates/ancient_stairs.json index 8d9300d8..66f80d18 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ancient_stairs.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ancient_stairs.json @@ -1,209 +1,209 @@ { - "variants": { - "facing=north,half=top,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "naturesaura:block/ancient_stairs", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=straight": { - "model": "naturesaura:block/ancient_stairs" - }, - "facing=north,half=top,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "naturesaura:block/ancient_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "naturesaura:block/ancient_stairs_inner" - }, - "facing=north,half=top,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "naturesaura:block/ancient_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "naturesaura:block/ancient_stairs_outer" - } + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "naturesaura:block/ancient_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "naturesaura:block/ancient_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "naturesaura:block/ancient_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "naturesaura:block/ancient_stairs", + "uvlock": true, + "x": 180, + "y": 180 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/animal_container.json b/src/generated/resources/assets/naturesaura/blockstates/animal_container.json index 964076ff..b55b2c04 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/animal_container.json +++ b/src/generated/resources/assets/naturesaura/blockstates/animal_container.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/animal_container" - } + "variants": { + "": { + "model": "naturesaura:block/animal_container" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/animal_generator.json b/src/generated/resources/assets/naturesaura/blockstates/animal_generator.json index 882d2e1e..ea022a63 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/animal_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/animal_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/animal_generator" - } + "variants": { + "": { + "model": "naturesaura:block/animal_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/animal_spawner.json b/src/generated/resources/assets/naturesaura/blockstates/animal_spawner.json index 3a8660af..4f92c76f 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/animal_spawner.json +++ b/src/generated/resources/assets/naturesaura/blockstates/animal_spawner.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/animal_spawner" - } + "variants": { + "": { + "model": "naturesaura:block/animal_spawner" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/aura_bloom.json b/src/generated/resources/assets/naturesaura/blockstates/aura_bloom.json index 0f44b1e3..047cbe80 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/aura_bloom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/aura_bloom" - } + "variants": { + "": { + "model": "naturesaura:block/aura_bloom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/aura_cactus.json b/src/generated/resources/assets/naturesaura/blockstates/aura_cactus.json index 484aa544..d3e67523 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/blockstates/aura_cactus.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/aura_cactus" - } + "variants": { + "": { + "model": "naturesaura:block/aura_cactus" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/aura_detector.json b/src/generated/resources/assets/naturesaura/blockstates/aura_detector.json index 55439f5e..90457f66 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/aura_detector.json +++ b/src/generated/resources/assets/naturesaura/blockstates/aura_detector.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/aura_detector" - } + "variants": { + "": { + "model": "naturesaura:block/aura_detector" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/aura_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/aura_mushroom.json index bc00291d..4dcbb12b 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/aura_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/aura_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/aura_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/aura_timer.json b/src/generated/resources/assets/naturesaura/blockstates/aura_timer.json index f59cf8ec..2a8b50fb 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/aura_timer.json +++ b/src/generated/resources/assets/naturesaura/blockstates/aura_timer.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/aura_timer" - } + "variants": { + "": { + "model": "naturesaura:block/aura_timer" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/auto_crafter.json b/src/generated/resources/assets/naturesaura/blockstates/auto_crafter.json index a54ffc1a..7cf972ef 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/auto_crafter.json +++ b/src/generated/resources/assets/naturesaura/blockstates/auto_crafter.json @@ -1,19 +1,19 @@ { - "variants": { - "facing=north": { - "model": "naturesaura:block/auto_crafter" - }, - "facing=south": { - "model": "naturesaura:block/auto_crafter", - "y": 180 - }, - "facing=west": { - "model": "naturesaura:block/auto_crafter", - "y": 270 - }, - "facing=east": { - "model": "naturesaura:block/auto_crafter", - "y": 90 - } + "variants": { + "facing=east": { + "model": "naturesaura:block/auto_crafter", + "y": 90 + }, + "facing=north": { + "model": "naturesaura:block/auto_crafter" + }, + "facing=south": { + "model": "naturesaura:block/auto_crafter", + "y": 180 + }, + "facing=west": { + "model": "naturesaura:block/auto_crafter", + "y": 270 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/blast_furnace_booster.json b/src/generated/resources/assets/naturesaura/blockstates/blast_furnace_booster.json index c36f35b0..4cb09200 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/blast_furnace_booster.json +++ b/src/generated/resources/assets/naturesaura/blockstates/blast_furnace_booster.json @@ -1,34 +1,34 @@ { - "variants": { - "facing=north,waterlogged=false": { - "model": "naturesaura:block/blast_furnace_booster" - }, - "facing=south,waterlogged=false": { - "model": "naturesaura:block/blast_furnace_booster", - "y": 180 - }, - "facing=west,waterlogged=false": { - "model": "naturesaura:block/blast_furnace_booster", - "y": 270 - }, - "facing=east,waterlogged=false": { - "model": "naturesaura:block/blast_furnace_booster", - "y": 90 - }, - "facing=north,waterlogged=true": { - "model": "naturesaura:block/blast_furnace_booster" - }, - "facing=south,waterlogged=true": { - "model": "naturesaura:block/blast_furnace_booster", - "y": 180 - }, - "facing=west,waterlogged=true": { - "model": "naturesaura:block/blast_furnace_booster", - "y": 270 - }, - "facing=east,waterlogged=true": { - "model": "naturesaura:block/blast_furnace_booster", - "y": 90 - } + "variants": { + "facing=east,waterlogged=false": { + "model": "naturesaura:block/blast_furnace_booster", + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "naturesaura:block/blast_furnace_booster", + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "naturesaura:block/blast_furnace_booster" + }, + "facing=north,waterlogged=true": { + "model": "naturesaura:block/blast_furnace_booster" + }, + "facing=south,waterlogged=false": { + "model": "naturesaura:block/blast_furnace_booster", + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "naturesaura:block/blast_furnace_booster", + "y": 180 + }, + "facing=west,waterlogged=false": { + "model": "naturesaura:block/blast_furnace_booster", + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "naturesaura:block/blast_furnace_booster", + "y": 270 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/chorus_generator.json b/src/generated/resources/assets/naturesaura/blockstates/chorus_generator.json index f1564ef1..43edd27a 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/chorus_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/chorus_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/chorus_generator" - } + "variants": { + "": { + "model": "naturesaura:block/chorus_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/chunk_loader.json b/src/generated/resources/assets/naturesaura/blockstates/chunk_loader.json index aa266be7..867629fe 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/chunk_loader.json +++ b/src/generated/resources/assets/naturesaura/blockstates/chunk_loader.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/chunk_loader" - } + "variants": { + "": { + "model": "naturesaura:block/chunk_loader" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/crimson_aura_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/crimson_aura_mushroom.json index d670c3a2..31e8aafb 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/crimson_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/crimson_aura_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/crimson_aura_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/crimson_aura_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/decayed_leaves.json b/src/generated/resources/assets/naturesaura/blockstates/decayed_leaves.json index df93e5ee..faf67fe8 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/decayed_leaves.json +++ b/src/generated/resources/assets/naturesaura/blockstates/decayed_leaves.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/decayed_leaves" - } + "variants": { + "": { + "model": "naturesaura:block/decayed_leaves" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/end_flower.json b/src/generated/resources/assets/naturesaura/blockstates/end_flower.json index 234edec8..f8379102 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/end_flower.json +++ b/src/generated/resources/assets/naturesaura/blockstates/end_flower.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/end_flower" - } + "variants": { + "": { + "model": "naturesaura:block/end_flower" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/ender_crate.json b/src/generated/resources/assets/naturesaura/blockstates/ender_crate.json index a94cb8b5..ae810a76 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/ender_crate.json +++ b/src/generated/resources/assets/naturesaura/blockstates/ender_crate.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/ender_crate" - } + "variants": { + "": { + "model": "naturesaura:block/ender_crate" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/field_creator.json b/src/generated/resources/assets/naturesaura/blockstates/field_creator.json index 7fee3bc1..3721bbad 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/field_creator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/field_creator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/field_creator" - } + "variants": { + "": { + "model": "naturesaura:block/field_creator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/firework_generator.json b/src/generated/resources/assets/naturesaura/blockstates/firework_generator.json index d41650e1..6ef6759c 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/firework_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/firework_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/firework_generator" - } + "variants": { + "": { + "model": "naturesaura:block/firework_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/flower_generator.json b/src/generated/resources/assets/naturesaura/blockstates/flower_generator.json index ed4e5261..c9f389ed 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/flower_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/flower_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/flower_generator" - } + "variants": { + "": { + "model": "naturesaura:block/flower_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/furnace_heater.json b/src/generated/resources/assets/naturesaura/blockstates/furnace_heater.json index f39290b3..b34ad008 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/furnace_heater.json +++ b/src/generated/resources/assets/naturesaura/blockstates/furnace_heater.json @@ -1,56 +1,56 @@ { - "variants": { - "facing=down,waterlogged=false": { - "model": "naturesaura:block/furnace_heater", - "x": 180 - }, - "facing=up,waterlogged=false": { - "model": "naturesaura:block/furnace_heater" - }, - "facing=north,waterlogged=false": { - "model": "naturesaura:block/furnace_heater", - "x": 90 - }, - "facing=south,waterlogged=false": { - "model": "naturesaura:block/furnace_heater", - "x": 90, - "y": 180 - }, - "facing=west,waterlogged=false": { - "model": "naturesaura:block/furnace_heater", - "x": 90, - "y": 270 - }, - "facing=east,waterlogged=false": { - "model": "naturesaura:block/furnace_heater", - "x": 90, - "y": 90 - }, - "facing=down,waterlogged=true": { - "model": "naturesaura:block/furnace_heater", - "x": 180 - }, - "facing=up,waterlogged=true": { - "model": "naturesaura:block/furnace_heater" - }, - "facing=north,waterlogged=true": { - "model": "naturesaura:block/furnace_heater", - "x": 90 - }, - "facing=south,waterlogged=true": { - "model": "naturesaura:block/furnace_heater", - "x": 90, - "y": 180 - }, - "facing=west,waterlogged=true": { - "model": "naturesaura:block/furnace_heater", - "x": 90, - "y": 270 - }, - "facing=east,waterlogged=true": { - "model": "naturesaura:block/furnace_heater", - "x": 90, - "y": 90 - } + "variants": { + "facing=down,waterlogged=false": { + "model": "naturesaura:block/furnace_heater", + "x": 180 + }, + "facing=down,waterlogged=true": { + "model": "naturesaura:block/furnace_heater", + "x": 180 + }, + "facing=east,waterlogged=false": { + "model": "naturesaura:block/furnace_heater", + "x": 90, + "y": 90 + }, + "facing=east,waterlogged=true": { + "model": "naturesaura:block/furnace_heater", + "x": 90, + "y": 90 + }, + "facing=north,waterlogged=false": { + "model": "naturesaura:block/furnace_heater", + "x": 90 + }, + "facing=north,waterlogged=true": { + "model": "naturesaura:block/furnace_heater", + "x": 90 + }, + "facing=south,waterlogged=false": { + "model": "naturesaura:block/furnace_heater", + "x": 90, + "y": 180 + }, + "facing=south,waterlogged=true": { + "model": "naturesaura:block/furnace_heater", + "x": 90, + "y": 180 + }, + "facing=up,waterlogged=false": { + "model": "naturesaura:block/furnace_heater" + }, + "facing=up,waterlogged=true": { + "model": "naturesaura:block/furnace_heater" + }, + "facing=west,waterlogged=false": { + "model": "naturesaura:block/furnace_heater", + "x": 90, + "y": 270 + }, + "facing=west,waterlogged=true": { + "model": "naturesaura:block/furnace_heater", + "x": 90, + "y": 270 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/generator_limit_remover.json b/src/generated/resources/assets/naturesaura/blockstates/generator_limit_remover.json index 2b2e544e..6e10b4e4 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/generator_limit_remover.json +++ b/src/generated/resources/assets/naturesaura/blockstates/generator_limit_remover.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/generator_limit_remover" - } + "variants": { + "": { + "model": "naturesaura:block/generator_limit_remover" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/gold_brick.json b/src/generated/resources/assets/naturesaura/blockstates/gold_brick.json index bf2325d5..a43fb52e 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/gold_brick.json +++ b/src/generated/resources/assets/naturesaura/blockstates/gold_brick.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/gold_brick" - } + "variants": { + "": { + "model": "naturesaura:block/gold_brick" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/gold_nether_brick.json b/src/generated/resources/assets/naturesaura/blockstates/gold_nether_brick.json index 25311499..43fefbcb 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/gold_nether_brick.json +++ b/src/generated/resources/assets/naturesaura/blockstates/gold_nether_brick.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/gold_nether_brick" - } + "variants": { + "": { + "model": "naturesaura:block/gold_nether_brick" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/golden_leaves.json b/src/generated/resources/assets/naturesaura/blockstates/golden_leaves.json index 7f789fc8..bb90ef30 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/golden_leaves.json +++ b/src/generated/resources/assets/naturesaura/blockstates/golden_leaves.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/golden_leaves" - } + "variants": { + "": { + "model": "naturesaura:block/golden_leaves" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/hopper_upgrade.json b/src/generated/resources/assets/naturesaura/blockstates/hopper_upgrade.json index 9da63274..7b92abaa 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/hopper_upgrade.json +++ b/src/generated/resources/assets/naturesaura/blockstates/hopper_upgrade.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/hopper_upgrade" - } + "variants": { + "": { + "model": "naturesaura:block/hopper_upgrade" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_brick.json b/src/generated/resources/assets/naturesaura/blockstates/infused_brick.json index 101dae65..71a61b37 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_brick.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_brick.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/infused_brick" - } + "variants": { + "": { + "model": "naturesaura:block/infused_brick" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_brick_slab.json b/src/generated/resources/assets/naturesaura/blockstates/infused_brick_slab.json index 9af9a046..0c1bb8da 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_brick_slab.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_brick_slab.json @@ -1,13 +1,13 @@ { - "variants": { - "type=top": { - "model": "naturesaura:block/infused_brick_slab_top" - }, - "type=bottom": { - "model": "naturesaura:block/infused_brick_slab" - }, - "type=double": { - "model": "naturesaura:block/infused_brick_slab_double" - } + "variants": { + "type=bottom": { + "model": "naturesaura:block/infused_brick_slab" + }, + "type=double": { + "model": "naturesaura:block/infused_brick_slab_double" + }, + "type=top": { + "model": "naturesaura:block/infused_brick_slab_top" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_brick_stairs.json b/src/generated/resources/assets/naturesaura/blockstates/infused_brick_stairs.json index b64d9add..faa14529 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_brick_stairs.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_brick_stairs.json @@ -1,209 +1,209 @@ { - "variants": { - "facing=north,half=top,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_brick_stairs" - }, - "facing=north,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_brick_stairs_inner" - }, - "facing=north,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_brick_stairs_outer" - } + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "naturesaura:block/infused_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_iron_block.json b/src/generated/resources/assets/naturesaura/blockstates/infused_iron_block.json index c7c40bd1..9198b4d0 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_iron_block.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_iron_block.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/infused_iron_block" - } + "variants": { + "": { + "model": "naturesaura:block/infused_iron_block" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_slab.json b/src/generated/resources/assets/naturesaura/blockstates/infused_slab.json index 849e2e7f..8f6ea2b7 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_slab.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_slab.json @@ -1,13 +1,13 @@ { - "variants": { - "type=top": { - "model": "naturesaura:block/infused_slab_top" - }, - "type=bottom": { - "model": "naturesaura:block/infused_slab" - }, - "type=double": { - "model": "naturesaura:block/infused_slab_double" - } + "variants": { + "type=bottom": { + "model": "naturesaura:block/infused_slab" + }, + "type=double": { + "model": "naturesaura:block/infused_slab_double" + }, + "type=top": { + "model": "naturesaura:block/infused_slab_top" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_stairs.json b/src/generated/resources/assets/naturesaura/blockstates/infused_stairs.json index 44829855..cbbfab87 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_stairs.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_stairs.json @@ -1,209 +1,209 @@ { - "variants": { - "facing=north,half=top,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_stairs", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=straight": { - "model": "naturesaura:block/infused_stairs" - }, - "facing=north,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner" - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_left": { - "model": "naturesaura:block/infused_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "naturesaura:block/infused_stairs_inner" - }, - "facing=north,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=south,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=west,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=east,half=top,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer" - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "naturesaura:block/infused_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=north,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "uvlock": true - }, - "facing=south,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "y": 180, - "uvlock": true - }, - "facing=west,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "y": 270, - "uvlock": true - }, - "facing=east,half=top,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "x": 180, - "y": 90, - "uvlock": true - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "y": 270, - "uvlock": true - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "y": 90, - "uvlock": true - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer", - "y": 180, - "uvlock": true - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "naturesaura:block/infused_stairs_outer" - } + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "naturesaura:block/infused_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "naturesaura:block/infused_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "naturesaura:block/infused_stairs", + "uvlock": true, + "x": 180, + "y": 180 } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/infused_stone.json b/src/generated/resources/assets/naturesaura/blockstates/infused_stone.json index e8fed509..33517c4d 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/infused_stone.json +++ b/src/generated/resources/assets/naturesaura/blockstates/infused_stone.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/infused_stone" - } + "variants": { + "": { + "model": "naturesaura:block/infused_stone" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/item_distributor.json b/src/generated/resources/assets/naturesaura/blockstates/item_distributor.json index ded1fabb..620230fa 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/item_distributor.json +++ b/src/generated/resources/assets/naturesaura/blockstates/item_distributor.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/item_distributor" - } + "variants": { + "": { + "model": "naturesaura:block/item_distributor" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/light.json b/src/generated/resources/assets/naturesaura/blockstates/light.json index f186d29f..96d67e7f 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/light.json +++ b/src/generated/resources/assets/naturesaura/blockstates/light.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/light" - } + "variants": { + "": { + "model": "naturesaura:block/light" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/moss_generator.json b/src/generated/resources/assets/naturesaura/blockstates/moss_generator.json index b3b1e1bc..cf51b28a 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/moss_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/moss_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/moss_generator" - } + "variants": { + "": { + "model": "naturesaura:block/moss_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/nether_grass.json b/src/generated/resources/assets/naturesaura/blockstates/nether_grass.json index 328fae6b..39d3425c 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/nether_grass.json +++ b/src/generated/resources/assets/naturesaura/blockstates/nether_grass.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/nether_grass" - } + "variants": { + "": { + "model": "naturesaura:block/nether_grass" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/nether_wart_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/nether_wart_mushroom.json index 29d26c68..41a124d9 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/nether_wart_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/nether_wart_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/nether_wart_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/nether_wart_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/oak_generator.json b/src/generated/resources/assets/naturesaura/blockstates/oak_generator.json index c14af922..afcf20a0 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/oak_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/oak_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/oak_generator" - } + "variants": { + "": { + "model": "naturesaura:block/oak_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/offering_table.json b/src/generated/resources/assets/naturesaura/blockstates/offering_table.json index 1e1f6717..f8c7aa6c 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/offering_table.json +++ b/src/generated/resources/assets/naturesaura/blockstates/offering_table.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/offering_table" - } + "variants": { + "": { + "model": "naturesaura:block/offering_table" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/pickup_stopper.json b/src/generated/resources/assets/naturesaura/blockstates/pickup_stopper.json index 07b38cda..be668dbe 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/pickup_stopper.json +++ b/src/generated/resources/assets/naturesaura/blockstates/pickup_stopper.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/pickup_stopper" - } + "variants": { + "": { + "model": "naturesaura:block/pickup_stopper" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/placer.json b/src/generated/resources/assets/naturesaura/blockstates/placer.json index 61bc7f1a..5ee8555c 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/placer.json +++ b/src/generated/resources/assets/naturesaura/blockstates/placer.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/placer" - } + "variants": { + "": { + "model": "naturesaura:block/placer" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/potion_generator.json b/src/generated/resources/assets/naturesaura/blockstates/potion_generator.json index b64c89c4..b34abd98 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/potion_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/potion_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/potion_generator" - } + "variants": { + "": { + "model": "naturesaura:block/potion_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/potted_aura_bloom.json b/src/generated/resources/assets/naturesaura/blockstates/potted_aura_bloom.json index 0af946af..c233f6ab 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/potted_aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/potted_aura_bloom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/potted_aura_bloom" - } + "variants": { + "": { + "model": "naturesaura:block/potted_aura_bloom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/potted_aura_cactus.json b/src/generated/resources/assets/naturesaura/blockstates/potted_aura_cactus.json index 95d5e010..44b4c7fc 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/potted_aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/blockstates/potted_aura_cactus.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/potted_aura_cactus" - } + "variants": { + "": { + "model": "naturesaura:block/potted_aura_cactus" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/potted_aura_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/potted_aura_mushroom.json index 034703d1..10b35e8a 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/potted_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/potted_aura_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/potted_aura_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/potted_aura_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/potted_crimson_aura_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/potted_crimson_aura_mushroom.json index 9c569629..98f68462 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/potted_crimson_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/potted_crimson_aura_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/potted_crimson_aura_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/potted_crimson_aura_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/potted_warped_aura_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/potted_warped_aura_mushroom.json index 3de8339f..82bd39a2 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/potted_warped_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/potted_warped_aura_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/potted_warped_aura_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/potted_warped_aura_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/powder_placer.json b/src/generated/resources/assets/naturesaura/blockstates/powder_placer.json index f42f814a..a9129b1f 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/powder_placer.json +++ b/src/generated/resources/assets/naturesaura/blockstates/powder_placer.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/powder_placer" - } + "variants": { + "": { + "model": "naturesaura:block/powder_placer" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/projectile_generator.json b/src/generated/resources/assets/naturesaura/blockstates/projectile_generator.json index c99ad66f..dbd834e9 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/projectile_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/projectile_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/projectile_generator" - } + "variants": { + "": { + "model": "naturesaura:block/projectile_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/rf_converter.json b/src/generated/resources/assets/naturesaura/blockstates/rf_converter.json index 0f56f878..8796f789 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/rf_converter.json +++ b/src/generated/resources/assets/naturesaura/blockstates/rf_converter.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/rf_converter" - } + "variants": { + "": { + "model": "naturesaura:block/rf_converter" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/slime_split_generator.json b/src/generated/resources/assets/naturesaura/blockstates/slime_split_generator.json index 655619b3..c9a43708 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/slime_split_generator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/slime_split_generator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/slime_split_generator" - } + "variants": { + "": { + "model": "naturesaura:block/slime_split_generator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/snow_creator.json b/src/generated/resources/assets/naturesaura/blockstates/snow_creator.json index 8bce40fe..12afbbba 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/snow_creator.json +++ b/src/generated/resources/assets/naturesaura/blockstates/snow_creator.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/snow_creator" - } + "variants": { + "": { + "model": "naturesaura:block/snow_creator" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/spawn_lamp.json b/src/generated/resources/assets/naturesaura/blockstates/spawn_lamp.json index 1196a250..afa64762 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/spawn_lamp.json +++ b/src/generated/resources/assets/naturesaura/blockstates/spawn_lamp.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/spawn_lamp" - } + "variants": { + "": { + "model": "naturesaura:block/spawn_lamp" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/spring.json b/src/generated/resources/assets/naturesaura/blockstates/spring.json index e9a7192e..4cbad986 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/spring.json +++ b/src/generated/resources/assets/naturesaura/blockstates/spring.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/spring" - } + "variants": { + "": { + "model": "naturesaura:block/spring" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json index 4cee952f..e5c5c57a 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json +++ b/src/generated/resources/assets/naturesaura/blockstates/tainted_gold_block.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/tainted_gold_block" - } + "variants": { + "": { + "model": "naturesaura:block/tainted_gold_block" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/time_changer.json b/src/generated/resources/assets/naturesaura/blockstates/time_changer.json index 403c4116..88c5c100 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/time_changer.json +++ b/src/generated/resources/assets/naturesaura/blockstates/time_changer.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/time_changer" - } + "variants": { + "": { + "model": "naturesaura:block/time_changer" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/warped_aura_mushroom.json b/src/generated/resources/assets/naturesaura/blockstates/warped_aura_mushroom.json index 8b17ff61..01b9412b 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/warped_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/blockstates/warped_aura_mushroom.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/warped_aura_mushroom" - } + "variants": { + "": { + "model": "naturesaura:block/warped_aura_mushroom" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/weather_changer.json b/src/generated/resources/assets/naturesaura/blockstates/weather_changer.json index 119cb0cc..9f090397 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/weather_changer.json +++ b/src/generated/resources/assets/naturesaura/blockstates/weather_changer.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/weather_changer" - } + "variants": { + "": { + "model": "naturesaura:block/weather_changer" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/blockstates/wood_stand.json b/src/generated/resources/assets/naturesaura/blockstates/wood_stand.json index 96d85dd0..a296299f 100644 --- a/src/generated/resources/assets/naturesaura/blockstates/wood_stand.json +++ b/src/generated/resources/assets/naturesaura/blockstates/wood_stand.json @@ -1,7 +1,7 @@ { - "variants": { - "": { - "model": "naturesaura:block/wood_stand" - } + "variants": { + "": { + "model": "naturesaura:block/wood_stand" } + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json b/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json index 70d5c126..825c59c9 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_bark.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", - "textures": { - "side": "naturesaura:block/ancient_bark", - "end": "naturesaura:block/ancient_bark_top" - } + "parent": "minecraft:block/cube_column", + "textures": { + "end": "naturesaura:block/ancient_bark_top", + "side": "naturesaura:block/ancient_bark" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json b/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json index 264ddb46..71a46e60 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_bark_horizontal.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "side": "naturesaura:block/ancient_bark", - "end": "naturesaura:block/ancient_bark_top" - } + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "naturesaura:block/ancient_bark_top", + "side": "naturesaura:block/ancient_bark" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_log.json b/src/generated/resources/assets/naturesaura/models/block/ancient_log.json index ce686ac2..70e302b6 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_log.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_log.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column", - "textures": { - "side": "naturesaura:block/ancient_log", - "end": "naturesaura:block/ancient_log_top" - } + "parent": "minecraft:block/cube_column", + "textures": { + "end": "naturesaura:block/ancient_log_top", + "side": "naturesaura:block/ancient_log" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json b/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json index 5474fca7..729a9b01 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_log_horizontal.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "side": "naturesaura:block/ancient_log", - "end": "naturesaura:block/ancient_log_top" - } + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "naturesaura:block/ancient_log_top", + "side": "naturesaura:block/ancient_log" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json b/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json index c4217394..c886e5b4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_planks.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json b/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json index a524980d..67c0f332 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_sapling.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/ancient_sapling" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout_mipped", + "textures": { + "cross": "naturesaura:block/ancient_sapling" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json b/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json index 110e10ee..5c4c3a6f 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_slab.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "side": "naturesaura:block/ancient_planks", - "bottom": "naturesaura:block/ancient_planks", - "top": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "naturesaura:block/ancient_planks", + "side": "naturesaura:block/ancient_planks", + "top": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json index c4217394..c886e5b4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_double.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json index ad8e1534..77c72a3c 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_slab_top.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab_top", - "textures": { - "side": "naturesaura:block/ancient_planks", - "bottom": "naturesaura:block/ancient_planks", - "top": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "naturesaura:block/ancient_planks", + "side": "naturesaura:block/ancient_planks", + "top": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json index e3140e8e..fee640da 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/stairs", - "textures": { - "side": "naturesaura:block/ancient_planks", - "bottom": "naturesaura:block/ancient_planks", - "top": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "naturesaura:block/ancient_planks", + "side": "naturesaura:block/ancient_planks", + "top": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json index 57d3f225..855918f0 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_inner.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/inner_stairs", - "textures": { - "side": "naturesaura:block/ancient_planks", - "bottom": "naturesaura:block/ancient_planks", - "top": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "naturesaura:block/ancient_planks", + "side": "naturesaura:block/ancient_planks", + "top": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json index 8566bcb1..c43f7d14 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json +++ b/src/generated/resources/assets/naturesaura/models/block/ancient_stairs_outer.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/outer_stairs", - "textures": { - "side": "naturesaura:block/ancient_planks", - "bottom": "naturesaura:block/ancient_planks", - "top": "naturesaura:block/ancient_planks" - } + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "naturesaura:block/ancient_planks", + "side": "naturesaura:block/ancient_planks", + "top": "naturesaura:block/ancient_planks" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/animal_generator.json b/src/generated/resources/assets/naturesaura/models/block/animal_generator.json index c24ac76f..3f5ab95a 100644 --- a/src/generated/resources/assets/naturesaura/models/block/animal_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/animal_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/animal_generator", - "bottom": "naturesaura:block/animal_generator_bottom", - "top": "naturesaura:block/animal_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/animal_generator_bottom", + "side": "naturesaura:block/animal_generator", + "top": "naturesaura:block/animal_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json b/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json index 01db446d..57727d48 100644 --- a/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json +++ b/src/generated/resources/assets/naturesaura/models/block/animal_spawner.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/animal_spawner" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/animal_spawner" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json b/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json index e0bd027e..da61bb69 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_bloom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/aura_bloom" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout", + "textures": { + "cross": "naturesaura:block/aura_bloom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json b/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json index c3ccea11..bb2e7604 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_cactus.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/aura_cactus" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout", + "textures": { + "cross": "naturesaura:block/aura_cactus" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_detector.json b/src/generated/resources/assets/naturesaura/models/block/aura_detector.json index a9d0f547..de04dd52 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_detector.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_detector.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/aura_detector" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/aura_detector" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/aura_mushroom.json index d9ffb1f8..bda14766 100644 --- a/src/generated/resources/assets/naturesaura/models/block/aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/aura_mushroom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/aura_mushroom" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout", + "textures": { + "cross": "naturesaura:block/aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json b/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json index fe4913b1..9b88b00a 100644 --- a/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json +++ b/src/generated/resources/assets/naturesaura/models/block/auto_crafter.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/auto_crafter", - "bottom": "naturesaura:block/auto_crafter_bottom", - "top": "naturesaura:block/auto_crafter_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/auto_crafter_bottom", + "side": "naturesaura:block/auto_crafter", + "top": "naturesaura:block/auto_crafter_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json b/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json index b6a970b8..82e61c69 100644 --- a/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/chorus_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/chorus_generator", - "bottom": "naturesaura:block/chorus_generator", - "top": "naturesaura:block/chorus_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/chorus_generator", + "side": "naturesaura:block/chorus_generator", + "top": "naturesaura:block/chorus_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json index 68899410..f3d27a8e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json +++ b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/conversion_catalyst" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/conversion_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json index a429f1fa..28197deb 100644 --- a/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json +++ b/src/generated/resources/assets/naturesaura/models/block/conversion_catalyst_nether.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/conversion_catalyst_nether" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/conversion_catalyst_nether" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/crimson_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/crimson_aura_mushroom.json index 0204e42c..a0f42f37 100644 --- a/src/generated/resources/assets/naturesaura/models/block/crimson_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/crimson_aura_mushroom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/crimson_aura_mushroom" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout", + "textures": { + "cross": "naturesaura:block/crimson_aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json index 49e773d1..84d25202 100644 --- a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json +++ b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/crushing_catalyst" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/crushing_catalyst" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json index 7382dce9..7fe756e9 100644 --- a/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json +++ b/src/generated/resources/assets/naturesaura/models/block/crushing_catalyst_nether.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/crushing_catalyst_nether" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/crushing_catalyst_nether" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/end_flower.json b/src/generated/resources/assets/naturesaura/models/block/end_flower.json index 6ad7839a..899c94a7 100644 --- a/src/generated/resources/assets/naturesaura/models/block/end_flower.json +++ b/src/generated/resources/assets/naturesaura/models/block/end_flower.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/end_flower" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout", + "textures": { + "cross": "naturesaura:block/end_flower" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/ender_crate.json b/src/generated/resources/assets/naturesaura/models/block/ender_crate.json index 32d0018a..5fc78799 100644 --- a/src/generated/resources/assets/naturesaura/models/block/ender_crate.json +++ b/src/generated/resources/assets/naturesaura/models/block/ender_crate.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/ender_crate", - "bottom": "naturesaura:block/ender_crate_bottom", - "top": "naturesaura:block/ender_crate_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/ender_crate_bottom", + "side": "naturesaura:block/ender_crate", + "top": "naturesaura:block/ender_crate_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/firework_generator.json b/src/generated/resources/assets/naturesaura/models/block/firework_generator.json index 0cc2cc47..ee7d565e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/firework_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/firework_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/firework_generator", - "bottom": "naturesaura:block/firework_generator_top", - "top": "naturesaura:block/firework_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/firework_generator_top", + "side": "naturesaura:block/firework_generator", + "top": "naturesaura:block/firework_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/flower_generator.json b/src/generated/resources/assets/naturesaura/models/block/flower_generator.json index c76ed3b8..3961ba29 100644 --- a/src/generated/resources/assets/naturesaura/models/block/flower_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/flower_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/flower_generator", - "bottom": "naturesaura:block/flower_generator_top", - "top": "naturesaura:block/flower_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/flower_generator_top", + "side": "naturesaura:block/flower_generator", + "top": "naturesaura:block/flower_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json b/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json index 7afb4929..f2713132 100644 --- a/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json +++ b/src/generated/resources/assets/naturesaura/models/block/generator_limit_remover.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/generator_limit_remover", - "bottom": "naturesaura:block/generator_limit_remover_top", - "top": "naturesaura:block/generator_limit_remover_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/generator_limit_remover_top", + "side": "naturesaura:block/generator_limit_remover", + "top": "naturesaura:block/generator_limit_remover_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/gold_brick.json b/src/generated/resources/assets/naturesaura/models/block/gold_brick.json index cae72c01..9dcc1c8d 100644 --- a/src/generated/resources/assets/naturesaura/models/block/gold_brick.json +++ b/src/generated/resources/assets/naturesaura/models/block/gold_brick.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/gold_brick" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/gold_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json b/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json index 5e2e2ddb..e0f7caaa 100644 --- a/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json +++ b/src/generated/resources/assets/naturesaura/models/block/gold_nether_brick.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/gold_nether_brick" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/gold_nether_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json b/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json index 0faec8e4..ed297336 100644 --- a/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json +++ b/src/generated/resources/assets/naturesaura/models/block/hopper_upgrade.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/hopper_upgrade" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/hopper_upgrade" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick.json index 82a1f927..f19bed01 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json index cca5ce2e..8fb549f6 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "side": "naturesaura:block/infused_brick", - "bottom": "naturesaura:block/infused_brick", - "top": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "naturesaura:block/infused_brick", + "side": "naturesaura:block/infused_brick", + "top": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json index 82a1f927..f19bed01 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_double.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json index cbea4806..c4ca5230 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_slab_top.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab_top", - "textures": { - "side": "naturesaura:block/infused_brick", - "bottom": "naturesaura:block/infused_brick", - "top": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "naturesaura:block/infused_brick", + "side": "naturesaura:block/infused_brick", + "top": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json index f0982866..90740a19 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/stairs", - "textures": { - "side": "naturesaura:block/infused_brick", - "bottom": "naturesaura:block/infused_brick", - "top": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "naturesaura:block/infused_brick", + "side": "naturesaura:block/infused_brick", + "top": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json index b8b3b340..a7a09a94 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_inner.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/inner_stairs", - "textures": { - "side": "naturesaura:block/infused_brick", - "bottom": "naturesaura:block/infused_brick", - "top": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "naturesaura:block/infused_brick", + "side": "naturesaura:block/infused_brick", + "top": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json index 63a74b0d..0b02e42b 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_brick_stairs_outer.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/outer_stairs", - "textures": { - "side": "naturesaura:block/infused_brick", - "bottom": "naturesaura:block/infused_brick", - "top": "naturesaura:block/infused_brick" - } + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "naturesaura:block/infused_brick", + "side": "naturesaura:block/infused_brick", + "top": "naturesaura:block/infused_brick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json b/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json index 600457a5..0f3b3b1f 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_iron_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/infused_iron_block" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/infused_iron_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_slab.json b/src/generated/resources/assets/naturesaura/models/block/infused_slab.json index 95ff5f82..c0a7e919 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_slab.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_slab.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab", - "textures": { - "side": "naturesaura:block/infused_stone", - "bottom": "naturesaura:block/infused_stone", - "top": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/slab", + "textures": { + "bottom": "naturesaura:block/infused_stone", + "side": "naturesaura:block/infused_stone", + "top": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json b/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json index 3cacaad6..63901c32 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_slab_double.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json b/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json index 769f0e12..137edd4f 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_slab_top.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/slab_top", - "textures": { - "side": "naturesaura:block/infused_stone", - "bottom": "naturesaura:block/infused_stone", - "top": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "naturesaura:block/infused_stone", + "side": "naturesaura:block/infused_stone", + "top": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json b/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json index d64a74ec..c03d9072 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stairs.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/stairs", - "textures": { - "side": "naturesaura:block/infused_stone", - "bottom": "naturesaura:block/infused_stone", - "top": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "naturesaura:block/infused_stone", + "side": "naturesaura:block/infused_stone", + "top": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json index d6b19b6f..d6a4a916 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_inner.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/inner_stairs", - "textures": { - "side": "naturesaura:block/infused_stone", - "bottom": "naturesaura:block/infused_stone", - "top": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "naturesaura:block/infused_stone", + "side": "naturesaura:block/infused_stone", + "top": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json index 44ac5e1b..fbcc1f5a 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stairs_outer.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/outer_stairs", - "textures": { - "side": "naturesaura:block/infused_stone", - "bottom": "naturesaura:block/infused_stone", - "top": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "naturesaura:block/infused_stone", + "side": "naturesaura:block/infused_stone", + "top": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/infused_stone.json b/src/generated/resources/assets/naturesaura/models/block/infused_stone.json index 3cacaad6..63901c32 100644 --- a/src/generated/resources/assets/naturesaura/models/block/infused_stone.json +++ b/src/generated/resources/assets/naturesaura/models/block/infused_stone.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/infused_stone" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/infused_stone" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/item_distributor.json b/src/generated/resources/assets/naturesaura/models/block/item_distributor.json index b3fd3400..91213d83 100644 --- a/src/generated/resources/assets/naturesaura/models/block/item_distributor.json +++ b/src/generated/resources/assets/naturesaura/models/block/item_distributor.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/item_distributor", - "bottom": "naturesaura:block/item_distributor_bottom", - "top": "naturesaura:block/item_distributor_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/item_distributor_bottom", + "side": "naturesaura:block/item_distributor", + "top": "naturesaura:block/item_distributor_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/light.json b/src/generated/resources/assets/naturesaura/models/block/light.json index f51a35d6..1b743888 100644 --- a/src/generated/resources/assets/naturesaura/models/block/light.json +++ b/src/generated/resources/assets/naturesaura/models/block/light.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/air", - "textures": { - "particle": "naturesaura:block/light" - } + "parent": "minecraft:block/air", + "render_type": "minecraft:cutout_mipped", + "textures": { + "particle": "naturesaura:block/light" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/moss_generator.json b/src/generated/resources/assets/naturesaura/models/block/moss_generator.json index 6a6d575a..48e45fa8 100644 --- a/src/generated/resources/assets/naturesaura/models/block/moss_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/moss_generator.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/moss_generator" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/moss_generator" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/nether_grass.json b/src/generated/resources/assets/naturesaura/models/block/nether_grass.json index ebaa8f70..858db43c 100644 --- a/src/generated/resources/assets/naturesaura/models/block/nether_grass.json +++ b/src/generated/resources/assets/naturesaura/models/block/nether_grass.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/nether_grass", - "bottom": "minecraft:block/netherrack", - "top": "naturesaura:block/nether_grass_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "minecraft:block/netherrack", + "side": "naturesaura:block/nether_grass", + "top": "naturesaura:block/nether_grass_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json index 5dabd80d..723c06e8 100644 --- a/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/nether_wart_mushroom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/nether_wart_mushroom" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/nether_wart_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/oak_generator.json b/src/generated/resources/assets/naturesaura/models/block/oak_generator.json index 7f84b88e..0ddf4bed 100644 --- a/src/generated/resources/assets/naturesaura/models/block/oak_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/oak_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/oak_generator", - "bottom": "naturesaura:block/oak_generator_bottom", - "top": "naturesaura:block/oak_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/oak_generator_bottom", + "side": "naturesaura:block/oak_generator", + "top": "naturesaura:block/oak_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json b/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json index 30904146..4ab2fa75 100644 --- a/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json +++ b/src/generated/resources/assets/naturesaura/models/block/pickup_stopper.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/pickup_stopper", - "bottom": "naturesaura:block/pickup_stopper_top", - "top": "naturesaura:block/pickup_stopper_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/pickup_stopper_top", + "side": "naturesaura:block/pickup_stopper", + "top": "naturesaura:block/pickup_stopper_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/placer.json b/src/generated/resources/assets/naturesaura/models/block/placer.json index df30c5ea..da008774 100644 --- a/src/generated/resources/assets/naturesaura/models/block/placer.json +++ b/src/generated/resources/assets/naturesaura/models/block/placer.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/placer", - "bottom": "naturesaura:block/placer_top", - "top": "naturesaura:block/placer_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/placer_top", + "side": "naturesaura:block/placer", + "top": "naturesaura:block/placer_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/potion_generator.json b/src/generated/resources/assets/naturesaura/models/block/potion_generator.json index 7e284709..47cb1d33 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potion_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/potion_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/potion_generator", - "bottom": "naturesaura:block/potion_generator_bottom", - "top": "naturesaura:block/potion_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/potion_generator_bottom", + "side": "naturesaura:block/potion_generator", + "top": "naturesaura:block/potion_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json b/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json index 1b318b63..15288df7 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_aura_bloom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "naturesaura:block/aura_bloom" - } + "parent": "minecraft:block/flower_pot_cross", + "render_type": "minecraft:cutout", + "textures": { + "plant": "naturesaura:block/aura_bloom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json b/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json index 1a4bfca8..0e77d1bd 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_aura_cactus.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "naturesaura:block/aura_cactus" - } + "parent": "minecraft:block/flower_pot_cross", + "render_type": "minecraft:cutout", + "textures": { + "plant": "naturesaura:block/aura_cactus" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/potted_aura_mushroom.json index b26b4694..faaa581e 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_aura_mushroom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "naturesaura:block/aura_mushroom" - } + "parent": "minecraft:block/flower_pot_cross", + "render_type": "minecraft:cutout", + "textures": { + "plant": "naturesaura:block/aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_crimson_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/potted_crimson_aura_mushroom.json index 55904be6..f7cd1941 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_crimson_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_crimson_aura_mushroom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "naturesaura:block/crimson_aura_mushroom" - } + "parent": "minecraft:block/flower_pot_cross", + "render_type": "minecraft:cutout", + "textures": { + "plant": "naturesaura:block/crimson_aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/potted_warped_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/potted_warped_aura_mushroom.json index 5bc5fa79..e1156c73 100644 --- a/src/generated/resources/assets/naturesaura/models/block/potted_warped_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/potted_warped_aura_mushroom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "naturesaura:block/warped_aura_mushroom" - } + "parent": "minecraft:block/flower_pot_cross", + "render_type": "minecraft:cutout", + "textures": { + "plant": "naturesaura:block/warped_aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json b/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json index 67cef268..665994e0 100644 --- a/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/projectile_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/projectile_generator", - "bottom": "naturesaura:block/projectile_generator_top", - "top": "naturesaura:block/projectile_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/projectile_generator_top", + "side": "naturesaura:block/projectile_generator", + "top": "naturesaura:block/projectile_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/rf_converter.json b/src/generated/resources/assets/naturesaura/models/block/rf_converter.json index f1c3b2af..e263599d 100644 --- a/src/generated/resources/assets/naturesaura/models/block/rf_converter.json +++ b/src/generated/resources/assets/naturesaura/models/block/rf_converter.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/rf_converter" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/rf_converter" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/slime_split_generator.json b/src/generated/resources/assets/naturesaura/models/block/slime_split_generator.json index 82af027e..207006b4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/slime_split_generator.json +++ b/src/generated/resources/assets/naturesaura/models/block/slime_split_generator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/slime_split_generator", - "bottom": "naturesaura:block/slime_split_generator_bottom", - "top": "naturesaura:block/slime_split_generator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/slime_split_generator_bottom", + "side": "naturesaura:block/slime_split_generator", + "top": "naturesaura:block/slime_split_generator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/snow_creator.json b/src/generated/resources/assets/naturesaura/models/block/snow_creator.json index 3be31748..0df8b5f8 100644 --- a/src/generated/resources/assets/naturesaura/models/block/snow_creator.json +++ b/src/generated/resources/assets/naturesaura/models/block/snow_creator.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/snow_creator", - "bottom": "naturesaura:block/snow_creator_top", - "top": "naturesaura:block/snow_creator_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/snow_creator_top", + "side": "naturesaura:block/snow_creator", + "top": "naturesaura:block/snow_creator_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json index a6b6807d..3c39853b 100644 --- a/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json +++ b/src/generated/resources/assets/naturesaura/models/block/tainted_gold_block.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:block/cube_all", - "textures": { - "all": "naturesaura:block/tainted_gold_block" - } + "parent": "minecraft:block/cube_all", + "textures": { + "all": "naturesaura:block/tainted_gold_block" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/time_changer.json b/src/generated/resources/assets/naturesaura/models/block/time_changer.json index ad1c5347..4f606cc4 100644 --- a/src/generated/resources/assets/naturesaura/models/block/time_changer.json +++ b/src/generated/resources/assets/naturesaura/models/block/time_changer.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/time_changer", - "bottom": "naturesaura:block/time_changer_bottom", - "top": "naturesaura:block/time_changer_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/time_changer_bottom", + "side": "naturesaura:block/time_changer", + "top": "naturesaura:block/time_changer_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/warped_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/block/warped_aura_mushroom.json index d9877b4d..e00f066b 100644 --- a/src/generated/resources/assets/naturesaura/models/block/warped_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/block/warped_aura_mushroom.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", - "textures": { - "cross": "naturesaura:block/warped_aura_mushroom" - } + "parent": "minecraft:block/cross", + "render_type": "minecraft:cutout", + "textures": { + "cross": "naturesaura:block/warped_aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/block/weather_changer.json b/src/generated/resources/assets/naturesaura/models/block/weather_changer.json index 87ce8e2d..ed7d2156 100644 --- a/src/generated/resources/assets/naturesaura/models/block/weather_changer.json +++ b/src/generated/resources/assets/naturesaura/models/block/weather_changer.json @@ -1,8 +1,8 @@ { - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "naturesaura:block/weather_changer", - "bottom": "naturesaura:block/weather_changer_bottom", - "top": "naturesaura:block/weather_changer_top" - } + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "bottom": "naturesaura:block/weather_changer_bottom", + "side": "naturesaura:block/weather_changer", + "top": "naturesaura:block/weather_changer_top" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_bark.json b/src/generated/resources/assets/naturesaura/models/item/ancient_bark.json index a3fe350d..512fb87e 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_bark.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_bark.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ancient_bark" + "parent": "naturesaura:block/ancient_bark" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_leaves.json b/src/generated/resources/assets/naturesaura/models/item/ancient_leaves.json index 2f5a55fb..621ee544 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_leaves.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_leaves.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ancient_leaves" + "parent": "naturesaura:block/ancient_leaves" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_log.json b/src/generated/resources/assets/naturesaura/models/item/ancient_log.json index 5874ba4f..f56eff77 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_log.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_log.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ancient_log" + "parent": "naturesaura:block/ancient_log" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_planks.json b/src/generated/resources/assets/naturesaura/models/item/ancient_planks.json index 04424492..df14c085 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_planks.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_planks.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ancient_planks" + "parent": "naturesaura:block/ancient_planks" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json b/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json index ebf9570c..8eaece4a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_sapling.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/ancient_sapling" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/ancient_sapling" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_slab.json b/src/generated/resources/assets/naturesaura/models/item/ancient_slab.json index 00faa260..d93846a5 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_slab.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_slab.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ancient_slab" + "parent": "naturesaura:block/ancient_slab" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_stairs.json b/src/generated/resources/assets/naturesaura/models/item/ancient_stairs.json index d7001623..e7fd14a7 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_stairs.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ancient_stairs" + "parent": "naturesaura:block/ancient_stairs" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json b/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json index 82a27465..0d5a2d77 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json +++ b/src/generated/resources/assets/naturesaura/models/item/ancient_stick.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/ancient_stick" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/ancient_stick" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/animal_container.json b/src/generated/resources/assets/naturesaura/models/item/animal_container.json index 5b391d8a..167f2a85 100644 --- a/src/generated/resources/assets/naturesaura/models/item/animal_container.json +++ b/src/generated/resources/assets/naturesaura/models/item/animal_container.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/animal_container" + "parent": "naturesaura:block/animal_container" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/animal_generator.json b/src/generated/resources/assets/naturesaura/models/item/animal_generator.json index d264d12f..eb60e744 100644 --- a/src/generated/resources/assets/naturesaura/models/item/animal_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/animal_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/animal_generator" + "parent": "naturesaura:block/animal_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/animal_spawner.json b/src/generated/resources/assets/naturesaura/models/item/animal_spawner.json index cf1ef29b..b27423d3 100644 --- a/src/generated/resources/assets/naturesaura/models/item/animal_spawner.json +++ b/src/generated/resources/assets/naturesaura/models/item/animal_spawner.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/animal_spawner" + "parent": "naturesaura:block/animal_spawner" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json b/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json index 9e8fe2f6..aecde4dc 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_bloom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/aura_bloom" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/aura_bloom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json b/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json index 58404a67..1a58836c 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_bottle.json @@ -1,7 +1,7 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/aura_bottle", - "layer1": "naturesaura:item/aura_bottle_overlay" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/aura_bottle", + "layer1": "naturesaura:item/aura_bottle_overlay" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_cache.json b/src/generated/resources/assets/naturesaura/models/item/aura_cache.json index e61f0e6e..81b4d6e2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_cache.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_cache.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/aura_cache" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/aura_cache" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json b/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json index 6a2434ea..e21db5bd 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_cactus.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/aura_cactus" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/aura_cactus" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_detector.json b/src/generated/resources/assets/naturesaura/models/item/aura_detector.json index dec5402e..62e5d458 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_detector.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_detector.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/aura_detector" + "parent": "naturesaura:block/aura_detector" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/item/aura_mushroom.json index 00a61778..64997edd 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_mushroom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/aura_mushroom" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_timer.json b/src/generated/resources/assets/naturesaura/models/item/aura_timer.json index 07196604..7552299b 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_timer.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_timer.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/aura_timer" + "parent": "naturesaura:block/aura_timer" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/aura_trove.json b/src/generated/resources/assets/naturesaura/models/item/aura_trove.json index 67ac1607..a05a6637 100644 --- a/src/generated/resources/assets/naturesaura/models/item/aura_trove.json +++ b/src/generated/resources/assets/naturesaura/models/item/aura_trove.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/aura_trove" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/aura_trove" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/auto_crafter.json b/src/generated/resources/assets/naturesaura/models/item/auto_crafter.json index ff934860..21b97ce6 100644 --- a/src/generated/resources/assets/naturesaura/models/item/auto_crafter.json +++ b/src/generated/resources/assets/naturesaura/models/item/auto_crafter.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/auto_crafter" + "parent": "naturesaura:block/auto_crafter" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json b/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json index 9d1ccb75..ac25ab77 100644 --- a/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json +++ b/src/generated/resources/assets/naturesaura/models/item/birth_spirit.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/birth_spirit" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/birth_spirit" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/blast_furnace_booster.json b/src/generated/resources/assets/naturesaura/models/item/blast_furnace_booster.json index 036dfeb6..d067f136 100644 --- a/src/generated/resources/assets/naturesaura/models/item/blast_furnace_booster.json +++ b/src/generated/resources/assets/naturesaura/models/item/blast_furnace_booster.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/blast_furnace_booster" + "parent": "naturesaura:block/blast_furnace_booster" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json b/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json index 64dc7ea5..da5c439f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json +++ b/src/generated/resources/assets/naturesaura/models/item/bottle_two_the_rebottling.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/bottle_two_the_rebottling" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/bottle_two_the_rebottling" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/break_prevention.json b/src/generated/resources/assets/naturesaura/models/item/break_prevention.json index 941a7f4a..6403020f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/break_prevention.json +++ b/src/generated/resources/assets/naturesaura/models/item/break_prevention.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/break_prevention" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/break_prevention" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json b/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json index b91b81cf..68787bab 100644 --- a/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json +++ b/src/generated/resources/assets/naturesaura/models/item/calling_spirit.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/calling_spirit" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/calling_spirit" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/cave_finder.json b/src/generated/resources/assets/naturesaura/models/item/cave_finder.json index 92cf0e84..66b70dad 100644 --- a/src/generated/resources/assets/naturesaura/models/item/cave_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/cave_finder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/cave_finder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/cave_finder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/chorus_generator.json b/src/generated/resources/assets/naturesaura/models/item/chorus_generator.json index dde17d51..1937245f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/chorus_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/chorus_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/chorus_generator" + "parent": "naturesaura:block/chorus_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/chunk_loader.json b/src/generated/resources/assets/naturesaura/models/item/chunk_loader.json index 1dec2500..01d71801 100644 --- a/src/generated/resources/assets/naturesaura/models/item/chunk_loader.json +++ b/src/generated/resources/assets/naturesaura/models/item/chunk_loader.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/chunk_loader" + "parent": "naturesaura:block/chunk_loader" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/clock_hand.json b/src/generated/resources/assets/naturesaura/models/item/clock_hand.json index 5470e4eb..f2124842 100644 --- a/src/generated/resources/assets/naturesaura/models/item/clock_hand.json +++ b/src/generated/resources/assets/naturesaura/models/item/clock_hand.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/clock_hand" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/clock_hand" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/conversion_catalyst.json b/src/generated/resources/assets/naturesaura/models/item/conversion_catalyst.json index f1aa73b9..7204cfe4 100644 --- a/src/generated/resources/assets/naturesaura/models/item/conversion_catalyst.json +++ b/src/generated/resources/assets/naturesaura/models/item/conversion_catalyst.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/conversion_catalyst" + "parent": "naturesaura:block/conversion_catalyst" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/crimson_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/item/crimson_aura_mushroom.json index 63e9f884..aa38a0b9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/crimson_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/item/crimson_aura_mushroom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/crimson_aura_mushroom" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/crimson_aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json b/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json index 4819deff..4b834866 100644 --- a/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json +++ b/src/generated/resources/assets/naturesaura/models/item/crimson_meal.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/crimson_meal" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/crimson_meal" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/crushing_catalyst.json b/src/generated/resources/assets/naturesaura/models/item/crushing_catalyst.json index 84552cec..60d58cc2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/crushing_catalyst.json +++ b/src/generated/resources/assets/naturesaura/models/item/crushing_catalyst.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/crushing_catalyst" + "parent": "naturesaura:block/crushing_catalyst" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/death_ring.json b/src/generated/resources/assets/naturesaura/models/item/death_ring.json index dd98939c..edc43816 100644 --- a/src/generated/resources/assets/naturesaura/models/item/death_ring.json +++ b/src/generated/resources/assets/naturesaura/models/item/death_ring.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/death_ring" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/death_ring" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/decayed_leaves.json b/src/generated/resources/assets/naturesaura/models/item/decayed_leaves.json index cac913b9..e2740ec2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/decayed_leaves.json +++ b/src/generated/resources/assets/naturesaura/models/item/decayed_leaves.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/decayed_leaves" + "parent": "naturesaura:block/decayed_leaves" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json index 7cbb12f8..4bf477fb 100644 --- a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json +++ b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_end.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/dimension_rail_end" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/dimension_rail_end" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json index 3c9d4c43..99eb513f 100644 --- a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json +++ b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_nether.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/dimension_rail_nether" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/dimension_rail_nether" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json index 260710e5..6910738a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json +++ b/src/generated/resources/assets/naturesaura/models/item/dimension_rail_overworld.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/dimension_rail_overworld" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/dimension_rail_overworld" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/effect_powder.json b/src/generated/resources/assets/naturesaura/models/item/effect_powder.json index b488b8dd..06e3ec49 100644 --- a/src/generated/resources/assets/naturesaura/models/item/effect_powder.json +++ b/src/generated/resources/assets/naturesaura/models/item/effect_powder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/effect_powder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/effect_powder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json b/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json index f175b6ce..350d14e4 100644 --- a/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/end_city_finder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/end_city_finder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/end_city_finder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/end_flower.json b/src/generated/resources/assets/naturesaura/models/item/end_flower.json index aa9f2680..16573d51 100644 --- a/src/generated/resources/assets/naturesaura/models/item/end_flower.json +++ b/src/generated/resources/assets/naturesaura/models/item/end_flower.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/end_flower" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/end_flower" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ender_access.json b/src/generated/resources/assets/naturesaura/models/item/ender_access.json index 42fc3d85..35c639a2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ender_access.json +++ b/src/generated/resources/assets/naturesaura/models/item/ender_access.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/ender_access" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/ender_access" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/ender_crate.json b/src/generated/resources/assets/naturesaura/models/item/ender_crate.json index b3a7c162..e7210372 100644 --- a/src/generated/resources/assets/naturesaura/models/item/ender_crate.json +++ b/src/generated/resources/assets/naturesaura/models/item/ender_crate.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/ender_crate" + "parent": "naturesaura:block/ender_crate" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/eye.json b/src/generated/resources/assets/naturesaura/models/item/eye.json index 841423be..f871ecfb 100644 --- a/src/generated/resources/assets/naturesaura/models/item/eye.json +++ b/src/generated/resources/assets/naturesaura/models/item/eye.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/eye" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/eye" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/eye_improved.json b/src/generated/resources/assets/naturesaura/models/item/eye_improved.json index 17fb9cb3..e242e6c3 100644 --- a/src/generated/resources/assets/naturesaura/models/item/eye_improved.json +++ b/src/generated/resources/assets/naturesaura/models/item/eye_improved.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/eye_improved" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/eye_improved" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json b/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json index 9f65080a..af8df02e 100644 --- a/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json +++ b/src/generated/resources/assets/naturesaura/models/item/farming_stencil.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/farming_stencil" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/farming_stencil" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/field_creator.json b/src/generated/resources/assets/naturesaura/models/item/field_creator.json index 0daf29cd..29b67044 100644 --- a/src/generated/resources/assets/naturesaura/models/item/field_creator.json +++ b/src/generated/resources/assets/naturesaura/models/item/field_creator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/field_creator" + "parent": "naturesaura:block/field_creator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/firework_generator.json b/src/generated/resources/assets/naturesaura/models/item/firework_generator.json index aca0bb42..ee043e27 100644 --- a/src/generated/resources/assets/naturesaura/models/item/firework_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/firework_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/firework_generator" + "parent": "naturesaura:block/firework_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/flower_generator.json b/src/generated/resources/assets/naturesaura/models/item/flower_generator.json index 8acb6207..859beca1 100644 --- a/src/generated/resources/assets/naturesaura/models/item/flower_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/flower_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/flower_generator" + "parent": "naturesaura:block/flower_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json b/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json index 40741426..3321a5ea 100644 --- a/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/fortress_finder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/fortress_finder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/fortress_finder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/furnace_heater.json b/src/generated/resources/assets/naturesaura/models/item/furnace_heater.json index 6699b9e6..2837be73 100644 --- a/src/generated/resources/assets/naturesaura/models/item/furnace_heater.json +++ b/src/generated/resources/assets/naturesaura/models/item/furnace_heater.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/furnace_heater" + "parent": "naturesaura:block/furnace_heater" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/generator_limit_remover.json b/src/generated/resources/assets/naturesaura/models/item/generator_limit_remover.json index 9063e81d..4095b973 100644 --- a/src/generated/resources/assets/naturesaura/models/item/generator_limit_remover.json +++ b/src/generated/resources/assets/naturesaura/models/item/generator_limit_remover.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/generator_limit_remover" + "parent": "naturesaura:block/generator_limit_remover" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_brick.json b/src/generated/resources/assets/naturesaura/models/item/gold_brick.json index 2dcd8844..e1e635de 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_brick.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_brick.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/gold_brick" + "parent": "naturesaura:block/gold_brick" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json b/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json index e73379ab..dea8eea7 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_fiber.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/gold_fiber" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/gold_fiber" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json b/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json index b0fb9c2c..b76f1af4 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_leaf.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/gold_leaf" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/gold_leaf" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_nether_brick.json b/src/generated/resources/assets/naturesaura/models/item/gold_nether_brick.json index cea971f3..34bd3309 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_nether_brick.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_nether_brick.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/gold_nether_brick" + "parent": "naturesaura:block/gold_nether_brick" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/gold_powder.json b/src/generated/resources/assets/naturesaura/models/item/gold_powder.json index 16734258..c2c192d9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/gold_powder.json +++ b/src/generated/resources/assets/naturesaura/models/item/gold_powder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/gold_powder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/gold_powder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/golden_leaves.json b/src/generated/resources/assets/naturesaura/models/item/golden_leaves.json index 1633c4e8..b43ef151 100644 --- a/src/generated/resources/assets/naturesaura/models/item/golden_leaves.json +++ b/src/generated/resources/assets/naturesaura/models/item/golden_leaves.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/golden_leaves" + "parent": "naturesaura:block/golden_leaves" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/grated_chute.json b/src/generated/resources/assets/naturesaura/models/item/grated_chute.json index 400bf2ed..ccdd8fb8 100644 --- a/src/generated/resources/assets/naturesaura/models/item/grated_chute.json +++ b/src/generated/resources/assets/naturesaura/models/item/grated_chute.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/grated_chute_down" + "parent": "naturesaura:block/grated_chute_down" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/hopper_upgrade.json b/src/generated/resources/assets/naturesaura/models/item/hopper_upgrade.json index 0d20bc36..cbdcf8ef 100644 --- a/src/generated/resources/assets/naturesaura/models/item/hopper_upgrade.json +++ b/src/generated/resources/assets/naturesaura/models/item/hopper_upgrade.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/hopper_upgrade" + "parent": "naturesaura:block/hopper_upgrade" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_brick.json b/src/generated/resources/assets/naturesaura/models/item/infused_brick.json index 1bbcd83a..6c16a35a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_brick.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_brick.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_brick" + "parent": "naturesaura:block/infused_brick" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_brick_slab.json b/src/generated/resources/assets/naturesaura/models/item/infused_brick_slab.json index bf1f8576..f723fee1 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_brick_slab.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_brick_slab.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_brick_slab" + "parent": "naturesaura:block/infused_brick_slab" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_brick_stairs.json b/src/generated/resources/assets/naturesaura/models/item/infused_brick_stairs.json index 24afea63..822b0e2a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_brick_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_brick_stairs.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_brick_stairs" + "parent": "naturesaura:block/infused_brick_stairs" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron.json index 3a717b1f..8fc35299 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/infused_iron" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/infused_iron" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json index 7baa86cb..6dd33674 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_axe.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/infused_iron_axe" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/infused_iron_axe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_block.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_block.json index bba1ee5f..70c5aa74 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_block.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_block.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_iron_block" + "parent": "naturesaura:block/infused_iron_block" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json index 6e7ca11e..5426108b 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_chest.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/infused_iron_chest" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/infused_iron_chest" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json index 85300a91..32f98284 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_helmet.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/infused_iron_helmet" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/infused_iron_helmet" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json index b96c3b9c..4241b391 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_hoe.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/infused_iron_hoe" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/infused_iron_hoe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json index c00fb71e..017d290a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pants.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/infused_iron_pants" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/infused_iron_pants" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json index a41533eb..39f208fc 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_pickaxe.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/infused_iron_pickaxe" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/infused_iron_pickaxe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json index fb2bfbb1..e11ed4d9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shoes.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/infused_iron_shoes" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/infused_iron_shoes" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json index 8732d2b6..c6d9cccc 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_shovel.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/infused_iron_shovel" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/infused_iron_shovel" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json b/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json index e9c6eb6d..d9f5848d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_iron_sword.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/infused_iron_sword" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/infused_iron_sword" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_slab.json b/src/generated/resources/assets/naturesaura/models/item/infused_slab.json index 1e19d855..11ab7053 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_slab.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_slab.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_slab" + "parent": "naturesaura:block/infused_slab" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_stairs.json b/src/generated/resources/assets/naturesaura/models/item/infused_stairs.json index 6538fd8d..1425ac3c 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_stairs.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_stairs.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_stairs" + "parent": "naturesaura:block/infused_stairs" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/infused_stone.json b/src/generated/resources/assets/naturesaura/models/item/infused_stone.json index 4a3e59e9..9f4ddbf5 100644 --- a/src/generated/resources/assets/naturesaura/models/item/infused_stone.json +++ b/src/generated/resources/assets/naturesaura/models/item/infused_stone.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/infused_stone" + "parent": "naturesaura:block/infused_stone" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/item_distributor.json b/src/generated/resources/assets/naturesaura/models/item/item_distributor.json index 830c1665..108ca2be 100644 --- a/src/generated/resources/assets/naturesaura/models/item/item_distributor.json +++ b/src/generated/resources/assets/naturesaura/models/item/item_distributor.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/item_distributor" + "parent": "naturesaura:block/item_distributor" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/light_staff.json b/src/generated/resources/assets/naturesaura/models/item/light_staff.json index ef900f30..710d5d98 100644 --- a/src/generated/resources/assets/naturesaura/models/item/light_staff.json +++ b/src/generated/resources/assets/naturesaura/models/item/light_staff.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/light_staff" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/light_staff" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/loot_finder.json b/src/generated/resources/assets/naturesaura/models/item/loot_finder.json index 2e70526a..3c51ebb2 100644 --- a/src/generated/resources/assets/naturesaura/models/item/loot_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/loot_finder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/loot_finder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/loot_finder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/moss_generator.json b/src/generated/resources/assets/naturesaura/models/item/moss_generator.json index 0324dc36..55695fb9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/moss_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/moss_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/moss_generator" + "parent": "naturesaura:block/moss_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/mover_cart.json b/src/generated/resources/assets/naturesaura/models/item/mover_cart.json index 2773a0e8..ec11c3d9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/mover_cart.json +++ b/src/generated/resources/assets/naturesaura/models/item/mover_cart.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/mover_cart" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/mover_cart" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json b/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json index c384346b..d54e9b14 100644 --- a/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json +++ b/src/generated/resources/assets/naturesaura/models/item/multiblock_maker.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/multiblock_maker" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/multiblock_maker" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/nature_altar.json b/src/generated/resources/assets/naturesaura/models/item/nature_altar.json index 53247135..19816e4d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/nature_altar.json +++ b/src/generated/resources/assets/naturesaura/models/item/nature_altar.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/nature_altar" + "parent": "naturesaura:block/nature_altar" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/nether_grass.json b/src/generated/resources/assets/naturesaura/models/item/nether_grass.json index 70052f9f..9c289101 100644 --- a/src/generated/resources/assets/naturesaura/models/item/nether_grass.json +++ b/src/generated/resources/assets/naturesaura/models/item/nether_grass.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/nether_grass" + "parent": "naturesaura:block/nether_grass" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/nether_wart_mushroom.json b/src/generated/resources/assets/naturesaura/models/item/nether_wart_mushroom.json index 984cff3d..6dd6797e 100644 --- a/src/generated/resources/assets/naturesaura/models/item/nether_wart_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/item/nether_wart_mushroom.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/nether_wart_mushroom" + "parent": "naturesaura:block/nether_wart_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/netherite_finder.json b/src/generated/resources/assets/naturesaura/models/item/netherite_finder.json index 3015c619..4fd8abac 100644 --- a/src/generated/resources/assets/naturesaura/models/item/netherite_finder.json +++ b/src/generated/resources/assets/naturesaura/models/item/netherite_finder.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/netherite_finder" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/netherite_finder" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/oak_generator.json b/src/generated/resources/assets/naturesaura/models/item/oak_generator.json index a13d1159..3eba0fa9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/oak_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/oak_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/oak_generator" + "parent": "naturesaura:block/oak_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/offering_table.json b/src/generated/resources/assets/naturesaura/models/item/offering_table.json index 62855d6b..b6acdb8b 100644 --- a/src/generated/resources/assets/naturesaura/models/item/offering_table.json +++ b/src/generated/resources/assets/naturesaura/models/item/offering_table.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/offering_table" + "parent": "naturesaura:block/offering_table" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/pet_reviver.json b/src/generated/resources/assets/naturesaura/models/item/pet_reviver.json index 4d965258..089068a4 100644 --- a/src/generated/resources/assets/naturesaura/models/item/pet_reviver.json +++ b/src/generated/resources/assets/naturesaura/models/item/pet_reviver.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/pet_reviver" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/pet_reviver" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/pickup_stopper.json b/src/generated/resources/assets/naturesaura/models/item/pickup_stopper.json index cde9bd4e..f249be57 100644 --- a/src/generated/resources/assets/naturesaura/models/item/pickup_stopper.json +++ b/src/generated/resources/assets/naturesaura/models/item/pickup_stopper.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/pickup_stopper" + "parent": "naturesaura:block/pickup_stopper" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/placer.json b/src/generated/resources/assets/naturesaura/models/item/placer.json index a7a475a2..cdd18fe7 100644 --- a/src/generated/resources/assets/naturesaura/models/item/placer.json +++ b/src/generated/resources/assets/naturesaura/models/item/placer.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/placer" + "parent": "naturesaura:block/placer" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/potion_generator.json b/src/generated/resources/assets/naturesaura/models/item/potion_generator.json index cbb7764e..a50b94c7 100644 --- a/src/generated/resources/assets/naturesaura/models/item/potion_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/potion_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/potion_generator" + "parent": "naturesaura:block/potion_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/powder_placer.json b/src/generated/resources/assets/naturesaura/models/item/powder_placer.json index d30dad78..0fe3b597 100644 --- a/src/generated/resources/assets/naturesaura/models/item/powder_placer.json +++ b/src/generated/resources/assets/naturesaura/models/item/powder_placer.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/powder_placer" + "parent": "naturesaura:block/powder_placer" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/projectile_generator.json b/src/generated/resources/assets/naturesaura/models/item/projectile_generator.json index e5f64bbf..9a58e465 100644 --- a/src/generated/resources/assets/naturesaura/models/item/projectile_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/projectile_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/projectile_generator" + "parent": "naturesaura:block/projectile_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json b/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json index 6145dabc..6c22d48a 100644 --- a/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json +++ b/src/generated/resources/assets/naturesaura/models/item/range_visualizer.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/range_visualizer" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/range_visualizer" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/rf_converter.json b/src/generated/resources/assets/naturesaura/models/item/rf_converter.json index 88b39036..63f360de 100644 --- a/src/generated/resources/assets/naturesaura/models/item/rf_converter.json +++ b/src/generated/resources/assets/naturesaura/models/item/rf_converter.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/rf_converter" + "parent": "naturesaura:block/rf_converter" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json b/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json index 3718894f..a98ef4ab 100644 --- a/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json +++ b/src/generated/resources/assets/naturesaura/models/item/shockwave_creator.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/shockwave_creator" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/shockwave_creator" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_axe.json b/src/generated/resources/assets/naturesaura/models/item/sky_axe.json index f5cbadb6..07dd2cb1 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_axe.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_axe.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/sky_axe" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/sky_axe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_chest.json b/src/generated/resources/assets/naturesaura/models/item/sky_chest.json index c34515f6..2febce8d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_chest.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_chest.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/sky_chest" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/sky_chest" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json b/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json index 09d2cc6b..30939507 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_helmet.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/sky_helmet" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/sky_helmet" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json b/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json index 0bc1b151..e1b59c10 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_hoe.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/sky_hoe" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/sky_hoe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json b/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json index 96b0e761..0d14fb28 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_ingot.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/sky_ingot" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/sky_ingot" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_pants.json b/src/generated/resources/assets/naturesaura/models/item/sky_pants.json index c3ca0586..7a716ab8 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_pants.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_pants.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/sky_pants" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/sky_pants" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json b/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json index d5eb0e02..95929a2b 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_pickaxe.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/sky_pickaxe" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/sky_pickaxe" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json b/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json index 67e3866f..e720aafa 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_shoes.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/sky_shoes" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/sky_shoes" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json b/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json index ce8bb318..b6119895 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_shovel.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/sky_shovel" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/sky_shovel" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/sky_sword.json b/src/generated/resources/assets/naturesaura/models/item/sky_sword.json index ce001bb6..6b33c553 100644 --- a/src/generated/resources/assets/naturesaura/models/item/sky_sword.json +++ b/src/generated/resources/assets/naturesaura/models/item/sky_sword.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "naturesaura:item/sky_sword" - } + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "naturesaura:item/sky_sword" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/slime_split_generator.json b/src/generated/resources/assets/naturesaura/models/item/slime_split_generator.json index e695ece8..f78924b9 100644 --- a/src/generated/resources/assets/naturesaura/models/item/slime_split_generator.json +++ b/src/generated/resources/assets/naturesaura/models/item/slime_split_generator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/slime_split_generator" + "parent": "naturesaura:block/slime_split_generator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/snow_creator.json b/src/generated/resources/assets/naturesaura/models/item/snow_creator.json index d9dea1c7..ee4d5bee 100644 --- a/src/generated/resources/assets/naturesaura/models/item/snow_creator.json +++ b/src/generated/resources/assets/naturesaura/models/item/snow_creator.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/snow_creator" + "parent": "naturesaura:block/snow_creator" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/spawn_lamp.json b/src/generated/resources/assets/naturesaura/models/item/spawn_lamp.json index c2dc9eb4..78f41b81 100644 --- a/src/generated/resources/assets/naturesaura/models/item/spawn_lamp.json +++ b/src/generated/resources/assets/naturesaura/models/item/spawn_lamp.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/spawn_lamp" + "parent": "naturesaura:block/spawn_lamp" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/spring.json b/src/generated/resources/assets/naturesaura/models/item/spring.json index 11f0e188..62fa95a3 100644 --- a/src/generated/resources/assets/naturesaura/models/item/spring.json +++ b/src/generated/resources/assets/naturesaura/models/item/spring.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/spring" + "parent": "naturesaura:block/spring" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json b/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json index 218fe01c..d7855c88 100644 --- a/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json +++ b/src/generated/resources/assets/naturesaura/models/item/tainted_gold.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/tainted_gold" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/tainted_gold" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json b/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json index 78330ec1..5301c4e1 100644 --- a/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json +++ b/src/generated/resources/assets/naturesaura/models/item/tainted_gold_block.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/tainted_gold_block" + "parent": "naturesaura:block/tainted_gold_block" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/time_changer.json b/src/generated/resources/assets/naturesaura/models/item/time_changer.json index f809a24b..70daebff 100644 --- a/src/generated/resources/assets/naturesaura/models/item/time_changer.json +++ b/src/generated/resources/assets/naturesaura/models/item/time_changer.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/time_changer" + "parent": "naturesaura:block/time_changer" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_anger.json b/src/generated/resources/assets/naturesaura/models/item/token_anger.json index ebe22dc5..7c11d2db 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_anger.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_anger.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_anger" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_anger" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json b/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json index 7abf4df0..ad06abdd 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_euphoria.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_euphoria" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_euphoria" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_fear.json b/src/generated/resources/assets/naturesaura/models/item/token_fear.json index d012e747..285e1949 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_fear.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_fear.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_fear" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_fear" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_grief.json b/src/generated/resources/assets/naturesaura/models/item/token_grief.json index cd526e33..f995fd2d 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_grief.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_grief.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_grief" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_grief" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_joy.json b/src/generated/resources/assets/naturesaura/models/item/token_joy.json index c19bdee6..80e70a68 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_joy.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_joy.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_joy" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_joy" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_rage.json b/src/generated/resources/assets/naturesaura/models/item/token_rage.json index b620dbd6..a4b84f9c 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_rage.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_rage.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_rage" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_rage" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json b/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json index 8f016e85..c5306e34 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_sorrow.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_sorrow" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_sorrow" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/token_terror.json b/src/generated/resources/assets/naturesaura/models/item/token_terror.json index e9d6285e..9c286c13 100644 --- a/src/generated/resources/assets/naturesaura/models/item/token_terror.json +++ b/src/generated/resources/assets/naturesaura/models/item/token_terror.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:item/token_terror" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:item/token_terror" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/warped_aura_mushroom.json b/src/generated/resources/assets/naturesaura/models/item/warped_aura_mushroom.json index 17739487..40cbee92 100644 --- a/src/generated/resources/assets/naturesaura/models/item/warped_aura_mushroom.json +++ b/src/generated/resources/assets/naturesaura/models/item/warped_aura_mushroom.json @@ -1,6 +1,6 @@ { - "parent": "minecraft:item/generated", - "textures": { - "layer0": "naturesaura:block/warped_aura_mushroom" - } + "parent": "minecraft:item/generated", + "textures": { + "layer0": "naturesaura:block/warped_aura_mushroom" + } } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/weather_changer.json b/src/generated/resources/assets/naturesaura/models/item/weather_changer.json index dcfcb413..e48a3c71 100644 --- a/src/generated/resources/assets/naturesaura/models/item/weather_changer.json +++ b/src/generated/resources/assets/naturesaura/models/item/weather_changer.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/weather_changer" + "parent": "naturesaura:block/weather_changer" } \ No newline at end of file diff --git a/src/generated/resources/assets/naturesaura/models/item/wood_stand.json b/src/generated/resources/assets/naturesaura/models/item/wood_stand.json index 78473a2f..fffbe1ce 100644 --- a/src/generated/resources/assets/naturesaura/models/item/wood_stand.json +++ b/src/generated/resources/assets/naturesaura/models/item/wood_stand.json @@ -1,3 +1,3 @@ { - "parent": "naturesaura:block/wood_stand" + "parent": "naturesaura:block/wood_stand" } \ No newline at end of file diff --git a/src/generated/resources/data/curios/tags/items/belt.json b/src/generated/resources/data/curios/tags/items/belt.json index 9eb1a8aa..47b640c4 100644 --- a/src/generated/resources/data/curios/tags/items/belt.json +++ b/src/generated/resources/data/curios/tags/items/belt.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "naturesaura:aura_cache", "naturesaura:aura_trove" diff --git a/src/generated/resources/data/curios/tags/items/charm.json b/src/generated/resources/data/curios/tags/items/charm.json index 72503671..fec975a0 100644 --- a/src/generated/resources/data/curios/tags/items/charm.json +++ b/src/generated/resources/data/curios/tags/items/charm.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "naturesaura:eye", "naturesaura:eye_improved" diff --git a/src/generated/resources/data/curios/tags/items/necklace.json b/src/generated/resources/data/curios/tags/items/necklace.json index 200e0031..34e66ffa 100644 --- a/src/generated/resources/data/curios/tags/items/necklace.json +++ b/src/generated/resources/data/curios/tags/items/necklace.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "naturesaura:shockwave_creator" ] diff --git a/src/generated/resources/data/curios/tags/items/ring.json b/src/generated/resources/data/curios/tags/items/ring.json index 353316b7..9d44b997 100644 --- a/src/generated/resources/data/curios/tags/items/ring.json +++ b/src/generated/resources/data/curios/tags/items/ring.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "naturesaura:death_ring" ] diff --git a/src/generated/resources/data/forge/tags/items/rods/wooden.json b/src/generated/resources/data/forge/tags/items/rods/wooden.json index e1b65a28..391ad93d 100644 --- a/src/generated/resources/data/forge/tags/items/rods/wooden.json +++ b/src/generated/resources/data/forge/tags/items/rods/wooden.json @@ -1,6 +1,5 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_stick" - ] + "values": [ + "naturesaura:ancient_stick" + ] } \ 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/blocks/dirt.json index dafa974f..e0ca8482 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/dirt.json +++ b/src/generated/resources/data/minecraft/tags/blocks/dirt.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "naturesaura:nether_grass" ] diff --git a/src/generated/resources/data/minecraft/tags/blocks/leaves.json b/src/generated/resources/data/minecraft/tags/blocks/leaves.json index e0daf79e..be80f92d 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/leaves.json +++ b/src/generated/resources/data/minecraft/tags/blocks/leaves.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:golden_leaves", - "naturesaura:ancient_leaves", - "naturesaura:decayed_leaves" - ] + "values": [ + "naturesaura:golden_leaves", + "naturesaura:ancient_leaves", + "naturesaura:decayed_leaves" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs.json b/src/generated/resources/data/minecraft/tags/blocks/logs.json index 6941bbcf..6f41cb0f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/logs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/logs.json @@ -1,7 +1,6 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_log", - "naturesaura:ancient_bark" - ] + "values": [ + "naturesaura:ancient_log", + "naturesaura:ancient_bark" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/planks.json b/src/generated/resources/data/minecraft/tags/blocks/planks.json index f2df5aee..a4a4fe54 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/planks.json +++ b/src/generated/resources/data/minecraft/tags/blocks/planks.json @@ -1,6 +1,5 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_planks" - ] + "values": [ + "naturesaura:ancient_planks" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/rails.json b/src/generated/resources/data/minecraft/tags/blocks/rails.json index 20c1cef9..132278a2 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/rails.json +++ b/src/generated/resources/data/minecraft/tags/blocks/rails.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:dimension_rail_end", - "naturesaura:dimension_rail_nether", - "naturesaura:dimension_rail_overworld" - ] + "values": [ + "naturesaura:dimension_rail_end", + "naturesaura:dimension_rail_nether", + "naturesaura:dimension_rail_overworld" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json index 2345391d..147b5230 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_slab", - "naturesaura:infused_slab", - "naturesaura:infused_brick_slab" - ] + "values": [ + "naturesaura:ancient_slab", + "naturesaura:infused_slab", + "naturesaura:infused_brick_slab" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json index a994e8a8..b0a9bdd3 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json +++ b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json @@ -1,7 +1,6 @@ { - "replace": false, - "values": [ - "naturesaura:end_flower", - "naturesaura:aura_bloom" - ] + "values": [ + "naturesaura:end_flower", + "naturesaura:aura_bloom" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json index 0ea5f953..9c2da5f0 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_stairs", - "naturesaura:infused_brick_stairs", - "naturesaura:infused_stairs" - ] + "values": [ + "naturesaura:ancient_stairs", + "naturesaura:infused_brick_stairs", + "naturesaura:infused_stairs" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json b/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json index 3860085e..3d271aea 100644 --- a/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json +++ b/src/generated/resources/data/minecraft/tags/items/cluster_max_harvestables.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "naturesaura:infused_iron_pickaxe", "naturesaura:sky_pickaxe" diff --git a/src/generated/resources/data/minecraft/tags/items/leaves.json b/src/generated/resources/data/minecraft/tags/items/leaves.json index e0daf79e..be80f92d 100644 --- a/src/generated/resources/data/minecraft/tags/items/leaves.json +++ b/src/generated/resources/data/minecraft/tags/items/leaves.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:golden_leaves", - "naturesaura:ancient_leaves", - "naturesaura:decayed_leaves" - ] + "values": [ + "naturesaura:golden_leaves", + "naturesaura:ancient_leaves", + "naturesaura:decayed_leaves" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/logs.json b/src/generated/resources/data/minecraft/tags/items/logs.json index 6941bbcf..6f41cb0f 100644 --- a/src/generated/resources/data/minecraft/tags/items/logs.json +++ b/src/generated/resources/data/minecraft/tags/items/logs.json @@ -1,7 +1,6 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_log", - "naturesaura:ancient_bark" - ] + "values": [ + "naturesaura:ancient_log", + "naturesaura:ancient_bark" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/items/planks.json index f2df5aee..a4a4fe54 100644 --- a/src/generated/resources/data/minecraft/tags/items/planks.json +++ b/src/generated/resources/data/minecraft/tags/items/planks.json @@ -1,6 +1,5 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_planks" - ] + "values": [ + "naturesaura:ancient_planks" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/rails.json b/src/generated/resources/data/minecraft/tags/items/rails.json index 20c1cef9..132278a2 100644 --- a/src/generated/resources/data/minecraft/tags/items/rails.json +++ b/src/generated/resources/data/minecraft/tags/items/rails.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:dimension_rail_end", - "naturesaura:dimension_rail_nether", - "naturesaura:dimension_rail_overworld" - ] + "values": [ + "naturesaura:dimension_rail_end", + "naturesaura:dimension_rail_nether", + "naturesaura:dimension_rail_overworld" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json index 2345391d..147b5230 100644 --- a/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_slab", - "naturesaura:infused_slab", - "naturesaura:infused_brick_slab" - ] + "values": [ + "naturesaura:ancient_slab", + "naturesaura:infused_slab", + "naturesaura:infused_brick_slab" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json index 0ea5f953..9c2da5f0 100644 --- a/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,8 +1,7 @@ { - "replace": false, - "values": [ - "naturesaura:ancient_stairs", - "naturesaura:infused_brick_stairs", - "naturesaura:infused_stairs" - ] + "values": [ + "naturesaura:ancient_stairs", + "naturesaura:infused_brick_stairs", + "naturesaura:infused_stairs" + ] } \ 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_tables/blocks/ancient_bark.json index 160ba8fe..e6dafdca 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:ancient_bark" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json index cecf84c7..c2b294ea 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "naturesaura:ancient_leaves" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "naturesaura:ancient_leaves" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json index 79a326de..80f844fa 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:ancient_log" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json index adb18d6a..fef8f7cd 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:ancient_planks" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json index c3b45cdf..2cc4a01e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:ancient_sapling" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json index 87d4f3cb..f2543c6f 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "naturesaura:ancient_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "naturesaura:ancient_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json index c69d30c1..46c95bdc 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:ancient_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json index 1e5707f0..7b9a73ae 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:animal_container" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json index 72a14fb4..6aeb0579 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:animal_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json index 2fbfa1b9..6ec4e70c 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:animal_spawner" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json index 41eaa577..b916ceb9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_bloom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json index c5485422..779c24bd 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json index 57cf648c..21c29033 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_detector" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json index 894eed50..28a28b42 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json index 29ebda39..40ede75e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_timer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json index 3e2b4c96..1d0b1ddc 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:auto_crafter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json index 0967ca97..bdb41966 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:blast_furnace_booster" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json index aac01cac..4b739d84 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:chorus_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json index c6375f20..500bb390 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:chunk_loader" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json index cb7b0780..d3a6b045 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:conversion_catalyst" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json index 97efc419..c5da10b3 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:crimson_aura_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json index 5647862a..d22723fb 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:crushing_catalyst" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json index 34a68aba..f57dfc11 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json @@ -2,14 +2,7 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "naturesaura:decayed_leaves" - } - ], "conditions": [ { "condition": "minecraft:match_tool", @@ -24,7 +17,14 @@ ] } } - ] + ], + "entries": [ + { + "type": "minecraft:item", + "name": "naturesaura:decayed_leaves" + } + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json index c3f883d4..aa2db254 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:dimension_rail_end" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json index 3f11e8cd..bba34e54 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:dimension_rail_nether" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json index 3a732f68..ce588b83 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:dimension_rail_overworld" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json index f722d982..ec59aabb 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:end_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json index 4554ff53..eb9420f8 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:ender_crate" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json index 481949f3..84b87c21 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:field_creator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json index 943fb779..32a2ad3a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:firework_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json index edb46689..4d1c4eb0 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:flower_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json index 04ebe2bd..1820f593 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:furnace_heater" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json index 027288b0..68766ef6 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:generator_limit_remover" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json index 44e8c5e2..3e22e427 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:gold_brick" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json index 9ce1358f..975ac53a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:gold_nether_brick" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json index 7d3cf618..676d322a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:gold_powder" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json index ba70a981..b08b4687 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json @@ -2,8 +2,13 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "chance": 0.75, + "condition": "minecraft:random_chance" + } + ], "entries": [ { "type": "minecraft:item", @@ -12,8 +17,8 @@ "condition": "minecraft:survives_explosion" }, { - "condition": "minecraft:block_state_property", "block": "naturesaura:golden_leaves", + "condition": "minecraft:block_state_property", "properties": { "stage": "3" } @@ -22,12 +27,7 @@ "name": "naturesaura:gold_leaf" } ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.75 - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json index e6e859fa..7eaa42ed 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:grated_chute" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json index eac0ef2c..042c8263 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:hopper_upgrade" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json index 820c3b53..c9f0ece9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:infused_brick" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json index b880b5fd..6332f446 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "naturesaura:infused_brick_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "naturesaura:infused_brick_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json index f2422d01..667d61f6 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:infused_brick_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json index aeb4a326..c589b107 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:infused_iron_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json index da150adf..eff6ff82 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json @@ -2,25 +2,24 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "conditions": [ { - "condition": "minecraft:block_state_property", "block": "naturesaura:infused_slab", + "condition": "minecraft:block_state_property", "properties": { "type": "double" } } ], "count": 2.0, - "add": false + "function": "minecraft:set_count" }, { "function": "minecraft:explosion_decay" @@ -28,7 +27,8 @@ ], "name": "naturesaura:infused_slab" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json index e0d40947..e91f09e8 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:infused_stairs" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json index bf5b3a9b..f771aba8 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:infused_stone" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json index 94fc2ee3..fcefd336 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:item_distributor" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json index 3da3a59b..38fe9914 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:air" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json index 2a7996e4..d8e67167 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:moss_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json index 8fda32a9..ad3e458d 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:nature_altar" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json index 1a114a61..e9d40aa1 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -46,7 +45,8 @@ } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json index 456be472..8d6575e2 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json @@ -2,7 +2,6 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { @@ -44,20 +43,21 @@ "type": "minecraft:item", "functions": [ { - "function": "minecraft:set_count", + "add": false, "count": { "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 + "max": 2.0, + "min": 1.0 }, - "add": false + "function": "minecraft:set_count" } ], "name": "minecraft:nether_wart" } ] } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json index d1e7ff2e..4febda35 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:oak_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json index 60c9f474..90762319 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:offering_table" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json index aefd999e..d50a170f 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:pickup_stopper" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json index d310baa0..bf5b07c4 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:placer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json index e9379ac2..f7887376 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:potion_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json index 2c4a689a..e60344ed 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_bloom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json index c584c890..92e0009f 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json index a9d91f31..52a46d79 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:aura_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json index 3eded93d..653f6e7a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:crimson_aura_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json index fbb712db..3b8f8f28 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json @@ -2,34 +2,34 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "minecraft:flower_pot" } ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, "conditions": [ { "condition": "minecraft:survives_explosion" } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:warped_aura_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json index ed47d232..d2616781 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:powder_placer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json index 85ee39ae..8b09486a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:projectile_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json index aa6afb7a..0be0549e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:rf_converter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json index 522c0816..1e48cd32 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:slime_split_generator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json index bb4592c3..eaf2a751 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:snow_creator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json index 97c95265..3ac3c69e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:spawn_lamp" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json index 0b7786da..004609ce 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:spring" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json index ff168749..f07247a6 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:tainted_gold_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json index 264a4d91..c5d9e301 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:time_changer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json index 5de5f80b..561e7c98 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:warped_aura_mushroom" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json index bd65e13b..7f1056b4 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:weather_changer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json index 4e589ed4..653cd289 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json @@ -2,19 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1.0, "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "naturesaura:wood_stand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json b/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json index 3fa56033..4e8242d1 100644 --- a/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json +++ b/src/generated/resources/data/naturesaura/tags/blocks/altar_stone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:stone_bricks" ] diff --git a/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json b/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json index 9aa12a78..97fee2c0 100644 --- a/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json +++ b/src/generated/resources/data/naturesaura/tags/blocks/altar_wood.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "#minecraft:planks" ] diff --git a/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json b/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json index bb4977e5..1349e155 100644 --- a/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json +++ b/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_stone.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:nether_bricks" ] diff --git a/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_wood.json b/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_wood.json index 4fec4854..a7bc8138 100644 --- a/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_wood.json +++ b/src/generated/resources/data/naturesaura/tags/blocks/nether_altar_wood.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "minecraft:crimson_planks", "minecraft:warped_planks" diff --git a/src/main/java/de/ellpeck/naturesaura/ModConfig.java b/src/main/java/de/ellpeck/naturesaura/ModConfig.java index a352dbd3..c70ea291 100644 --- a/src/main/java/de/ellpeck/naturesaura/ModConfig.java +++ b/src/main/java/de/ellpeck/naturesaura/ModConfig.java @@ -232,7 +232,7 @@ public final class ModConfig { for (String s : this.additionalProjectiles.get()) { var split = s.split("->"); var name = new ResourceLocation(split[0]); - var type = Objects.requireNonNull(ForgeRegistries.ENTITIES.getValue(name)); + var type = Objects.requireNonNull(ForgeRegistries.ENTITY_TYPES.getValue(name)); var amount = Integer.parseInt(split[1]); NaturesAuraAPI.PROJECTILE_GENERATIONS.put(type, amount); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java index fa46d62c..cecc5250 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAncientSapling.java @@ -3,7 +3,10 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.gen.ModFeatures; -import de.ellpeck.naturesaura.reg.*; +import de.ellpeck.naturesaura.reg.ICustomBlockState; +import de.ellpeck.naturesaura.reg.ICustomItemModel; +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.ModRegistry; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -20,7 +23,7 @@ import net.minecraftforge.event.ForgeEventFactory; import java.util.function.Supplier; -public class BlockAncientSapling extends BushBlock implements BonemealableBlock, IModItem, ICustomBlockState, ICustomItemModel, ICustomRenderType { +public class BlockAncientSapling extends BushBlock implements BonemealableBlock, IModItem, ICustomBlockState, ICustomItemModel { protected static final VoxelShape SHAPE = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 12.0D, 14.0D); @@ -75,16 +78,11 @@ public class BlockAncientSapling extends BushBlock implements BonemealableBlock, @Override public void generateCustomBlockState(BlockStateGenerator generator) { - generator.simpleBlock(this, generator.models().cross(this.getBaseName(), generator.modLoc("block/" + this.getBaseName()))); + generator.simpleBlock(this, generator.models().cross(this.getBaseName(), generator.modLoc("block/" + this.getBaseName())).renderType("cutout_mipped")); } @Override public void generateCustomItemModel(ItemModelGenerator generator) { generator.withExistingParent(this.getBaseName(), "item/generated").texture("layer0", "block/" + this.getBaseName()); } - - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; - } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java index 7b9571ae..907e95b4 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAnimalGenerator.java @@ -10,7 +10,6 @@ import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.reg.ICustomBlockState; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; -import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.npc.Npc; import net.minecraft.world.level.Level; @@ -35,8 +34,8 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali } @SubscribeEvent - public void onLivingUpdate(LivingEvent.LivingUpdateEvent event) { - var entity = event.getEntityLiving(); + public void onLivingUpdate(LivingEvent.LivingTickEvent event) { + var entity = event.getEntity(); if (entity.level.isClientSide || entity.level.getGameTime() % 40 != 0 || !(entity instanceof Animal) || entity instanceof Npc) return; var data = entity.getPersistentData(); @@ -46,7 +45,7 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali @SubscribeEvent public void onEntityDeath(LivingDeathEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (entity.level.isClientSide || !(entity instanceof Animal) || entity instanceof Npc) return; var pos = entity.blockPosition(); @@ -84,14 +83,14 @@ public class BlockAnimalGenerator extends BlockContainerImpl implements IVisuali @SubscribeEvent public void onEntityDrops(LivingDropsEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (entity.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":no_drops")) event.setCanceled(true); } @SubscribeEvent public void onEntityExp(LivingExperienceDropEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (entity.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":no_drops")) event.setCanceled(true); } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java index 84b5b9d1..2d249535 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraBloom.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Arrays; import java.util.function.Supplier; -public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockState, ICustomItemModel, ICustomRenderType, EntityBlock { +public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockState, ICustomItemModel, EntityBlock { protected static final VoxelShape SHAPE = Block.box(5.0D, 0.0D, 5.0D, 11.0D, 10.0D, 11.0D); private final String baseName; @@ -67,7 +67,7 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS @Override public void generateCustomBlockState(BlockStateGenerator generator) { - generator.simpleBlock(this, generator.models().cross(this.getBaseName(), generator.modLoc("block/" + this.getBaseName()))); + generator.simpleBlock(this, generator.models().cross(this.getBaseName(), generator.modLoc("block/" + this.getBaseName())).renderType("cutout")); } @Override @@ -75,11 +75,6 @@ public class BlockAuraBloom extends BushBlock implements IModItem, ICustomBlockS generator.withExistingParent(this.getBaseName(), "item/generated").texture("layer0", "block/" + this.getBaseName()); } - @Override - public Supplier getRenderType() { - return RenderType::cutout; - } - @Override public String getBaseName() { return this.baseName; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java index affa566e..878924eb 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockAuraTimer.java @@ -6,9 +6,7 @@ import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.blocks.tiles.render.RenderAuraTimer; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; -import de.ellpeck.naturesaura.reg.ICustomRenderType; import de.ellpeck.naturesaura.reg.ITESRProvider; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -28,10 +26,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import java.util.Random; -import java.util.function.Supplier; - -public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockState, ITESRProvider, ICustomRenderType { +public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockState, ITESRProvider { private static final VoxelShape SHAPE = Block.box(1, 0, 1, 15, 15, 15); @@ -50,11 +45,6 @@ public class BlockAuraTimer extends BlockContainerImpl implements ICustomBlockSt return BlockAuraTimer.SHAPE; } - @Override - public Supplier getRenderType() { - return RenderType::cutout; - } - @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { builder.add(BlockStateProperties.POWERED); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java index 0b0ce944..088c6ecd 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDecayedLeaves.java @@ -2,8 +2,6 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; -import de.ellpeck.naturesaura.reg.ICustomRenderType; -import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; @@ -12,10 +10,7 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Material; -import java.util.Random; -import java.util.function.Supplier; - -public class BlockDecayedLeaves extends BlockImpl implements ICustomBlockState, ICustomRenderType { +public class BlockDecayedLeaves extends BlockImpl implements ICustomBlockState { public BlockDecayedLeaves() { super("decayed_leaves", Properties.of(Material.LEAVES).strength(0.2F).sound(SoundType.GRASS).noOcclusion().randomTicks()); @@ -32,9 +27,4 @@ public class BlockDecayedLeaves extends BlockImpl implements ICustomBlockState, public void generateCustomBlockState(BlockStateGenerator generator) { generator.simpleBlock(this, generator.models().getExistingFile(generator.modLoc(this.getBaseName()))); } - - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; - } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java index 80eb42c4..96ff9d92 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockDimensionRail.java @@ -38,7 +38,7 @@ import net.minecraftforge.common.util.ITeleporter; import java.util.function.Function; import java.util.function.Supplier; -public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICustomRenderType, ICustomBlockState, ICustomItemModel { +public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICustomBlockState, ICustomItemModel { public static final EnumProperty SHAPE = BlockStateProperties.RAIL_SHAPE; @@ -159,11 +159,6 @@ public class BlockDimensionRail extends BaseRailBlock implements IModItem, ICust return "dimension_rail_" + this.name; } - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; - } - @Override public void generateCustomBlockState(BlockStateGenerator generator) { // noop diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java index 861c4633..70a714a2 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEndFlower.java @@ -6,7 +6,6 @@ import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.reg.*; -import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.world.entity.boss.enderdragon.EnderDragon; @@ -28,14 +27,13 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import javax.annotation.Nullable; import java.util.List; -import java.util.function.Supplier; -public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockState, ICustomItemModel, ICustomRenderType, EntityBlock { +public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockState, ICustomItemModel, EntityBlock { protected static final VoxelShape SHAPE = Block.box(5.0D, 0.0D, 5.0D, 11.0D, 10.0D, 11.0D); @@ -53,8 +51,8 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS } @SubscribeEvent - public void onDragonTick(LivingUpdateEvent event) { - var living = event.getEntityLiving(); + public void onDragonTick(LivingEvent.LivingTickEvent event) { + var living = event.getEntity(); if (living.level.isClientSide || !(living instanceof EnderDragon dragon)) return; if (dragon.dragonDeathTime < 150 || dragon.dragonDeathTime % 10 != 0) @@ -115,16 +113,11 @@ public class BlockEndFlower extends BushBlock implements IModItem, ICustomBlockS @Override public void generateCustomBlockState(BlockStateGenerator generator) { - generator.simpleBlock(this, generator.models().cross(this.getBaseName(), generator.modLoc("block/" + this.getBaseName()))); + generator.simpleBlock(this, generator.models().cross(this.getBaseName(), generator.modLoc("block/" + this.getBaseName())).renderType("cutout")); } @Override public void generateCustomItemModel(ItemModelGenerator generator) { generator.withExistingParent(this.getBaseName(), "item/generated").texture("layer0", "block/" + this.getBaseName()); } - - @Override - public Supplier getRenderType() { - return RenderType::cutout; - } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java index 9c73a4a1..feafa6ee 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockEnderCrate.java @@ -92,7 +92,7 @@ public class BlockEnderCrate extends BlockContainerImpl implements ITESRProvider var tile = levelIn.getBlockEntity(pos); if (tile instanceof BlockEntityEnderCrate crate && crate.canOpen()) { crate.drainAura(2500); - NetworkHooks.openGui((ServerPlayer) player, crate, pos); + NetworkHooks.openScreen((ServerPlayer) player, crate, pos); } } return InteractionResult.SUCCESS; diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java index 6ff66d72..f2fbb748 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFieldCreator.java @@ -5,7 +5,6 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.blocks.tiles.BlockEntityFieldCreator; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; -import de.ellpeck.naturesaura.reg.ICustomRenderType; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; @@ -21,10 +20,9 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import java.util.Random; import java.util.function.Supplier; -public class BlockFieldCreator extends BlockContainerImpl implements ICustomBlockState, ICustomRenderType { +public class BlockFieldCreator extends BlockContainerImpl implements ICustomBlockState { public BlockFieldCreator() { super("field_creator", BlockEntityFieldCreator.class, Properties.of(Material.STONE).strength(2F).noCollission().sound(SoundType.STONE)); @@ -94,8 +92,4 @@ public class BlockFieldCreator extends BlockContainerImpl implements ICustomBloc generator.simpleBlock(this, generator.models().getExistingFile(generator.modLoc(this.getBaseName()))); } - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; - } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerPot.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerPot.java index b269732d..cf9221ac 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerPot.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockFlowerPot.java @@ -1,15 +1,17 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.data.BlockStateGenerator; -import de.ellpeck.naturesaura.reg.*; -import net.minecraft.client.renderer.RenderType; +import de.ellpeck.naturesaura.reg.ICustomBlockState; +import de.ellpeck.naturesaura.reg.IModItem; +import de.ellpeck.naturesaura.reg.INoItemBlock; +import de.ellpeck.naturesaura.reg.ModRegistry; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FlowerPotBlock; import net.minecraftforge.registries.ForgeRegistries; import java.util.function.Supplier; -public class BlockFlowerPot extends FlowerPotBlock implements ICustomBlockState, IModItem, INoItemBlock, ICustomRenderType { +public class BlockFlowerPot extends FlowerPotBlock implements ICustomBlockState, IModItem, INoItemBlock { public BlockFlowerPot(Supplier emptyPot, Supplier block, Properties props) { super(emptyPot, block, props); @@ -18,9 +20,7 @@ public class BlockFlowerPot extends FlowerPotBlock implements ICustomBlockState, @Override public void generateCustomBlockState(BlockStateGenerator generator) { - generator.simpleBlock(this, generator.models() - .withExistingParent(this.getBaseName(), "block/flower_pot_cross") - .texture("plant", "block/" + ForgeRegistries.BLOCKS.getKey(this.getContent()).getPath())); + generator.simpleBlock(this, generator.models().withExistingParent(this.getBaseName(), "block/flower_pot_cross").texture("plant", "block/" + ForgeRegistries.BLOCKS.getKey(this.getContent()).getPath()).renderType("cutout")); } @Override @@ -28,8 +28,4 @@ public class BlockFlowerPot extends FlowerPotBlock implements ICustomBlockState, return "potted_" + ForgeRegistries.BLOCKS.getKey(this.getContent()).getPath(); } - @Override - public Supplier getRenderType() { - return RenderType::cutout; - } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java index eee8501e..2cbe5ca3 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockGoldPowder.java @@ -5,7 +5,6 @@ import de.ellpeck.naturesaura.data.ItemModelGenerator; import de.ellpeck.naturesaura.reg.IColorProvidingBlock; import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ICustomItemModel; -import de.ellpeck.naturesaura.reg.ICustomRenderType; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; @@ -29,7 +28,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import java.util.function.Supplier; -public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, ICustomBlockState, ICustomItemModel, ICustomRenderType { +public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, ICustomBlockState, ICustomItemModel { public static final EnumProperty NORTH = BlockStateProperties.NORTH_REDSTONE; public static final EnumProperty EAST = BlockStateProperties.EAST_REDSTONE; @@ -232,8 +231,4 @@ public class BlockGoldPowder extends BlockImpl implements IColorProvidingBlock, generator.withExistingParent(this.getBaseName(), "item/generated").texture("layer0", "item/" + this.getBaseName()); } - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; - } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java index ea3d6683..ad814165 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockLight.java @@ -3,7 +3,6 @@ package de.ellpeck.naturesaura.blocks; import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.ICustomBlockState; -import de.ellpeck.naturesaura.reg.ICustomRenderType; import de.ellpeck.naturesaura.reg.INoItemBlock; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; @@ -19,10 +18,9 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import java.util.Random; import java.util.function.Supplier; -public class BlockLight extends BlockImpl implements ICustomBlockState, INoItemBlock, ICustomRenderType { +public class BlockLight extends BlockImpl implements ICustomBlockState, INoItemBlock { private static final VoxelShape SHAPE = Block.box(4, 4, 4, 12, 12, 12); @@ -53,11 +51,6 @@ public class BlockLight extends BlockImpl implements ICustomBlockState, INoItemB @Override public void generateCustomBlockState(BlockStateGenerator generator) { generator.simpleBlock(this, generator.models().withExistingParent("light", generator.mcLoc("block/air")) - .texture("particle", "block/light")); - } - - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; + .renderType("cutout_mipped").texture("particle", "block/light")); } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java index d8a0d8a4..c048595c 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockOakGenerator.java @@ -16,7 +16,7 @@ import net.minecraft.world.phys.AABB; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.SaplingGrowTreeEvent; +import net.minecraftforge.event.level.SaplingGrowTreeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; public class BlockOakGenerator extends BlockContainerImpl implements IVisualizable, ICustomBlockState { @@ -29,7 +29,7 @@ public class BlockOakGenerator extends BlockContainerImpl implements IVisualizab @SubscribeEvent public void onTreeGrow(SaplingGrowTreeEvent event) { - var level = event.getWorld(); + var level = event.getLevel(); var pos = event.getPos(); if (level instanceof Level && !level.isClientSide() && IAuraType.forLevel((Level) level).isSimilar(NaturesAuraAPI.TYPE_OVERWORLD) && level.getBlockState(pos).getBlock() instanceof SaplingBlock) { @@ -37,7 +37,7 @@ public class BlockOakGenerator extends BlockContainerImpl implements IVisualizab if (!(tile instanceof BlockEntityOakGenerator)) return false; - var rand = event.getRand(); + var rand = event.getRandomSource(); if (rand.nextInt(10) == 0) ((BlockEntityOakGenerator) tile).scheduledBigTrees.add(pos); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java index 0d7ad46c..cbf8dbcd 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockPickupStopper.java @@ -28,7 +28,7 @@ public class BlockPickupStopper extends BlockContainerImpl implements IVisualiza @SubscribeEvent public void onPickup(EntityItemPickupEvent event) { - var player = event.getPlayer(); + var player = event.getEntity(); if (player != null && !player.isCrouching()) { var item = event.getItem(); var pos = item.blockPosition(); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java index 753f00b7..7dc9bb9d 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSlimeSplitGenerator.java @@ -47,7 +47,7 @@ public class BlockSlimeSplitGenerator extends BlockContainerImpl implements IVis @SubscribeEvent public void onLivingDeath(LivingDeathEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (!(entity instanceof Slime slime) || entity.level.isClientSide) return; var size = slime.getSize(); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java index c1252185..a6c9d55f 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpawnLamp.java @@ -9,7 +9,6 @@ import de.ellpeck.naturesaura.misc.LevelData; import de.ellpeck.naturesaura.packet.PacketHandler; import de.ellpeck.naturesaura.packet.PacketParticles; import de.ellpeck.naturesaura.reg.ICustomBlockState; -import de.ellpeck.naturesaura.reg.ICustomRenderType; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -33,7 +32,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import java.util.function.Supplier; -public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, ICustomBlockState, ICustomRenderType { +public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, ICustomBlockState { private static final VoxelShape SHAPE = Shapes.create(4 / 16F, 0F, 4 / 16F, 12 / 16F, 13 / 16F, 12 / 16F); @@ -51,7 +50,7 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, public void onSpawn(LivingSpawnEvent.CheckSpawn event) { if (event.getSpawner() != null) return; - var level = event.getWorld(); + var level = event.getLevel(); var pos = new BlockPos(event.getX(), event.getY(), event.getZ()); if (!(level instanceof Level)) return; @@ -68,7 +67,7 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, if (!new AABB(lampPos).inflate(range).contains(new Vec3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5))) continue; - var entity = (Mob) event.getEntityLiving(); + var entity = (Mob) event.getEntity(); if (entity.checkSpawnRules(level, event.getSpawnReason()) && entity.checkSpawnObstruction(level)) { var spot = IAuraChunk.getHighestSpot((Level) level, lampPos, 32, lampPos); IAuraChunk.getAuraChunk((Level) level, spot).drainAura(spot, 200); @@ -109,9 +108,4 @@ public class BlockSpawnLamp extends BlockContainerImpl implements IVisualizable, public void generateCustomBlockState(BlockStateGenerator generator) { generator.simpleBlock(this, generator.models().getExistingFile(generator.modLoc(this.getBaseName()))); } - - @Override - public Supplier getRenderType() { - return RenderType::cutoutMipped; - } } diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java index ed7b6b57..650f78a3 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockSpring.java @@ -5,7 +5,6 @@ import de.ellpeck.naturesaura.data.BlockStateGenerator; import de.ellpeck.naturesaura.reg.IColorProvidingBlock; import de.ellpeck.naturesaura.reg.IColorProvidingItem; import de.ellpeck.naturesaura.reg.ICustomBlockState; -import de.ellpeck.naturesaura.reg.ICustomRenderType; import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColor; import net.minecraft.client.color.item.ItemColor; @@ -27,7 +26,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Optional; import java.util.function.Supplier; -public class BlockSpring extends BlockContainerImpl implements ICustomBlockState, IColorProvidingBlock, IColorProvidingItem, BucketPickup, ICustomRenderType { +public class BlockSpring extends BlockContainerImpl implements ICustomBlockState, IColorProvidingBlock, IColorProvidingItem, BucketPickup { public BlockSpring() { super("spring", BlockEntitySpring.class, Properties.copy(Blocks.STONE_BRICKS)); @@ -59,11 +58,6 @@ public class BlockSpring extends BlockContainerImpl implements ICustomBlockState generator.simpleBlock(this, generator.models().getExistingFile(generator.modLoc(this.getBaseName()))); } - @Override - public Supplier getRenderType() { - return RenderType::translucent; - } - @Override public ItemStack pickupBlock(LevelAccessor levelIn, BlockPos pos, BlockState state) { var tile = levelIn.getBlockEntity(pos); diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java index 2af327f1..7254432b 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/BlockWoodStand.java @@ -25,7 +25,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.SaplingGrowTreeEvent; +import net.minecraftforge.event.level.SaplingGrowTreeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.commons.lang3.mutable.MutableObject; @@ -54,7 +54,7 @@ public class BlockWoodStand extends BlockContainerImpl implements ITESRProvider< @SubscribeEvent public void onTreeGrow(SaplingGrowTreeEvent event) { - var level = event.getWorld(); + var level = event.getLevel(); var pos = event.getPos(); if (!level.isClientSide() && level instanceof Level) { if (Multiblocks.TREE_RITUAL.isComplete((Level) level, pos)) { diff --git a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java index 0f758eb6..859633c8 100644 --- a/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java +++ b/src/main/java/de/ellpeck/naturesaura/blocks/tiles/BlockEntityFieldCreator.java @@ -19,7 +19,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.event.level.BlockEvent; public class BlockEntityFieldCreator extends BlockEntityImpl implements ITickableBlockEntity { diff --git a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java index 0a7c683b..98d41f6c 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAnimalSpawner.java @@ -27,7 +27,7 @@ public class ProcessorAnimalSpawner implements IComponentProcessor { } else { return switch (key) { case "name" -> IVariable.wrap(this.recipe.entity.getDescription().getString()); - case "entity" -> IVariable.wrap(ForgeRegistries.ENTITIES.getKey(this.recipe.entity).toString()); + case "entity" -> IVariable.wrap(ForgeRegistries.ENTITY_TYPES.getKey(this.recipe.entity).toString()); case "egg" -> IVariable.from(new ItemStack(ForgeSpawnEggItem.fromEntityType(this.recipe.entity))); default -> null; }; diff --git a/src/main/java/de/ellpeck/naturesaura/data/ModData.java b/src/main/java/de/ellpeck/naturesaura/data/ModData.java index 3bbd65d3..114686f5 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/ModData.java +++ b/src/main/java/de/ellpeck/naturesaura/data/ModData.java @@ -1,8 +1,8 @@ package de.ellpeck.naturesaura.data; +import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModData { diff --git a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java index beb72de1..3432502a 100644 --- a/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java +++ b/src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java @@ -21,6 +21,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.renderer.BiomeColors; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; @@ -29,13 +30,18 @@ import net.minecraft.util.Tuple; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.LeavesBlock; +import net.minecraft.world.level.block.MyceliumBlock; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.phys.BlockHitResult; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.client.event.RenderLevelLastEvent; +import net.minecraftforge.client.event.CustomizeGuiOverlayEvent; +import net.minecraftforge.client.event.RenderGuiOverlayEvent; +import net.minecraftforge.client.event.RenderLevelStageEvent; +import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay; import net.minecraftforge.common.IPlantable; import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.event.TickEvent; @@ -63,7 +69,7 @@ public class ClientEvents { private static BlockPos hoveringAuraSpot; @SubscribeEvent - public void onDebugRender(RenderGameOverlayEvent.Text event) { + public void onDebugRender(CustomizeGuiOverlayEvent.DebugText event) { var mc = Minecraft.getInstance(); if (mc.options.renderDebug && ModConfig.instance.debugText.get()) { var prefix = ChatFormatting.GREEN + "[" + NaturesAura.MOD_NAME + "]" + ChatFormatting.RESET + " "; @@ -159,7 +165,9 @@ public class ClientEvents { } @SubscribeEvent - public void onLevelRender(RenderLevelLastEvent event) { + public void onLevelRender(RenderLevelStageEvent event) { + if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_PARTICLES) + return; var mc = Minecraft.getInstance(); var view = mc.gameRenderer.getMainCamera().getPosition(); var tesselator = Tesselator.getInstance(); @@ -174,6 +182,8 @@ public class ClientEvents { mv.translate(-view.x, -view.y, -view.z); RenderSystem.applyModelViewMatrix(); RenderSystem.enableBlend(); + RenderSystem.setShader(GameRenderer::getPositionColorShader); + RenderSystem.setShaderColor(1, 1, 1, 1); // aura spot debug ClientEvents.hoveringAuraSpot = null; @@ -238,10 +248,10 @@ public class ClientEvents { } @SubscribeEvent - public void onOverlayRender(RenderGameOverlayEvent.Post event) { + public void onOverlayRender(RenderGuiOverlayEvent.Post event) { var mc = Minecraft.getInstance(); var stack = event.getPoseStack(); - if (event.getType() == RenderGameOverlayEvent.ElementType.ALL) { + if (event.getOverlay() == VanillaGuiOverlay.HOTBAR.type()) { var res = event.getWindow(); if (mc.player != null) { if (!ClientEvents.heldCache.isEmpty()) { diff --git a/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java b/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java index 5ae323aa..6facda32 100644 --- a/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java +++ b/src/main/java/de/ellpeck/naturesaura/events/CommonEvents.java @@ -23,9 +23,9 @@ import net.minecraft.world.level.chunk.LevelChunk; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.level.ChunkEvent; +import net.minecraftforge.event.level.ChunkWatchEvent; import net.minecraftforge.event.server.ServerStartingEvent; -import net.minecraftforge.event.world.ChunkEvent; -import net.minecraftforge.event.world.ChunkWatchEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; import net.minecraftforge.registries.ForgeRegistries; @@ -64,7 +64,7 @@ public class CommonEvents { @SubscribeEvent public void onItemUse(PlayerInteractEvent.RightClickBlock event) { - var player = event.getPlayer(); + var player = event.getEntity(); if (player.level.isClientSide) return; var held = event.getItemStack(); @@ -79,12 +79,12 @@ public class CommonEvents { @SubscribeEvent @SuppressWarnings("unchecked") - public void onLevelTick(TickEvent.WorldTickEvent event) { - if (!event.world.isClientSide && event.phase == TickEvent.Phase.END) { - if (event.world.getGameTime() % 20 == 0) { - event.world.getProfiler().push(NaturesAura.MOD_ID + ":onLevelTick"); + public void onLevelTick(TickEvent.LevelTickEvent event) { + if (!event.level.isClientSide && event.phase == TickEvent.Phase.END) { + if (event.level.getGameTime() % 20 == 0) { + event.level.getProfiler().push(NaturesAura.MOD_ID + ":onLevelTick"); try { - var manager = ((ServerChunkCache) event.world.getChunkSource()).chunkMap; + var manager = ((ServerChunkCache) event.level.getChunkSource()).chunkMap; var chunks = (Iterable) CommonEvents.GET_LOADED_CHUNKS_METHOD.invoke(manager); for (var holder : chunks) { var chunk = holder.getTickingChunk(); @@ -97,7 +97,7 @@ public class CommonEvents { } catch (IllegalAccessException | InvocationTargetException e) { NaturesAura.LOGGER.fatal(e); } - event.world.getProfiler().pop(); + event.level.getProfiler().pop(); } } } diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java index 1215bde3..d8fe5283 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraBottle.java @@ -104,7 +104,7 @@ public class ItemAuraBottle extends ItemImpl implements IColorProvidingItem, ICu var held = event.getItemStack(); if (held.isEmpty() || held.getItem() != ModItems.BOTTLE_TWO_THE_REBOTTLING) return; - var player = event.getPlayer(); + var player = event.getEntity(); HitResult ray = Item.getPlayerPOVHitResult(player.level, player, ClipContext.Fluid.NONE); if (ray.getType() == HitResult.Type.BLOCK) return; diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java b/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java index 71072f4a..9f150dfe 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemBreakPrevention.java @@ -40,7 +40,7 @@ public class ItemBreakPrevention extends ItemImpl { @SubscribeEvent public void onBreakSpeed(PlayerEvent.BreakSpeed event) { - var player = event.getPlayer(); + var player = event.getEntity(); if (player == null) return; var stack = player.getMainHandItem(); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java b/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java index ab949f51..db5add4a 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemDeathRing.java @@ -24,7 +24,7 @@ public class ItemDeathRing extends ItemImpl { @SubscribeEvent public void onDeath(LivingDeathEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (!entity.level.isClientSide && entity instanceof Player) { var equipped = Helper.getEquippedItem(s -> s.getItem() == ModItems.DEATH_RING, (Player) entity); if (!equipped.isEmpty()) { diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java b/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java index 2cd65d64..c0d5e539 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemEnderAccess.java @@ -42,7 +42,7 @@ public class ItemEnderAccess extends ItemImpl { var name = BlockEnderCrate.getEnderName(stack); if (!Strings.isNullOrEmpty(name)) { if (!levelIn.isClientSide && NaturesAuraAPI.instance().extractAuraFromPlayer(playerIn, 10000, false)) { - NetworkHooks.openGui((ServerPlayer) playerIn, new MenuProvider() { + NetworkHooks.openScreen((ServerPlayer) playerIn, new MenuProvider() { @Override public Component getDisplayName() { return Component.translatable("info." + NaturesAura.MOD_ID + ".ender_access", ChatFormatting.ITALIC + name + ChatFormatting.RESET); diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java b/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java index 286bea58..33c29aaa 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemPetReviver.java @@ -31,8 +31,8 @@ public class ItemPetReviver extends ItemImpl { private static class Events { @SubscribeEvent - public void onEntityTick(LivingEvent.LivingUpdateEvent event) { - var entity = event.getEntityLiving(); + public void onEntityTick(LivingEvent.LivingTickEvent event) { + var entity = event.getEntity(); if (entity.level.isClientSide || entity.level.getGameTime() % 20 != 0 || !(entity instanceof TamableAnimal tameable)) return; if (!tameable.isTame() || !tameable.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":pet_reviver")) @@ -57,7 +57,7 @@ public class ItemPetReviver extends ItemImpl { return; if (target.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":pet_reviver")) return; - var stack = event.getPlayer().getItemInHand(event.getHand()); + var stack = event.getEntity().getItemInHand(event.getHand()); if (stack.getItem() != ModItems.PET_REVIVER) return; target.getPersistentData().putBoolean(NaturesAura.MOD_ID + ":pet_reviver", true); @@ -70,7 +70,7 @@ public class ItemPetReviver extends ItemImpl { // we want to be sure that the pet is really dying, so we want to receive the event last @SubscribeEvent(priority = EventPriority.LOWEST) public void onLivingDeath(LivingDeathEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (entity.level.isClientSide || !(entity instanceof TamableAnimal tameable)) return; if (!tameable.isTame() || !tameable.getPersistentData().getBoolean(NaturesAura.MOD_ID + ":pet_reviver")) diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java b/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java index b3451608..667af83c 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java +++ b/src/main/java/de/ellpeck/naturesaura/items/ItemRangeVisualizer.java @@ -85,9 +85,9 @@ public class ItemRangeVisualizer extends ItemImpl { if (entity instanceof IVisualizable) { if (entity.level.isClientSide) { var dim = entity.level.dimension().location(); - ItemRangeVisualizer.visualize(event.getPlayer(), ItemRangeVisualizer.VISUALIZED_ENTITIES, dim, entity); + ItemRangeVisualizer.visualize(event.getEntity(), ItemRangeVisualizer.VISUALIZED_ENTITIES, dim, entity); } - event.getPlayer().swing(event.getHand()); + event.getEntity().swing(event.getHand()); event.setCancellationResult(InteractionResult.SUCCESS); event.setCanceled(true); } 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 87837a9d..2a28e1ba 100644 --- a/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java +++ b/src/main/java/de/ellpeck/naturesaura/items/tools/ItemArmor.java @@ -68,7 +68,7 @@ public class ItemArmor extends ArmorItem implements IModItem { @SubscribeEvent public static void onAttack(LivingAttackEvent event) { - var entity = event.getEntityLiving(); + var entity = event.getEntity(); if (!entity.level.isClientSide) { if (!ItemArmor.isFullSetEquipped(entity, ModArmorMaterial.INFUSED)) return; diff --git a/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java b/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java index 24180a26..3fbc1dcb 100644 --- a/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java +++ b/src/main/java/de/ellpeck/naturesaura/potion/PotionBreathless.java @@ -21,7 +21,7 @@ public class PotionBreathless extends PotionImpl { @SubscribeEvent public void onHeal(LivingHealEvent event) { - var effect = event.getEntityLiving().getEffect(this); + var effect = event.getEntity().getEffect(this); if (effect == null) return; var chance = (effect.getAmplifier() + 1) / 15F; diff --git a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java index 87dbf7c9..264693dd 100644 --- a/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/naturesaura/proxy/ClientProxy.java @@ -1,6 +1,7 @@ package de.ellpeck.naturesaura.proxy; import de.ellpeck.naturesaura.NaturesAura; +import de.ellpeck.naturesaura.blocks.ModBlocks; import de.ellpeck.naturesaura.compat.Compat; import de.ellpeck.naturesaura.entities.ModEntities; import de.ellpeck.naturesaura.entities.render.RenderEffectInhibitor; @@ -13,12 +14,16 @@ import de.ellpeck.naturesaura.items.ItemColorChanger; import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.particles.ParticleHandler; import de.ellpeck.naturesaura.particles.ParticleMagic; -import de.ellpeck.naturesaura.reg.*; +import de.ellpeck.naturesaura.reg.IColorProvidingBlock; +import de.ellpeck.naturesaura.reg.IColorProvidingItem; +import de.ellpeck.naturesaura.reg.ITESRProvider; +import de.ellpeck.naturesaura.reg.ModRegistry; import de.ellpeck.naturesaura.renderers.PlayerLayerTrinkets; import de.ellpeck.naturesaura.renderers.SupporterFancyHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.ItemBlockRenderTypes; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.client.renderer.entity.ThrownItemRenderer; @@ -71,10 +76,8 @@ public class ClientProxy implements IProxy { @Override public void postInit(FMLCommonSetupEvent event) { - for (var item : ModRegistry.ALL_ITEMS) { - if (item instanceof ICustomRenderType) - ItemBlockRenderTypes.setRenderLayer((Block) item, ((ICustomRenderType) item).getRenderType().get()); - } + // TODO this uses a vanilla model so we can't just add the json entry to it + ItemBlockRenderTypes.setRenderLayer(ModBlocks.GOLD_POWDER, RenderType.cutoutMipped()); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java b/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java index 9b180e23..4b76710e 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java +++ b/src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java @@ -64,7 +64,7 @@ public class AnimalSpawnerRecipe extends ModRecipe { for (var e : json.getAsJsonArray("ingredients")) ingredients.add(Ingredient.fromJson(e)); return new AnimalSpawnerRecipe(recipeId, - ForgeRegistries.ENTITIES.getValue(new ResourceLocation(json.get("entity").getAsString())), + ForgeRegistries.ENTITY_TYPES.getValue(new ResourceLocation(json.get("entity").getAsString())), json.get("aura").getAsInt(), json.get("time").getAsInt(), ingredients.toArray(new Ingredient[0])); @@ -78,7 +78,7 @@ public class AnimalSpawnerRecipe extends ModRecipe { ings[i] = Ingredient.fromNetwork(buffer); return new AnimalSpawnerRecipe( recipeId, - ForgeRegistries.ENTITIES.getValue(buffer.readResourceLocation()), + ForgeRegistries.ENTITY_TYPES.getValue(buffer.readResourceLocation()), buffer.readInt(), buffer.readInt(), ings); @@ -89,7 +89,7 @@ public class AnimalSpawnerRecipe extends ModRecipe { buffer.writeInt(recipe.ingredients.length); for (var ing : recipe.ingredients) ing.toNetwork(buffer); - buffer.writeResourceLocation(ForgeRegistries.ENTITIES.getKey(recipe.entity)); + buffer.writeResourceLocation(ForgeRegistries.ENTITY_TYPES.getKey(recipe.entity)); buffer.writeInt(recipe.aura); buffer.writeInt(recipe.time); } diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ICustomRenderType.java b/src/main/java/de/ellpeck/naturesaura/reg/ICustomRenderType.java deleted file mode 100644 index 73737c6c..00000000 --- a/src/main/java/de/ellpeck/naturesaura/reg/ICustomRenderType.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.ellpeck.naturesaura.reg; - -import net.minecraft.client.renderer.RenderType; - -import java.util.function.Supplier; - -public interface ICustomRenderType { - - Supplier getRenderType(); -} diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java index 9d4f4875..3dc77385 100644 --- a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java +++ b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java @@ -227,7 +227,7 @@ public final class ModRegistry { Helper.populateObjectHolders(ModPotions.class, event.getForgeRegistry()); }); - event.register(ForgeRegistries.Keys.CONTAINER_TYPES, h -> { + event.register(ForgeRegistries.Keys.MENU_TYPES, h -> { h.register(new ResourceLocation(NaturesAura.MOD_ID, "ender_crate"), IForgeMenuType.create((windowId, inv, data) -> { var tile = inv.player.level.getBlockEntity(data.readBlockPos()); if (tile instanceof BlockEntityEnderCrate crate) diff --git a/src/main/resources/assets/naturesaura/models/block/aura_timer.json b/src/main/resources/assets/naturesaura/models/block/aura_timer.json index b46c4aa4..2f78e2e2 100644 --- a/src/main/resources/assets/naturesaura/models/block/aura_timer.json +++ b/src/main/resources/assets/naturesaura/models/block/aura_timer.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "render_type": "cutout", "textures": { "0": "naturesaura:block/aura_timer_base", "1": "naturesaura:block/aura_timer_glass_top", diff --git a/src/main/resources/assets/naturesaura/models/block/decayed_leaves.json b/src/main/resources/assets/naturesaura/models/block/decayed_leaves.json index cfb30133..dedd76c5 100644 --- a/src/main/resources/assets/naturesaura/models/block/decayed_leaves.json +++ b/src/main/resources/assets/naturesaura/models/block/decayed_leaves.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/leaves", + "render_type": "cutout_mipped", "textures": { "all": "naturesaura:block/decayed_leaves" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_end.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_end.json index 2f654652..3c0a1fb2 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_end.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_end.json @@ -1,5 +1,6 @@ { "parent": "block/rail_flat", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_end" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_ne.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_ne.json index 039b748d..225c8aeb 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_ne.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_ne.json @@ -1,5 +1,6 @@ { "parent": "block/template_rail_raised_ne", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_end" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_sw.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_sw.json index a2887495..02148e99 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_sw.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_end_raised_sw.json @@ -1,5 +1,6 @@ { "parent": "block/template_rail_raised_sw", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_end" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether.json index 339a1d28..5cb13ed2 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether.json @@ -1,5 +1,6 @@ { "parent": "block/rail_flat", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_nether" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_ne.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_ne.json index 42f96230..7dc83025 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_ne.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_ne.json @@ -1,5 +1,6 @@ { "parent": "block/template_rail_raised_ne", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_nether" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_sw.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_sw.json index c96e5319..0f572203 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_sw.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_nether_raised_sw.json @@ -1,5 +1,6 @@ { "parent": "block/template_rail_raised_sw", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_nether" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld.json index d71c967a..cffe27e5 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld.json @@ -1,5 +1,6 @@ { "parent": "block/rail_flat", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_overworld" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_ne.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_ne.json index eb30bd86..3b5cf631 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_ne.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_ne.json @@ -1,5 +1,6 @@ { "parent": "block/template_rail_raised_ne", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_overworld" } diff --git a/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_sw.json b/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_sw.json index 4396bf8a..935e8b94 100644 --- a/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_sw.json +++ b/src/main/resources/assets/naturesaura/models/block/dimension_rail_overworld_raised_sw.json @@ -1,5 +1,6 @@ { "parent": "block/template_rail_raised_sw", + "render_type": "cutout_mipped", "textures": { "rail": "naturesaura:block/dimension_rail_overworld" } diff --git a/src/main/resources/assets/naturesaura/models/block/field_creator.json b/src/main/resources/assets/naturesaura/models/block/field_creator.json index 35dcfa80..bc4281fe 100644 --- a/src/main/resources/assets/naturesaura/models/block/field_creator.json +++ b/src/main/resources/assets/naturesaura/models/block/field_creator.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/block", + "render_type": "cutout_mipped", "textures": { "texture": "naturesaura:block/field_creator", "center": "naturesaura:block/field_creator_center", diff --git a/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json b/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json index 47753d32..25676976 100644 --- a/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json +++ b/src/main/resources/assets/naturesaura/models/block/spawn_lamp.json @@ -1,6 +1,7 @@ { "__comment": "Model contributed by PolarizedIons <3", "parent": "minecraft:block/block", + "render_type": "cutout_mipped", "textures": { "0": "naturesaura:block/spawn_lamp", "-1": "naturesaura:block/spawn_lamp", diff --git a/src/main/resources/assets/naturesaura/models/block/spring.json b/src/main/resources/assets/naturesaura/models/block/spring.json index e2dba648..5d907f77 100644 --- a/src/main/resources/assets/naturesaura/models/block/spring.json +++ b/src/main/resources/assets/naturesaura/models/block/spring.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/block", + "render_type": "translucent", "ambientocclusion": false, "textures": { "particle": "naturesaura:block/spring",