From 8318818a5aa7125008107fca8b646b8e05aba5bb Mon Sep 17 00:00:00 2001 From: lucaargolo Date: Sat, 11 Jan 2025 07:13:52 -0300 Subject: [PATCH] more 1.21 port finally --- .gitignore | 2 + build.gradle.kts | 16 +--- gradle.properties | 14 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../57d693d5a5164e98778a1b02a20274468c444f42 | 59 ++++++++++++++ .../blocks/basalt_generator_mk1.json | 13 ++-- .../blocks/basalt_generator_mk2.json | 13 ++-- .../blocks/basalt_generator_mk3.json | 13 ++-- .../blocks/basalt_generator_mk4.json | 13 ++-- .../blocks/basalt_generator_mk5.json | 13 ++-- .../kibe/loot_table}/blocks/big_torch.json | 13 ++-- .../loot_table}/blocks/black_elevator.json | 13 ++-- .../loot_table}/blocks/blue_elevator.json | 13 ++-- .../data/kibe/loot_table}/blocks/breaker.json | 13 ++-- .../loot_table}/blocks/brown_elevator.json | 13 ++-- .../kibe/loot_table}/blocks/chunk_loader.json | 13 ++-- .../blocks/cobblestone_generator_mk1.json | 13 ++-- .../blocks/cobblestone_generator_mk2.json | 13 ++-- .../blocks/cobblestone_generator_mk3.json | 13 ++-- .../blocks/cobblestone_generator_mk4.json | 13 ++-- .../blocks/cobblestone_generator_mk5.json | 13 ++-- .../data/kibe/loot_table/blocks/cooler.json | 29 +++++++ .../kibe/loot_table/blocks/cursed_dirt.json | 20 +++++ .../loot_table}/blocks/cyan_elevator.json | 13 ++-- .../kibe/loot_table}/blocks/dehumidifier.json | 13 ++-- .../loot_table}/blocks/diamond_spikes.json | 13 ++-- .../kibe/loot_table}/blocks/drawbridge.json | 13 ++-- .../loot_table/blocks/entangled_chest.json | 29 +++++++ .../loot_table/blocks/entangled_tank.json | 29 +++++++ .../blocks/express_conveyor_belt.json | 13 ++-- .../blocks/fast_conveyor_belt.json | 13 ++-- .../kibe/loot_table}/blocks/fluid_hopper.json | 20 ++--- .../kibe/loot_table}/blocks/gold_spikes.json | 13 ++-- .../loot_table}/blocks/gray_elevator.json | 13 ++-- .../loot_table}/blocks/green_elevator.json | 13 ++-- .../data/kibe/loot_table}/blocks/heater.json | 13 ++-- .../data/kibe/loot_table}/blocks/igniter.json | 13 ++-- .../kibe/loot_table}/blocks/iron_spikes.json | 13 ++-- .../blocks/light_blue_elevator.json | 13 ++-- .../blocks/light_gray_elevator.json | 13 ++-- .../kibe/loot_table/blocks/light_source.json} | 15 ++-- .../loot_table}/blocks/lime_elevator.json | 13 ++-- .../loot_table}/blocks/magenta_elevator.json | 13 ++-- .../loot_table}/blocks/obsidian_sand.json | 13 ++-- .../loot_table}/blocks/orange_elevator.json | 13 ++-- .../loot_table}/blocks/pink_elevator.json | 13 ++-- .../data/kibe/loot_table}/blocks/placer.json | 13 ++-- .../loot_table}/blocks/purple_elevator.json | 13 ++-- .../kibe/loot_table}/blocks/red_elevator.json | 13 ++-- .../loot_table}/blocks/redstone_timer.json | 13 ++-- .../blocks/regular_conveyor_belt.json | 13 ++-- .../kibe/loot_table}/blocks/stone_spikes.json | 13 ++-- .../data/kibe/loot_table/blocks/tank.json | 29 +++++++ .../kibe/loot_table}/blocks/trash_can.json | 13 ++-- .../loot_table}/blocks/vacuum_hopper.json | 13 ++-- .../loot_table}/blocks/white_elevator.json | 13 ++-- .../loot_table}/blocks/wither_builder.json | 13 ++-- .../blocks/wither_proof_block.json | 13 ++-- .../blocks/wither_proof_glass.json | 13 ++-- .../loot_table}/blocks/wither_proof_sand.json | 13 ++-- .../kibe/loot_table}/blocks/xp_drain.json | 13 ++-- .../kibe/loot_table}/blocks/xp_shower.json | 13 ++-- .../loot_table}/blocks/yellow_elevator.json | 13 ++-- .../kibe/mixed/LivingEntityMixed.java | 7 ++ .../kibe/mixed/PlayerEntityMixed.java | 2 +- .../kibe/mixin/LivingEntityMixin.java | 32 +++++++- .../kibe/mixin/LivingEntityRendererMixin.java | 4 +- .../kibe/mixin/PlayerEntityMixin.java | 2 +- .../lucaargolo/kibe/block/BlockCompendium.kt | 2 +- .../lucaargolo/kibe/block/CursedDirt.kt | 24 ++---- .../kibe/blockentity/CoolerBlockEntity.kt | 9 +++ .../kibe/blockentity/DrawbridgeBlockEntity.kt | 9 ++- .../kibe/blockentity/TankBlockEntity.kt | 7 ++ .../client/screen/BlockGeneratorScreen.kt | 2 +- .../kibe/compat/TrinketAbilityRing.kt | 4 +- .../kibe/datagen/KibeBlockLootProvider.kt | 41 ++++++++++ .../lucaargolo/kibe/datagen/KibeDatagen.kt | 13 ++++ .../lucaargolo/kibe/item/AbilityRing.kt | 4 +- .../lucaargolo/kibe/item/BooleanItem.kt | 2 +- .../lucaargolo/kibe/item/CoolerBlockItem.kt | 4 +- .../kibe/menu/CoolerBlockItemScreenHandler.kt | 3 +- .../kibe/utils/GenericCompendium.kt | 3 +- .../data/kibe/loot_tables/blocks/cooler.json | 32 -------- .../loot_tables/blocks/entangled_chest.json | 77 ------------------- .../loot_tables/blocks/entangled_tank.json | 77 ------------------- .../data/kibe/loot_tables/blocks/tank.json | 37 --------- .../kibe/{recipes => recipe}/angel_ring.json | 0 .../basalt_generator_mk1.json | 0 .../basalt_generator_mk2.json | 0 .../basalt_generator_mk3.json | 0 .../basalt_generator_mk4.json | 0 .../basalt_generator_mk5.json | 0 .../kibe/{recipes => recipe}/big_torch.json | 0 .../{recipes => recipe}/black_elevator.json | 0 .../black_elevator_from_elevator.json | 0 .../{recipes => recipe}/black_glider.json | 0 .../kibe/{recipes => recipe}/black_rune.json | 0 .../black_rune_from_rune.json | 0 .../black_sleeping_bag.json | 0 .../black_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/blue_elevator.json | 0 .../blue_elevator_from_elevator.json | 0 .../kibe/{recipes => recipe}/blue_glider.json | 0 .../kibe/{recipes => recipe}/blue_rune.json | 0 .../blue_rune_from_rune.json | 0 .../blue_sleeping_bag.json | 0 .../blue_sleeping_bag_from_sleeping_bag.json | 0 .../kibe/{recipes => recipe}/breaker.json | 0 .../{recipes => recipe}/brown_elevator.json | 0 .../brown_elevator_from_elevator.json | 0 .../{recipes => recipe}/brown_glider.json | 0 .../kibe/{recipes => recipe}/brown_rune.json | 0 .../brown_rune_from_rune.json | 0 .../brown_sleeping_bag.json | 0 .../brown_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/chunk_loader.json | 0 .../cobblestone_generator_mk1.json | 0 .../cobblestone_generator_mk2.json | 0 .../cobblestone_generator_mk3.json | 0 .../cobblestone_generator_mk4.json | 0 .../cobblestone_generator_mk5.json | 0 .../data/kibe/{recipes => recipe}/cooler.json | 0 .../kibe/{recipes => recipe}/cursed_kibe.json | 0 .../{recipes => recipe}/cursed_lasso.json | 0 .../{recipes => recipe}/cursed_seeds.json | 0 .../{recipes => recipe}/cyan_elevator.json | 0 .../cyan_elevator_from_elevator.json | 0 .../kibe/{recipes => recipe}/cyan_glider.json | 0 .../kibe/{recipes => recipe}/cyan_rune.json | 0 .../cyan_rune_from_rune.json | 0 .../cyan_sleeping_bag.json | 0 .../cyan_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/dehumidifier.json | 0 .../{recipes => recipe}/diamond_kibe.json | 0 .../{recipes => recipe}/diamond_lasso.json | 0 .../{recipes => recipe}/diamond_ring.json | 0 .../{recipes => recipe}/diamond_spikes.json | 0 .../kibe/{recipes => recipe}/drawbridge.json | 0 .../{recipes => recipe}/entangled_bag.json | 0 .../{recipes => recipe}/entangled_bucket.json | 0 .../{recipes => recipe}/entangled_chest.json | 0 .../{recipes => recipe}/entangled_tank.json | 0 .../kibe/{recipes => recipe}/escape_rope.json | 0 .../experience_bottle.json | 0 .../express_conveyor_belt.json | 0 .../fast_conveyor_belt.json | 0 .../{recipes => recipe}/fluid_hopper.json | 0 .../{recipes => recipe}/glider_left_wing.json | 0 .../glider_left_wing_from_right.json | 0 .../glider_right_wing.json | 0 .../glider_right_wing_from_left.json | 0 .../kibe/{recipes => recipe}/gold_spikes.json | 0 .../kibe/{recipes => recipe}/golden_kibe.json | 0 .../{recipes => recipe}/golden_lasso.json | 0 .../{recipes => recipe}/gray_elevator.json | 0 .../gray_elevator_from_elevator.json | 0 .../kibe/{recipes => recipe}/gray_glider.json | 0 .../kibe/{recipes => recipe}/gray_rune.json | 0 .../gray_rune_from_rune.json | 0 .../gray_sleeping_bag.json | 0 .../gray_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/green_elevator.json | 0 .../green_elevator_from_elevator.json | 0 .../{recipes => recipe}/green_glider.json | 0 .../kibe/{recipes => recipe}/green_rune.json | 0 .../green_rune_from_rune.json | 0 .../green_sleeping_bag.json | 0 .../green_sleeping_bag_from_sleeping_bag.json | 0 .../data/kibe/{recipes => recipe}/heater.json | 0 .../kibe/{recipes => recipe}/igniter.json | 0 .../kibe/{recipes => recipe}/iron_spikes.json | 0 .../data/kibe/{recipes => recipe}/kibe.json | 0 .../light_blue_elevator.json | 0 .../light_blue_elevator_from_elevator.json | 0 .../light_blue_glider.json | 0 .../{recipes => recipe}/light_blue_rune.json | 0 .../light_blue_rune_from_rune.json | 0 .../light_blue_sleeping_bag.json | 0 ...t_blue_sleeping_bag_from_sleeping_bag.json | 0 .../light_gray_elevator.json | 0 .../light_gray_elevator_from_elevator.json | 0 .../light_gray_glider.json | 0 .../{recipes => recipe}/light_gray_rune.json | 0 .../light_gray_rune_from_rune.json | 0 .../light_gray_sleeping_bag.json | 0 ...t_gray_sleeping_bag_from_sleeping_bag.json | 0 .../kibe/{recipes => recipe}/light_ring.json | 0 .../{recipes => recipe}/lime_elevator.json | 0 .../lime_elevator_from_elevator.json | 0 .../kibe/{recipes => recipe}/lime_glider.json | 0 .../kibe/{recipes => recipe}/lime_rune.json | 0 .../lime_rune_from_rune.json | 0 .../lime_sleeping_bag.json | 0 .../lime_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/liquid_xp_bucket.json | 0 .../{recipes => recipe}/magenta_elevator.json | 0 .../magenta_elevator_from_elevator.json | 0 .../{recipes => recipe}/magenta_glider.json | 0 .../{recipes => recipe}/magenta_rune.json | 0 .../magenta_rune_from_rune.json | 0 .../magenta_sleeping_bag.json | 0 ...agenta_sleeping_bag_from_sleeping_bag.json | 0 .../kibe/{recipes => recipe}/magma_ring.json | 0 .../data/kibe/{recipes => recipe}/magnet.json | 0 .../{recipes => recipe}/measuring_tape.json | 0 .../{recipes => recipe}/obsidian_sand.json | 0 .../{recipes => recipe}/orange_elevator.json | 0 .../orange_elevator_from_elevator.json | 0 .../{recipes => recipe}/orange_glider.json | 0 .../kibe/{recipes => recipe}/orange_rune.json | 0 .../orange_rune_from_rune.json | 0 .../orange_sleeping_bag.json | 0 ...orange_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/pink_elevator.json | 0 .../pink_elevator_from_elevator.json | 0 .../kibe/{recipes => recipe}/pink_glider.json | 0 .../kibe/{recipes => recipe}/pink_rune.json | 0 .../pink_rune_from_rune.json | 0 .../pink_sleeping_bag.json | 0 .../pink_sleeping_bag_from_sleeping_bag.json | 0 .../data/kibe/{recipes => recipe}/placer.json | 0 .../pocket_crafting_table.json | 0 .../{recipes => recipe}/pocket_trash_can.json | 0 .../{recipes => recipe}/purple_elevator.json | 0 .../purple_elevator_from_elevator.json | 0 .../{recipes => recipe}/purple_glider.json | 0 .../kibe/{recipes => recipe}/purple_rune.json | 0 .../purple_rune_from_rune.json | 0 .../purple_sleeping_bag.json | 0 ...purple_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/red_elevator.json | 0 .../red_elevator_from_elevator.json | 0 .../kibe/{recipes => recipe}/red_glider.json | 0 .../kibe/{recipes => recipe}/red_rune.json | 0 .../red_rune_from_rune.json | 0 .../{recipes => recipe}/red_sleeping_bag.json | 0 .../red_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/redstone_timer.json | 0 .../regular_conveyor_belt.json | 0 .../kibe/{recipes => recipe}/slime_boots.json | 0 .../kibe/{recipes => recipe}/slime_sling.json | 0 .../{recipes => recipe}/stone_spikes.json | 0 .../data/kibe/{recipes => recipe}/tank.json | 0 .../kibe/{recipes => recipe}/torch_sling.json | 0 .../kibe/{recipes => recipe}/trash_can.json | 0 .../{recipes => recipe}/vacuum_hopper.json | 0 .../kibe/{recipes => recipe}/void_bucket.json | 0 .../kibe/{recipes => recipe}/water_ring.json | 0 .../{recipes => recipe}/white_elevator.json | 0 .../white_elevator_from_elevator.json | 0 .../{recipes => recipe}/white_glider.json | 0 .../kibe/{recipes => recipe}/white_rune.json | 0 .../white_rune_from_rune.json | 0 .../white_sleeping_bag.json | 0 .../white_sleeping_bag_from_sleeping_bag.json | 0 .../{recipes => recipe}/wither_builder.json | 0 .../wither_proof_block.json | 0 .../wither_proof_glass.json | 0 .../wither_proof_sand.json | 0 .../{recipes => recipe}/wooden_bucket.json | 0 .../kibe/{recipes => recipe}/xp_drain.json | 0 .../kibe/{recipes => recipe}/xp_shower.json | 0 .../{recipes => recipe}/yellow_elevator.json | 0 .../yellow_elevator_from_elevator.json | 0 .../{recipes => recipe}/yellow_glider.json | 0 .../kibe/{recipes => recipe}/yellow_rune.json | 0 .../yellow_rune_from_rune.json | 0 .../yellow_sleeping_bag.json | 0 ...yellow_sleeping_bag_from_sleeping_bag.json | 0 .../tags/{blocks => block}/elevators.json | 0 .../{blocks => block}/magnet_inhibitor.json | 0 .../kibe/tags/{items => item}/elevators.json | 0 .../data/kibe/tags/{items => item}/runes.json | 0 .../tags/{items => item}/sleeping_bags.json | 0 .../tags/{blocks => block}/dragon_immune.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../{blocks => block}/mineable/shovel.json | 0 .../{blocks => block}/needs_diamond_tool.json | 0 .../{blocks => block}/needs_iron_tool.json | 0 .../{blocks => block}/needs_stone_tool.json | 0 .../tags/{blocks => block}/wither_immune.json | 0 .../tags/{items => item}/piglin_loved.json | 0 src/main/resources/fabric.mod.json | 6 ++ 284 files changed, 723 insertions(+), 607 deletions(-) create mode 100644 src/main/generated/.cache/57d693d5a5164e98778a1b02a20274468c444f42 rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/basalt_generator_mk1.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/basalt_generator_mk2.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/basalt_generator_mk3.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/basalt_generator_mk4.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/basalt_generator_mk5.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/big_torch.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/black_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/blue_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/breaker.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/brown_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/chunk_loader.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/cobblestone_generator_mk1.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/cobblestone_generator_mk2.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/cobblestone_generator_mk3.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/cobblestone_generator_mk4.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/cobblestone_generator_mk5.json (84%) create mode 100644 src/main/generated/data/kibe/loot_table/blocks/cooler.json create mode 100644 src/main/generated/data/kibe/loot_table/blocks/cursed_dirt.json rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/cyan_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/dehumidifier.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/diamond_spikes.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/drawbridge.json (83%) create mode 100644 src/main/generated/data/kibe/loot_table/blocks/entangled_chest.json create mode 100644 src/main/generated/data/kibe/loot_table/blocks/entangled_tank.json rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/express_conveyor_belt.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/fast_conveyor_belt.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/fluid_hopper.json (60%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/gold_spikes.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/gray_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/green_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/heater.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/igniter.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/iron_spikes.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/light_blue_elevator.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/light_gray_elevator.json (84%) rename src/main/{resources/data/kibe/loot_tables/blocks/cursed_dirt.json => generated/data/kibe/loot_table/blocks/light_source.json} (72%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/lime_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/magenta_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/obsidian_sand.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/orange_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/pink_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/placer.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/purple_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/red_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/redstone_timer.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/regular_conveyor_belt.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/stone_spikes.json (83%) create mode 100644 src/main/generated/data/kibe/loot_table/blocks/tank.json rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/trash_can.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/vacuum_hopper.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/white_elevator.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/wither_builder.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/wither_proof_block.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/wither_proof_glass.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/wither_proof_sand.json (84%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/xp_drain.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/xp_shower.json (83%) rename src/main/{resources/data/kibe/loot_tables => generated/data/kibe/loot_table}/blocks/yellow_elevator.json (83%) create mode 100644 src/main/java/io/github/lucaargolo/kibe/mixed/LivingEntityMixed.java create mode 100644 src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeBlockLootProvider.kt create mode 100644 src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeDatagen.kt delete mode 100644 src/main/resources/data/kibe/loot_tables/blocks/cooler.json delete mode 100644 src/main/resources/data/kibe/loot_tables/blocks/entangled_chest.json delete mode 100644 src/main/resources/data/kibe/loot_tables/blocks/entangled_tank.json delete mode 100644 src/main/resources/data/kibe/loot_tables/blocks/tank.json rename src/main/resources/data/kibe/{recipes => recipe}/angel_ring.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/basalt_generator_mk1.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/basalt_generator_mk2.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/basalt_generator_mk3.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/basalt_generator_mk4.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/basalt_generator_mk5.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/big_torch.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/black_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/blue_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/breaker.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/brown_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/chunk_loader.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cobblestone_generator_mk1.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cobblestone_generator_mk2.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cobblestone_generator_mk3.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cobblestone_generator_mk4.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cobblestone_generator_mk5.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cooler.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cursed_kibe.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cursed_lasso.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cursed_seeds.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/cyan_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/dehumidifier.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/diamond_kibe.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/diamond_lasso.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/diamond_ring.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/diamond_spikes.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/drawbridge.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/entangled_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/entangled_bucket.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/entangled_chest.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/entangled_tank.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/escape_rope.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/experience_bottle.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/express_conveyor_belt.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/fast_conveyor_belt.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/fluid_hopper.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/glider_left_wing.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/glider_left_wing_from_right.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/glider_right_wing.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/glider_right_wing_from_left.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gold_spikes.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/golden_kibe.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/golden_lasso.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/gray_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/green_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/heater.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/igniter.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/iron_spikes.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/kibe.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_blue_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_gray_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/light_ring.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/lime_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/liquid_xp_bucket.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magenta_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magma_ring.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/magnet.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/measuring_tape.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/obsidian_sand.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/orange_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pink_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/placer.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pocket_crafting_table.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/pocket_trash_can.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/purple_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/red_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/redstone_timer.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/regular_conveyor_belt.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/slime_boots.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/slime_sling.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/stone_spikes.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/tank.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/torch_sling.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/trash_can.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/vacuum_hopper.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/void_bucket.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/water_ring.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/white_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/wither_builder.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/wither_proof_block.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/wither_proof_glass.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/wither_proof_sand.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/wooden_bucket.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/xp_drain.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/xp_shower.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_elevator_from_elevator.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_glider.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_rune_from_rune.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_sleeping_bag.json (100%) rename src/main/resources/data/kibe/{recipes => recipe}/yellow_sleeping_bag_from_sleeping_bag.json (100%) rename src/main/resources/data/kibe/tags/{blocks => block}/elevators.json (100%) rename src/main/resources/data/kibe/tags/{blocks => block}/magnet_inhibitor.json (100%) rename src/main/resources/data/kibe/tags/{items => item}/elevators.json (100%) rename src/main/resources/data/kibe/tags/{items => item}/runes.json (100%) rename src/main/resources/data/kibe/tags/{items => item}/sleeping_bags.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/dragon_immune.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/mineable/shovel.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/needs_diamond_tool.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/needs_iron_tool.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/needs_stone_tool.json (100%) rename src/main/resources/data/minecraft/tags/{blocks => block}/wither_immune.json (100%) rename src/main/resources/data/minecraft/tags/{items => item}/piglin_loved.json (100%) diff --git a/.gitignore b/.gitignore index 5a8aaaef..f25c5c8e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ out/ # fabric run/ +/.kotlin/errors/errors-1736588313060.log +/.kotlin/errors/errors-1736588322464.log diff --git a/build.gradle.kts b/build.gradle.kts index 061b9ca4..4d6de4d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,6 @@ import com.matthewprenger.cursegradle.CurseProject import com.matthewprenger.cursegradle.CurseRelation import com.matthewprenger.cursegradle.Options import org.ajoberstar.grgit.Grgit -import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.kohsuke.github.GHReleaseBuilder import org.kohsuke.github.GitHub @@ -26,17 +25,6 @@ operator fun Project.get(property: String): String { return property(property) as String } -configure { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 -} - -tasks.compileKotlin { - compilerOptions { - jvmTarget.set(JvmTarget.JVM_21) - } -} - version = project["mod_version"] group = project["maven_group"] @@ -72,6 +60,10 @@ fun getBranch(): String { return branch.substring(branch.lastIndexOf("/") + 1) } +fabricApi { + configureDataGeneration() +} + loom { accessWidenerPath.set(file("src/main/resources/kibe.accesswidener")) } diff --git a/gradle.properties b/gradle.properties index 68887bc9..246a5414 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx4G # Gradle Plugins -kotlin_version=2.0.0 -loom_version=1.7-SNAPSHOT +kotlin_version=2.1.0 +loom_version=1.9-SNAPSHOT grgit_version=5.0.0 cursegradle_version=1.4.0 modrinth_version=2.8.7 @@ -16,17 +16,17 @@ maven_group=io.github.lucaargolo # Fabric Properties minecraft_version=1.21.1 yarn_mappings=1.21.1+build.3 -loader_version=0.16.5 +loader_version=0.16.10 # Fabric API -fabric_version=0.105.0+1.21.1 -fabric_kotlin_version=1.11.0+kotlin.2.0.0 +fabric_version=0.114.0+1.21.1 +fabric_kotlin_version=1.13.0+kotlin.2.1.0 # Libraries pal_version=1.10.0 trinkets_version=3.10.0 -modmenu_version=11.0.2 -rei_version=16.0.783 +modmenu_version=11.0.3 +rei_version=16.0.788 # Publishing curseforge_id=388832 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d184210..e48eca57 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/generated/.cache/57d693d5a5164e98778a1b02a20274468c444f42 b/src/main/generated/.cache/57d693d5a5164e98778a1b02a20274468c444f42 new file mode 100644 index 00000000..0226d3e9 --- /dev/null +++ b/src/main/generated/.cache/57d693d5a5164e98778a1b02a20274468c444f42 @@ -0,0 +1,59 @@ +// 1.21.1 2025-01-11T07:02:56.143777 Kibe/Block Loot Tables +00da3269b202ce6ff043adcaeb7a043658394cfa data/kibe/loot_table/blocks/light_gray_elevator.json +206667674caf8bba9c9f0119c698ed3ac09db1b0 data/kibe/loot_table/blocks/green_elevator.json +fe36fe9859dba61fc2d70601e0eeb75f5f2e7393 data/kibe/loot_table/blocks/tank.json +5ccdfce02e3ffa357b425df50600b829007ed790 data/kibe/loot_table/blocks/wither_proof_glass.json +67860da57d3aa593fc4195a592935eb8579e5751 data/kibe/loot_table/blocks/basalt_generator_mk2.json +4ad924df09736b2c074bfa7704fff83de7d35cdf data/kibe/loot_table/blocks/lime_elevator.json +c6d79317ae328e6b9333d111ec4ac498a363624d data/kibe/loot_table/blocks/xp_shower.json +9ec7fe7895732cb7ad7ee9c779ca0a9f4e37e639 data/kibe/loot_table/blocks/cobblestone_generator_mk1.json +761183fcb9d392758d28bea4dfc16bcc4665e3df data/kibe/loot_table/blocks/cyan_elevator.json +90fd07d5f854b2f2cd9c58c113bb427929e1a7a7 data/kibe/loot_table/blocks/cooler.json +82292f2a0663cbcbe9c227f487d61dd53de4da2c data/kibe/loot_table/blocks/redstone_timer.json +04d2334154f91aa873b5fbce28d6dbe8e2fc6c8a data/kibe/loot_table/blocks/red_elevator.json +8d45bafed3128146a5da1593afbfe035c429d75c data/kibe/loot_table/blocks/basalt_generator_mk4.json +5e45e37a0e54648e465c928471a45ada3c3e4a2d data/kibe/loot_table/blocks/wither_builder.json +cf71628e43ca85b4c1069694d0746a57f5dbbd09 data/kibe/loot_table/blocks/basalt_generator_mk1.json +d0a739480489f36ddd09af077cf9f07579511cba data/kibe/loot_table/blocks/diamond_spikes.json +0c9fa5b7c1d69f4ea9693a6fbdc091998fee321d data/kibe/loot_table/blocks/breaker.json +a7b12d676b813a97776589264df8b4a8c421312f data/kibe/loot_table/blocks/pink_elevator.json +28f5d635c5e392a5ca90bbec60c49169c0209448 data/kibe/loot_table/blocks/yellow_elevator.json +e95ff314a0c2be8d2c0682f10ed18d556a592d51 data/kibe/loot_table/blocks/xp_drain.json +cc82124547ada545fc03d068fc6385aa43ae5735 data/kibe/loot_table/blocks/cobblestone_generator_mk3.json +9403ea12abe1a24702b61fc26c7d8707e7ea23b2 data/kibe/loot_table/blocks/light_blue_elevator.json +c2d6b0e293c5645d27abee80dfee79506dc6c798 data/kibe/loot_table/blocks/trash_can.json +61b8257f9ad73334d47db90467a5a613c8f9a0fb data/kibe/loot_table/blocks/iron_spikes.json +a9efdea4519a238cff34eba83e2d9fc8c16520fd data/kibe/loot_table/blocks/black_elevator.json +ca7499d2dd9adefed9a09fe74fec50bbb824f879 data/kibe/loot_table/blocks/light_source.json +ddc1c4e1d040de71182c2ace88ac940deba5949f data/kibe/loot_table/blocks/dehumidifier.json +3fbe59cca5038994e279e0af2f092c09e14e9d8e data/kibe/loot_table/blocks/chunk_loader.json +9e0c84ab8398f6eab18cfe9eb155a8a9e908933f data/kibe/loot_table/blocks/heater.json +ae88c0d7c22365a9ba828bba4d38b17f28e5c170 data/kibe/loot_table/blocks/stone_spikes.json +7b27e2fadd18c5f060c61732dd3aec800269da3c data/kibe/loot_table/blocks/big_torch.json +0a107037214d11dfd2832e6dfcf8ce70d8052ef4 data/kibe/loot_table/blocks/cursed_dirt.json +889928445ddbaaa54f96c1007ce85f0e7f590212 data/kibe/loot_table/blocks/orange_elevator.json +572c64443eea0370a8ab19660fee51182af27cfb data/kibe/loot_table/blocks/wither_proof_sand.json +f53ce521d723ce8f3f38cbfef13b2ab75bf48d1e data/kibe/loot_table/blocks/igniter.json +3a1d659f067ef84dad5a664fbd96da6c79b579b6 data/kibe/loot_table/blocks/cobblestone_generator_mk4.json +fbaafcea4c466fdae8de051f5e52fd2064baf9d9 data/kibe/loot_table/blocks/basalt_generator_mk5.json +be370d681a994caf5a36296c19b780a4a67ab391 data/kibe/loot_table/blocks/magenta_elevator.json +d541e3c07e931c44b9a70480a7de084ba10fe630 data/kibe/loot_table/blocks/brown_elevator.json +f24de7f2a1ffe6689dec1cc284bb1c63dda8a0a1 data/kibe/loot_table/blocks/cobblestone_generator_mk5.json +82acd8e19b81070431e243d65927ac1a29a4d53d data/kibe/loot_table/blocks/entangled_chest.json +c4a36e530f2cb86176d5bb89d73ab7a21b0eb45e data/kibe/loot_table/blocks/gray_elevator.json +d207a49a37fe83ae6e09f12e73920947284f97c5 data/kibe/loot_table/blocks/regular_conveyor_belt.json +1564ccc747a99bbb198a9be11512bd33c30df4de data/kibe/loot_table/blocks/cobblestone_generator_mk2.json +bb9b6e2536efdf2faed8ee2c2522c96b6f6d68c8 data/kibe/loot_table/blocks/fast_conveyor_belt.json +c07b3c749f9af8896ae6655f864dce7d889041c7 data/kibe/loot_table/blocks/gold_spikes.json +209d2fbde86a983450b23e6a14f1f30fbaef4132 data/kibe/loot_table/blocks/blue_elevator.json +a5d815f16eaee2b4596abef2077476da12ca1c73 data/kibe/loot_table/blocks/fluid_hopper.json +18723e9012ea2f9118515c07f9a35ffafc7f8716 data/kibe/loot_table/blocks/white_elevator.json +1ee5ce0b2f47fd5be3d2d169b048a0147f3d6db0 data/kibe/loot_table/blocks/obsidian_sand.json +6af680e9742081dc4bfa234b8a30f2385195ceca data/kibe/loot_table/blocks/wither_proof_block.json +b3a63fd135f4848636812ef39da7ed7851a152a7 data/kibe/loot_table/blocks/purple_elevator.json +d728797ae8da8a2e699f711edf5552d2f3ea8fcf data/kibe/loot_table/blocks/placer.json +3d9a45a86aec0f1bc02dd4bc951b5f2069d797a2 data/kibe/loot_table/blocks/vacuum_hopper.json +2b5f63d061fcd0d0c4806b2656728131a37ebe5e data/kibe/loot_table/blocks/entangled_tank.json +2349e235ce70e66f24b761f1cbf8128ff52df197 data/kibe/loot_table/blocks/express_conveyor_belt.json +4ff4ff68f3afee01a6359bf35bd27af48a59cdb3 data/kibe/loot_table/blocks/drawbridge.json +def5a85cbce7171918c4e5e9e95c91c14b01fab3 data/kibe/loot_table/blocks/basalt_generator_mk3.json diff --git a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk1.json b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk1.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk1.json rename to src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk1.json index 11e02906..da625e8c 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk1.json +++ b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk1.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:basalt_generator_mk1" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk2.json b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk2.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk2.json rename to src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk2.json index 5b81c426..5d4dbe0b 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk2.json +++ b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk2.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:basalt_generator_mk2" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk3.json b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk3.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk3.json rename to src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk3.json index e46e8e2e..a7fb3b60 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk3.json +++ b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk3.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:basalt_generator_mk3" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk4.json b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk4.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk4.json rename to src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk4.json index 4a3d32d8..3498418f 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk4.json +++ b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk4.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:basalt_generator_mk4" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk5.json b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk5.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk5.json rename to src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk5.json index c1984376..c0788b01 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/basalt_generator_mk5.json +++ b/src/main/generated/data/kibe/loot_table/blocks/basalt_generator_mk5.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:basalt_generator_mk5" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/big_torch.json b/src/main/generated/data/kibe/loot_table/blocks/big_torch.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/big_torch.json rename to src/main/generated/data/kibe/loot_table/blocks/big_torch.json index 7c66ca84..df041491 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/big_torch.json +++ b/src/main/generated/data/kibe/loot_table/blocks/big_torch.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:big_torch" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/black_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/black_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/black_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/black_elevator.json index ca252d64..c8500a86 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/black_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/black_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:black_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/blue_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/blue_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/blue_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/blue_elevator.json index 47e38e1d..25fd1f73 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/blue_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/blue_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:blue_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/breaker.json b/src/main/generated/data/kibe/loot_table/blocks/breaker.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/breaker.json rename to src/main/generated/data/kibe/loot_table/blocks/breaker.json index b3af7f0a..7759db06 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/breaker.json +++ b/src/main/generated/data/kibe/loot_table/blocks/breaker.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:breaker" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/brown_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/brown_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/brown_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/brown_elevator.json index a789b462..b49e015d 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/brown_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/brown_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:brown_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/chunk_loader.json b/src/main/generated/data/kibe/loot_table/blocks/chunk_loader.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/chunk_loader.json rename to src/main/generated/data/kibe/loot_table/blocks/chunk_loader.json index f351d7c0..9bd3219d 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/chunk_loader.json +++ b/src/main/generated/data/kibe/loot_table/blocks/chunk_loader.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:chunk_loader" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk1.json b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk1.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk1.json rename to src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk1.json index ddb4aead..57bd834b 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk1.json +++ b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk1.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:cobblestone_generator_mk1" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk2.json b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk2.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk2.json rename to src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk2.json index 13f6f51e..7b47ffff 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk2.json +++ b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk2.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:cobblestone_generator_mk2" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk3.json b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk3.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk3.json rename to src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk3.json index 2b08ccfc..ac23184a 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk3.json +++ b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk3.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:cobblestone_generator_mk3" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk4.json b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk4.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk4.json rename to src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk4.json index 2828aaa0..33d23d5d 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk4.json +++ b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk4.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:cobblestone_generator_mk4" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk5.json b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk5.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk5.json rename to src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk5.json index b39e8686..cabe9de0 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cobblestone_generator_mk5.json +++ b/src/main/generated/data/kibe/loot_table/blocks/cobblestone_generator_mk5.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:cobblestone_generator_mk5" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/generated/data/kibe/loot_table/blocks/cooler.json b/src/main/generated/data/kibe/loot_table/blocks/cooler.json new file mode 100644 index 00000000..471e5dfa --- /dev/null +++ b/src/main/generated/data/kibe/loot_table/blocks/cooler.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "kibe:cooler" + } + ], + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:block_entity_data" + ], + "source": "block_entity" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/kibe/loot_table/blocks/cursed_dirt.json b/src/main/generated/data/kibe/loot_table/blocks/cursed_dirt.json new file mode 100644 index 00000000..636ebdb2 --- /dev/null +++ b/src/main/generated/data/kibe/loot_table/blocks/cursed_dirt.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "kibe:cursed_dirt" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cyan_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/cyan_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/cyan_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/cyan_elevator.json index d2d2b7bc..dbf28dca 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cyan_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/cyan_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:cyan_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/dehumidifier.json b/src/main/generated/data/kibe/loot_table/blocks/dehumidifier.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/dehumidifier.json rename to src/main/generated/data/kibe/loot_table/blocks/dehumidifier.json index a2293f1b..f5ca086a 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/dehumidifier.json +++ b/src/main/generated/data/kibe/loot_table/blocks/dehumidifier.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:dehumidifier" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/diamond_spikes.json b/src/main/generated/data/kibe/loot_table/blocks/diamond_spikes.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/diamond_spikes.json rename to src/main/generated/data/kibe/loot_table/blocks/diamond_spikes.json index b9a972c3..b7b4febd 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/diamond_spikes.json +++ b/src/main/generated/data/kibe/loot_table/blocks/diamond_spikes.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:diamond_spikes" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/drawbridge.json b/src/main/generated/data/kibe/loot_table/blocks/drawbridge.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/drawbridge.json rename to src/main/generated/data/kibe/loot_table/blocks/drawbridge.json index 026bb609..b11f98bd 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/drawbridge.json +++ b/src/main/generated/data/kibe/loot_table/blocks/drawbridge.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:drawbridge" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/generated/data/kibe/loot_table/blocks/entangled_chest.json b/src/main/generated/data/kibe/loot_table/blocks/entangled_chest.json new file mode 100644 index 00000000..6abb848e --- /dev/null +++ b/src/main/generated/data/kibe/loot_table/blocks/entangled_chest.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "kibe:entangled_chest" + } + ], + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:block_entity_data" + ], + "source": "block_entity" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/kibe/loot_table/blocks/entangled_tank.json b/src/main/generated/data/kibe/loot_table/blocks/entangled_tank.json new file mode 100644 index 00000000..171b23e3 --- /dev/null +++ b/src/main/generated/data/kibe/loot_table/blocks/entangled_tank.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "kibe:entangled_tank" + } + ], + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:block_entity_data" + ], + "source": "block_entity" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/express_conveyor_belt.json b/src/main/generated/data/kibe/loot_table/blocks/express_conveyor_belt.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/express_conveyor_belt.json rename to src/main/generated/data/kibe/loot_table/blocks/express_conveyor_belt.json index dbf378f5..c812f446 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/express_conveyor_belt.json +++ b/src/main/generated/data/kibe/loot_table/blocks/express_conveyor_belt.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:express_conveyor_belt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/fast_conveyor_belt.json b/src/main/generated/data/kibe/loot_table/blocks/fast_conveyor_belt.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/fast_conveyor_belt.json rename to src/main/generated/data/kibe/loot_table/blocks/fast_conveyor_belt.json index 156dca04..bb3183c2 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/fast_conveyor_belt.json +++ b/src/main/generated/data/kibe/loot_table/blocks/fast_conveyor_belt.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:fast_conveyor_belt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/fluid_hopper.json b/src/main/generated/data/kibe/loot_table/blocks/fluid_hopper.json similarity index 60% rename from src/main/resources/data/kibe/loot_tables/blocks/fluid_hopper.json rename to src/main/generated/data/kibe/loot_table/blocks/fluid_hopper.json index e7ba12c1..915408fa 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/fluid_hopper.json +++ b/src/main/generated/data/kibe/loot_table/blocks/fluid_hopper.json @@ -1,26 +1,20 @@ - { "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_name", - "source": "block_entity" - } - ], "name": "kibe:fluid_hopper" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/gold_spikes.json b/src/main/generated/data/kibe/loot_table/blocks/gold_spikes.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/gold_spikes.json rename to src/main/generated/data/kibe/loot_table/blocks/gold_spikes.json index 6fa2c2c1..5ad4edf7 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/gold_spikes.json +++ b/src/main/generated/data/kibe/loot_table/blocks/gold_spikes.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:gold_spikes" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/gray_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/gray_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/gray_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/gray_elevator.json index 87829fe8..cb360e9d 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/gray_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/gray_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:gray_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/green_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/green_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/green_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/green_elevator.json index 69791be9..a16efad0 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/green_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/green_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:green_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/heater.json b/src/main/generated/data/kibe/loot_table/blocks/heater.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/heater.json rename to src/main/generated/data/kibe/loot_table/blocks/heater.json index be7c5f91..9dc6dd45 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/heater.json +++ b/src/main/generated/data/kibe/loot_table/blocks/heater.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:heater" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/igniter.json b/src/main/generated/data/kibe/loot_table/blocks/igniter.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/igniter.json rename to src/main/generated/data/kibe/loot_table/blocks/igniter.json index e9857fd4..c0d09361 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/igniter.json +++ b/src/main/generated/data/kibe/loot_table/blocks/igniter.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:igniter" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/iron_spikes.json b/src/main/generated/data/kibe/loot_table/blocks/iron_spikes.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/iron_spikes.json rename to src/main/generated/data/kibe/loot_table/blocks/iron_spikes.json index 1b2a21d6..3f889616 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/iron_spikes.json +++ b/src/main/generated/data/kibe/loot_table/blocks/iron_spikes.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:iron_spikes" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/light_blue_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/light_blue_elevator.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/light_blue_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/light_blue_elevator.json index bbd827d6..c5a432b5 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/light_blue_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/light_blue_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:light_blue_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/light_gray_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/light_gray_elevator.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/light_gray_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/light_gray_elevator.json index 03de44fc..2838eff7 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/light_gray_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/light_gray_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:light_gray_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cursed_dirt.json b/src/main/generated/data/kibe/loot_table/blocks/light_source.json similarity index 72% rename from src/main/resources/data/kibe/loot_tables/blocks/cursed_dirt.json rename to src/main/generated/data/kibe/loot_table/blocks/light_source.json index 6ee2d52d..f4dfe2eb 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/cursed_dirt.json +++ b/src/main/generated/data/kibe/loot_table/blocks/light_source.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "entries": [ + "bonus_rolls": 0.0, + "conditions": [ { - "type": "minecraft:item", - "name": "minecraft:dirt" + "condition": "minecraft:survives_explosion" } ], - "conditions": [ + "entries": [ { - "condition": "minecraft:survives_explosion" + "type": "minecraft:item", + "name": "kibe:light_ring" } - ] + ], + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/lime_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/lime_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/lime_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/lime_elevator.json index 21ed17d6..b9a5dde0 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/lime_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/lime_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:lime_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/magenta_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/magenta_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/magenta_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/magenta_elevator.json index b95f92de..4f63fa68 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/magenta_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/magenta_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:magenta_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/obsidian_sand.json b/src/main/generated/data/kibe/loot_table/blocks/obsidian_sand.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/obsidian_sand.json rename to src/main/generated/data/kibe/loot_table/blocks/obsidian_sand.json index e1d2f7d5..1d4bd52d 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/obsidian_sand.json +++ b/src/main/generated/data/kibe/loot_table/blocks/obsidian_sand.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:obsidian_sand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/orange_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/orange_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/orange_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/orange_elevator.json index 011c23f5..146c943c 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/orange_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/orange_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:orange_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/pink_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/pink_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/pink_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/pink_elevator.json index 80779d0f..b24bf92c 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/pink_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/pink_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:pink_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/placer.json b/src/main/generated/data/kibe/loot_table/blocks/placer.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/placer.json rename to src/main/generated/data/kibe/loot_table/blocks/placer.json index 9170add7..20a71401 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/placer.json +++ b/src/main/generated/data/kibe/loot_table/blocks/placer.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:placer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/purple_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/purple_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/purple_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/purple_elevator.json index 276f1c90..b9051328 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/purple_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/purple_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:purple_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/red_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/red_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/red_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/red_elevator.json index 8baf7ff7..692a41c4 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/red_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/red_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:red_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/redstone_timer.json b/src/main/generated/data/kibe/loot_table/blocks/redstone_timer.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/redstone_timer.json rename to src/main/generated/data/kibe/loot_table/blocks/redstone_timer.json index 0a9b6901..d75c8e16 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/redstone_timer.json +++ b/src/main/generated/data/kibe/loot_table/blocks/redstone_timer.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:redstone_timer" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/regular_conveyor_belt.json b/src/main/generated/data/kibe/loot_table/blocks/regular_conveyor_belt.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/regular_conveyor_belt.json rename to src/main/generated/data/kibe/loot_table/blocks/regular_conveyor_belt.json index 31ea3f2e..e584c3d2 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/regular_conveyor_belt.json +++ b/src/main/generated/data/kibe/loot_table/blocks/regular_conveyor_belt.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:regular_conveyor_belt" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/stone_spikes.json b/src/main/generated/data/kibe/loot_table/blocks/stone_spikes.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/stone_spikes.json rename to src/main/generated/data/kibe/loot_table/blocks/stone_spikes.json index b9f74c1f..7b2125d3 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/stone_spikes.json +++ b/src/main/generated/data/kibe/loot_table/blocks/stone_spikes.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:stone_spikes" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/generated/data/kibe/loot_table/blocks/tank.json b/src/main/generated/data/kibe/loot_table/blocks/tank.json new file mode 100644 index 00000000..0606b8b2 --- /dev/null +++ b/src/main/generated/data/kibe/loot_table/blocks/tank.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "kibe:tank" + } + ], + "functions": [ + { + "function": "minecraft:copy_components", + "include": [ + "minecraft:block_entity_data" + ], + "source": "block_entity" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/trash_can.json b/src/main/generated/data/kibe/loot_table/blocks/trash_can.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/trash_can.json rename to src/main/generated/data/kibe/loot_table/blocks/trash_can.json index 40ac3952..1abaac7b 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/trash_can.json +++ b/src/main/generated/data/kibe/loot_table/blocks/trash_can.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:trash_can" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/vacuum_hopper.json b/src/main/generated/data/kibe/loot_table/blocks/vacuum_hopper.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/vacuum_hopper.json rename to src/main/generated/data/kibe/loot_table/blocks/vacuum_hopper.json index fb3fb39c..365b7c2c 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/vacuum_hopper.json +++ b/src/main/generated/data/kibe/loot_table/blocks/vacuum_hopper.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:vacuum_hopper" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/white_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/white_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/white_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/white_elevator.json index 78e116f3..eca261c4 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/white_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/white_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:white_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/wither_builder.json b/src/main/generated/data/kibe/loot_table/blocks/wither_builder.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/wither_builder.json rename to src/main/generated/data/kibe/loot_table/blocks/wither_builder.json index 05710366..2bd3ab7a 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/wither_builder.json +++ b/src/main/generated/data/kibe/loot_table/blocks/wither_builder.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:wither_builder" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/wither_proof_block.json b/src/main/generated/data/kibe/loot_table/blocks/wither_proof_block.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/wither_proof_block.json rename to src/main/generated/data/kibe/loot_table/blocks/wither_proof_block.json index 7435ee52..b8c33f13 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/wither_proof_block.json +++ b/src/main/generated/data/kibe/loot_table/blocks/wither_proof_block.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:wither_proof_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/wither_proof_glass.json b/src/main/generated/data/kibe/loot_table/blocks/wither_proof_glass.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/wither_proof_glass.json rename to src/main/generated/data/kibe/loot_table/blocks/wither_proof_glass.json index f12c5d5c..904c0f7c 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/wither_proof_glass.json +++ b/src/main/generated/data/kibe/loot_table/blocks/wither_proof_glass.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:wither_proof_glass" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/wither_proof_sand.json b/src/main/generated/data/kibe/loot_table/blocks/wither_proof_sand.json similarity index 84% rename from src/main/resources/data/kibe/loot_tables/blocks/wither_proof_sand.json rename to src/main/generated/data/kibe/loot_table/blocks/wither_proof_sand.json index 6685d741..8c63319d 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/wither_proof_sand.json +++ b/src/main/generated/data/kibe/loot_table/blocks/wither_proof_sand.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:wither_proof_sand" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/xp_drain.json b/src/main/generated/data/kibe/loot_table/blocks/xp_drain.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/xp_drain.json rename to src/main/generated/data/kibe/loot_table/blocks/xp_drain.json index 077dbae0..d02a1ffc 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/xp_drain.json +++ b/src/main/generated/data/kibe/loot_table/blocks/xp_drain.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:xp_drain" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/xp_shower.json b/src/main/generated/data/kibe/loot_table/blocks/xp_shower.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/xp_shower.json rename to src/main/generated/data/kibe/loot_table/blocks/xp_shower.json index ecc8252d..28d74314 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/xp_shower.json +++ b/src/main/generated/data/kibe/loot_table/blocks/xp_shower.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:xp_shower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/yellow_elevator.json b/src/main/generated/data/kibe/loot_table/blocks/yellow_elevator.json similarity index 83% rename from src/main/resources/data/kibe/loot_tables/blocks/yellow_elevator.json rename to src/main/generated/data/kibe/loot_table/blocks/yellow_elevator.json index b9085c1a..4cea38ac 100644 --- a/src/main/resources/data/kibe/loot_tables/blocks/yellow_elevator.json +++ b/src/main/generated/data/kibe/loot_table/blocks/yellow_elevator.json @@ -2,18 +2,19 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", "name": "kibe:yellow_elevator" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } ] } \ No newline at end of file diff --git a/src/main/java/io/github/lucaargolo/kibe/mixed/LivingEntityMixed.java b/src/main/java/io/github/lucaargolo/kibe/mixed/LivingEntityMixed.java new file mode 100644 index 00000000..916e5757 --- /dev/null +++ b/src/main/java/io/github/lucaargolo/kibe/mixed/LivingEntityMixed.java @@ -0,0 +1,7 @@ +package io.github.lucaargolo.kibe.mixed; + +public interface LivingEntityMixed { + + boolean kibe$isCursed(); + +} diff --git a/src/main/java/io/github/lucaargolo/kibe/mixed/PlayerEntityMixed.java b/src/main/java/io/github/lucaargolo/kibe/mixed/PlayerEntityMixed.java index ef909df7..105e67ec 100644 --- a/src/main/java/io/github/lucaargolo/kibe/mixed/PlayerEntityMixed.java +++ b/src/main/java/io/github/lucaargolo/kibe/mixed/PlayerEntityMixed.java @@ -7,6 +7,6 @@ public interface PlayerEntityMixed { - List> getKibe_activeRingsList(); + List> kibe$getActiveRingsList(); } diff --git a/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityMixin.java b/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityMixin.java index 198008d0..911eba28 100644 --- a/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityMixin.java +++ b/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityMixin.java @@ -1,9 +1,11 @@ package io.github.lucaargolo.kibe.mixin; import io.github.lucaargolo.kibe.block.Elevator; +import io.github.lucaargolo.kibe.effect.EffectCompendium; import io.github.lucaargolo.kibe.item.Glider; import io.github.lucaargolo.kibe.item.ItemCompendium; import io.github.lucaargolo.kibe.item.SleepingBag; +import io.github.lucaargolo.kibe.mixed.LivingEntityMixed; import io.github.lucaargolo.kibe.utils.SlimeBounceHandler; import io.github.lucaargolo.kibe.utils.helper.SpikeHelper; import net.minecraft.block.Block; @@ -12,6 +14,10 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.data.DataTracker; +import net.minecraft.entity.data.TrackedData; +import net.minecraft.entity.data.TrackedDataHandlerRegistry; +import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.sound.SoundCategory; @@ -27,7 +33,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(LivingEntity.class) -public abstract class LivingEntityMixin extends Entity { +public abstract class LivingEntityMixin extends Entity implements LivingEntityMixed { + + @SuppressWarnings("WrongEntityDataParameterClass") + private static final TrackedData CURSED = DataTracker.registerData(LivingEntity.class, TrackedDataHandlerRegistry.BOOLEAN); @Shadow public abstract ItemStack getStackInHand(Hand hand); @@ -37,6 +46,23 @@ public LivingEntityMixin(EntityType type, World world) { super(type, world); } + @Inject(at = @At("TAIL"), method = "initDataTracker") + private void initDataTracker(DataTracker.Builder builder, CallbackInfo ci) { + builder.add(CURSED, false); + } + + @Inject(at = @At("HEAD"), method = "onStatusEffectApplied") + private void addStatusEffect(StatusEffectInstance effect, Entity source, CallbackInfo ci) { + if(effect.getEffectType().equals(EffectCompendium.INSTANCE.getCURSED())) + dataTracker.set(CURSED, true); + } + + @Inject(at = @At("HEAD"), method = "onStatusEffectRemoved") + private void removeStatusEffect(StatusEffectInstance effect, CallbackInfo ci) { + if(effect.getEffectType().equals(EffectCompendium.INSTANCE.getCURSED())) + dataTracker.set(CURSED, false); + } + @Inject(at = @At("HEAD"), method = "swingHand(Lnet/minecraft/util/Hand;)V", cancellable = true) private void swingHand(Hand hand, CallbackInfo info) { ItemStack stack = this.getStackInHand(hand); @@ -113,4 +139,8 @@ private void shouldDropLoot(CallbackInfoReturnable cir) { } } + @Override + public boolean kibe$isCursed() { + return dataTracker.get(CURSED); + } } diff --git a/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityRendererMixin.java b/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityRendererMixin.java index 1812a049..7d2673e8 100644 --- a/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityRendererMixin.java +++ b/src/main/java/io/github/lucaargolo/kibe/mixin/LivingEntityRendererMixin.java @@ -1,6 +1,6 @@ package io.github.lucaargolo.kibe.mixin; -import io.github.lucaargolo.kibe.effect.EffectCompendium; +import io.github.lucaargolo.kibe.mixed.LivingEntityMixed; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.client.render.entity.model.EntityModel; @@ -20,7 +20,7 @@ public abstract class LivingEntityRendererMixin info) { - if(entity.hasStatusEffect(EffectCompendium.INSTANCE.getCURSED())) { + if(entity instanceof LivingEntityMixed mixed && mixed.kibe$isCursed()) { Identifier texture = Identifier.of("textures/block/coal_block.png"); info.setReturnValue(this.getModel().getLayer(texture)); } diff --git a/src/main/java/io/github/lucaargolo/kibe/mixin/PlayerEntityMixin.java b/src/main/java/io/github/lucaargolo/kibe/mixin/PlayerEntityMixin.java index 75a371ef..9a16d49c 100644 --- a/src/main/java/io/github/lucaargolo/kibe/mixin/PlayerEntityMixin.java +++ b/src/main/java/io/github/lucaargolo/kibe/mixin/PlayerEntityMixin.java @@ -49,7 +49,7 @@ protected PlayerEntityMixin(EntityType type, World world private final List> kibe_activeRingsList = new ArrayList<>(); @Override - public List> getKibe_activeRingsList() { + public List> kibe$getActiveRingsList() { return kibe_activeRingsList; } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/block/BlockCompendium.kt b/src/main/kotlin/io/github/lucaargolo/kibe/block/BlockCompendium.kt index 3eb45bc2..d6ca0225 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/block/BlockCompendium.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/block/BlockCompendium.kt @@ -41,7 +41,7 @@ object BlockCompendium : RegistryCompendium(Registries.BLOCK) { val TRASH_CAN = register("trash_can", TrashCan(Settings.copy(Blocks.STONE).requiresTool().strength(1.5F, 6.0F))) val VACUUM_HOPPER = register("vacuum_hopper", VacuumHopper(Settings.copy(Blocks.IRON_BLOCK).requiresTool().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).nonOpaque())) val BIG_TORCH = register("big_torch", BigTorch(Settings.copy(Blocks.TORCH).strength(0.5f).luminance{15}.sounds(BlockSoundGroup.WOOD))) - val COOLER = register("cooler", Cooler(Settings.copy(Blocks.SNOW_BLOCK).strength(0.2F).sounds(BlockSoundGroup.SNOW)), false) + val COOLER = register("cooler", Cooler(Settings.create().strength(0.2F).sounds(BlockSoundGroup.SNOW)), false) val DRAWBRIDGE = register("drawbridge", Drawbridge(Settings.copy(Blocks.IRON_BLOCK).requiresTool().strength(5.0F, 6.0F).sounds(BlockSoundGroup.METAL).nonOpaque())) val OBSIDIAN_SAND = register("obsidian_sand", ColoredFallingBlock(ColorCode(0x171623), Settings.copy(Blocks.OBSIDIAN).sounds(BlockSoundGroup.SAND))) diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/block/CursedDirt.kt b/src/main/kotlin/io/github/lucaargolo/kibe/block/CursedDirt.kt index 08864197..ee23fd3a 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/block/CursedDirt.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/block/CursedDirt.kt @@ -7,16 +7,15 @@ import io.github.lucaargolo.kibe.blockentity.BigTorchBlockEntity import io.github.lucaargolo.kibe.effect.EffectCompendium import io.github.lucaargolo.kibe.mixin.SpawnHelperInvoker import net.minecraft.block.* -import net.minecraft.entity.EntityType +import net.minecraft.entity.LivingEntity import net.minecraft.entity.SpawnGroup import net.minecraft.entity.SpawnReason import net.minecraft.entity.SpawnRestriction +import net.minecraft.entity.effect.StatusEffectInstance import net.minecraft.entity.mob.MobEntity import net.minecraft.entity.player.PlayerEntity import net.minecraft.fluid.EmptyFluid import net.minecraft.fluid.Fluids -import net.minecraft.nbt.NbtCompound -import net.minecraft.nbt.NbtList import net.minecraft.registry.Registries import net.minecraft.server.world.ServerWorld import net.minecraft.state.StateManager @@ -101,13 +100,14 @@ class CursedDirt(settings: Settings): GrassBlock(settings) { if (entry != null) { val mob = entry.type if(SpawnHelperInvoker.invokeCanSpawn(world, mob.spawnGroup, world.structureAccessor, world.chunkManager.chunkGenerator, entry, pos.up().mutableCopy(), 0.0)) { - val tag = getSpawnTag() - tag.putString("id", Registries.ENTITY_TYPE.getId(mob).toString()) - val entity = EntityType.loadEntityWithPassengers(tag, world) { + val entity = mob.create(world)?.let { it.refreshPositionAndAngles(pos.x+.5, pos.y+1.0, pos.z+.5, it.yaw, it.pitch) if(it.isInsideWall) null else if (!world.tryLoadEntity(it)) null else it } + if(entity is LivingEntity) { + entity.addStatusEffect(StatusEffectInstance(EffectCompendium.CURSED, 300)) + } if(entity is MobEntity) { entity.initialize(world, world.getLocalDifficulty(BlockPos.ofFloored(entity.pos)), SpawnReason.NATURAL, null) } @@ -115,18 +115,6 @@ class CursedDirt(settings: Settings): GrassBlock(settings) { } } - private fun getSpawnTag(): NbtCompound { - val activeEffect = NbtCompound() - activeEffect.putInt("Id", Registries.STATUS_EFFECT.getRawId(EffectCompendium.CURSED.value())) - activeEffect.putInt("Amplifier", 1) - activeEffect.putInt("Duration", 300) - val activeEffects = NbtList() - activeEffects.add(activeEffect) - val tag = NbtCompound() - tag.put("ActiveEffects", activeEffects) - return tag - } - private fun canSpread(state: BlockState, world: ServerWorld, pos: BlockPos): Boolean { return (world.getBlockState(pos).block == Blocks.DIRT || world.getBlockState(pos).block == Blocks.GRASS_BLOCK) && canSurvive(world.getBlockState(pos), world, pos) && state[Properties.LEVEL_15] > 0 } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/CoolerBlockEntity.kt b/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/CoolerBlockEntity.kt index ccd9c3fa..593b4708 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/CoolerBlockEntity.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/CoolerBlockEntity.kt @@ -1,8 +1,11 @@ package io.github.lucaargolo.kibe.blockentity import io.github.lucaargolo.kibe.utils.SyncableBlockEntity +import io.github.lucaargolo.kibe.utils.helper.FluidHelper import net.minecraft.block.BlockState +import net.minecraft.component.ComponentMap import net.minecraft.component.DataComponentTypes +import net.minecraft.component.type.NbtComponent import net.minecraft.entity.player.PlayerEntity import net.minecraft.inventory.Inventories import net.minecraft.inventory.SidedInventory @@ -18,6 +21,7 @@ class CoolerBlockEntity(pos: BlockPos, state: BlockState): SyncableBlockEntity(B var inventory: DefaultedList = DefaultedList.ofSize(1, ItemStack.EMPTY) override fun writeNbt(tag: NbtCompound, registryLookup: WrapperLookup) { + super.writeNbt(tag, registryLookup) Inventories.writeNbt(tag, inventory, registryLookup) } @@ -34,6 +38,11 @@ class CoolerBlockEntity(pos: BlockPos, state: BlockState): SyncableBlockEntity(B readNbt(tag, registryLookup) } + //TODO: Properly fix this here and in Entangled Chest/Tank + override fun addComponents(builder: ComponentMap.Builder) { + builder.add(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.of(NbtCompound().also { FluidHelper.writeTank(it, tank) })) + } + override fun size() = inventory.size override fun isEmpty() = inventory.all { it.isEmpty } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/DrawbridgeBlockEntity.kt b/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/DrawbridgeBlockEntity.kt index 9a34f75f..6fdd6f11 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/DrawbridgeBlockEntity.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/DrawbridgeBlockEntity.kt @@ -45,6 +45,7 @@ class DrawbridgeBlockEntity(pos: BlockPos, state: BlockState): SyncableBlockEnti } override fun writeNbt(tag: NbtCompound, registryLookup: WrapperLookup) { + super.writeNbt(tag, registryLookup) tag.putString("state", state.name) tag.putString("extendedBlock", extendedBlock?.let { Registries.BLOCK.getId(it).toString() } ?: "yeet") tag.putInt("extendedBlocks", extendedBlocks) @@ -53,9 +54,11 @@ class DrawbridgeBlockEntity(pos: BlockPos, state: BlockState): SyncableBlockEnti val itemStack = inventory[i] val nbtCompound = NbtCompound() nbtCompound.putByte("Slot", i.toByte()) - if(!itemStack.isEmpty) - itemStack.encode(registryLookup, nbtCompound) - nbtList.add(nbtCompound) + if(!itemStack.isEmpty) { + nbtList.add(itemStack.encode(registryLookup, nbtCompound)) + }else{ + nbtList.add(nbtCompound) + } } tag.put("Items", nbtList) } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/TankBlockEntity.kt b/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/TankBlockEntity.kt index 5291bcb3..cb2105b7 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/TankBlockEntity.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/blockentity/TankBlockEntity.kt @@ -8,6 +8,9 @@ import net.fabricmc.fabric.api.transfer.v1.storage.Storage import net.fabricmc.fabric.api.transfer.v1.storage.StorageUtil import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleVariantStorage import net.minecraft.block.BlockState +import net.minecraft.component.ComponentMap +import net.minecraft.component.DataComponentTypes +import net.minecraft.component.type.NbtComponent import net.minecraft.fluid.Fluids import net.minecraft.nbt.NbtCompound import net.minecraft.registry.RegistryWrapper.WrapperLookup @@ -52,6 +55,10 @@ class TankBlockEntity(pos: BlockPos, state: BlockState): SyncableBlockEntity(Blo override fun readClientNbt(tag: NbtCompound, registryLookup: WrapperLookup) = readNbt(tag, registryLookup) + override fun addComponents(builder: ComponentMap.Builder) { + builder.add(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.of(NbtCompound().also { FluidHelper.writeTank(it, tank) })) + } + companion object { fun getFluidStorage(be: TankBlockEntity, dir: Direction?): Storage { return be.tank diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/client/screen/BlockGeneratorScreen.kt b/src/main/kotlin/io/github/lucaargolo/kibe/client/screen/BlockGeneratorScreen.kt index 88c6ba22..547de5ef 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/client/screen/BlockGeneratorScreen.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/client/screen/BlockGeneratorScreen.kt @@ -111,7 +111,7 @@ class BlockGeneratorScreen(handler: BlockGeneratorScreenHandler, inventory: Play bufferBuilder.vertex(matrix, x1, y1, z).texture(u1, v1).color(r, g, b, 1.0f) bufferBuilder.vertex(matrix, x1, y0, z).texture(u1, v0).color(r, g, b, 1.0f) bufferBuilder.vertex(matrix, x0, y0, z).texture(u0, v0).color(r, g, b, 1.0f) - BufferRenderer.draw(bufferBuilder.end()) + BufferRenderer.drawWithGlobalProgram(bufferBuilder.end()) } } \ No newline at end of file diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/compat/TrinketAbilityRing.kt b/src/main/kotlin/io/github/lucaargolo/kibe/compat/TrinketAbilityRing.kt index d8923731..4eebce92 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/compat/TrinketAbilityRing.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/compat/TrinketAbilityRing.kt @@ -21,9 +21,9 @@ class TrinketAbilityRing(settings: Settings, ability: PlayerAbility) : AbilityRi if(!entity.world.isClient) { (entity as? PlayerEntityMixed)?.let { try { - it.kibe_activeRingsList.removeAll { pair -> pair.second != entity.world.time } + it.`kibe$getActiveRingsList`().removeAll { pair -> pair.second != entity.world.time } } catch (_: Exception) { } - it.kibe_activeRingsList.add(Pair(stack, entity.world.time)) + it.`kibe$getActiveRingsList`().add(Pair(stack, entity.world.time)) } } } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeBlockLootProvider.kt b/src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeBlockLootProvider.kt new file mode 100644 index 00000000..056bcadf --- /dev/null +++ b/src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeBlockLootProvider.kt @@ -0,0 +1,41 @@ +package io.github.lucaargolo.kibe.datagen + +import io.github.lucaargolo.kibe.block.BlockCompendium +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider +import net.minecraft.block.Block +import net.minecraft.component.DataComponentTypes +import net.minecraft.loot.LootPool +import net.minecraft.loot.LootTable +import net.minecraft.loot.condition.SurvivesExplosionLootCondition +import net.minecraft.loot.entry.ItemEntry +import net.minecraft.loot.function.CopyComponentsLootFunction +import net.minecraft.loot.provider.number.ConstantLootNumberProvider +import net.minecraft.registry.RegistryWrapper +import java.util.concurrent.CompletableFuture + +class KibeBlockLootProvider(dataOutput: FabricDataOutput, registryLookup: CompletableFuture?) : FabricBlockLootTableProvider(dataOutput, registryLookup) { + + override fun generate() { + val list = mutableListOf() + list.addAll(BlockCompendium.map.values) + addBlockEntity(list, BlockCompendium.ENTANGLED_CHEST) + addBlockEntity(list, BlockCompendium.ENTANGLED_TANK) + addBlockEntity(list, BlockCompendium.TANK) + addBlockEntity(list, BlockCompendium.COOLER) + list.forEach(this::addDrop) + } + + private fun addBlockEntity(list: MutableList, block: Block) { + this.addDrop(block, LootTable.builder() + .pool(LootPool.builder() + .conditionally(SurvivesExplosionLootCondition.builder()) + .with(ItemEntry.builder(block)) + .apply(CopyComponentsLootFunction.builder(CopyComponentsLootFunction.Source.BLOCK_ENTITY).include(DataComponentTypes.BLOCK_ENTITY_DATA)) + .rolls(ConstantLootNumberProvider.create(1.0F)) + ) + ) + list.remove(block) + } + +} \ No newline at end of file diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeDatagen.kt b/src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeDatagen.kt new file mode 100644 index 00000000..85348645 --- /dev/null +++ b/src/main/kotlin/io/github/lucaargolo/kibe/datagen/KibeDatagen.kt @@ -0,0 +1,13 @@ +package io.github.lucaargolo.kibe.datagen + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator + +object KibeDatagen: DataGeneratorEntrypoint { + + override fun onInitializeDataGenerator(generator: FabricDataGenerator) { + val myPack: FabricDataGenerator.Pack = generator.createPack() + myPack.addProvider(::KibeBlockLootProvider) + } + +} \ No newline at end of file diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/item/AbilityRing.kt b/src/main/kotlin/io/github/lucaargolo/kibe/item/AbilityRing.kt index 577ded62..aa5da6ff 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/item/AbilityRing.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/item/AbilityRing.kt @@ -22,9 +22,9 @@ open class AbilityRing(settings: Settings, val ability: PlayerAbility): BooleanI if(!world.isClient) { (entity as? PlayerEntityMixed)?.let { try { - it.kibe_activeRingsList.removeAll { pair -> pair.second != world.time } + it.`kibe$getActiveRingsList`().removeAll { pair -> pair.second != world.time } } catch (_: Exception) { } - it.kibe_activeRingsList.add(Pair(stack, world.time)) + it.`kibe$getActiveRingsList`().add(Pair(stack, world.time)) } } } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/item/BooleanItem.kt b/src/main/kotlin/io/github/lucaargolo/kibe/item/BooleanItem.kt index 90e6186e..d252b0fc 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/item/BooleanItem.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/item/BooleanItem.kt @@ -38,7 +38,7 @@ open class BooleanItem(settings: Settings): Item(settings) { } open fun appendDisabledTooltip(stack: ItemStack, tooltip: MutableList) { - tooltip.add(Text.translatable("tooltip.kibe.enabled")) + tooltip.add(Text.translatable("tooltip.kibe.disabled")) tooltip.add(Text.translatable("tooltip.kibe.shift2disable")) } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/item/CoolerBlockItem.kt b/src/main/kotlin/io/github/lucaargolo/kibe/item/CoolerBlockItem.kt index 24bf9b8b..6143e06e 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/item/CoolerBlockItem.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/item/CoolerBlockItem.kt @@ -86,11 +86,11 @@ class CoolerBlockItem(settings: Settings): BlockItem(BlockCompendium.COOLER, set class CoolerTooltipComponent(contents: BundleContentsComponent) : BundleTooltipComponent(contents) { override fun getWidth(textRenderer: TextRenderer?): Int { - return 1 + return 20 } override fun getHeight(): Int { - return 1 + return 26 } } diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/menu/CoolerBlockItemScreenHandler.kt b/src/main/kotlin/io/github/lucaargolo/kibe/menu/CoolerBlockItemScreenHandler.kt index 6fa47b62..929e61d4 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/menu/CoolerBlockItemScreenHandler.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/menu/CoolerBlockItemScreenHandler.kt @@ -66,10 +66,9 @@ class CoolerBlockItemScreenHandler(syncId: Int, val playerInventory: PlayerInven override fun onContentChanged(inventory: Inventory?) { super.onContentChanged(inventory) - stack.get(DataComponentTypes.BLOCK_ENTITY_DATA)?.apply { + val component = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA)?.apply { Inventories.writeNbt(it, rawInventory, world.registryManager) } - val component = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA) val coolerStack = playerInventory.player.getStackInHand(hand) if (coolerStack.item is CoolerBlockItem) { coolerStack.set(DataComponentTypes.BLOCK_ENTITY_DATA, component) diff --git a/src/main/kotlin/io/github/lucaargolo/kibe/utils/GenericCompendium.kt b/src/main/kotlin/io/github/lucaargolo/kibe/utils/GenericCompendium.kt index 9953b542..eacd08ca 100644 --- a/src/main/kotlin/io/github/lucaargolo/kibe/utils/GenericCompendium.kt +++ b/src/main/kotlin/io/github/lucaargolo/kibe/utils/GenericCompendium.kt @@ -4,7 +4,7 @@ import net.minecraft.util.Identifier abstract class GenericCompendium { - protected val map = mutableMapOf() + val map = mutableMapOf() protected open fun register(string: String, entry: E): E { return register(ModIdentifier.of(string), entry) @@ -19,4 +19,5 @@ abstract class GenericCompendium { abstract fun initializeClient() + } \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/cooler.json b/src/main/resources/data/kibe/loot_tables/blocks/cooler.json deleted file mode 100644 index 2cb83d94..00000000 --- a/src/main/resources/data/kibe/loot_tables/blocks/cooler.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ - { - "source": "", - "target": "BlockEntityTag", - "op": "merge" - } - ] - } - ], - "name": "kibe:cooler" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/entangled_chest.json b/src/main/resources/data/kibe/loot_tables/blocks/entangled_chest.json deleted file mode 100644 index bf4ca60e..00000000 --- a/src/main/resources/data/kibe/loot_tables/blocks/entangled_chest.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ - { - "source": "key", - "target": "BlockEntityTag.key", - "op": "replace" - }, - { - "source": "owner", - "target": "BlockEntityTag.owner", - "op": "replace" - }, - { - "source": "rune1", - "target": "BlockEntityTag.rune1", - "op": "replace" - }, - { - "source": "rune2", - "target": "BlockEntityTag.rune2", - "op": "replace" - }, - { - "source": "rune3", - "target": "BlockEntityTag.rune3", - "op": "replace" - }, - { - "source": "rune4", - "target": "BlockEntityTag.rune4", - "op": "replace" - }, - { - "source": "rune5", - "target": "BlockEntityTag.rune5", - "op": "replace" - }, - { - "source": "rune6", - "target": "BlockEntityTag.rune6", - "op": "replace" - }, - { - "source": "rune7", - "target": "BlockEntityTag.rune7", - "op": "replace" - }, - { - "source": "rune8", - "target": "BlockEntityTag.rune8", - "op": "replace" - } - ] - } - ], - "name": "kibe:entangled_chest" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/entangled_tank.json b/src/main/resources/data/kibe/loot_tables/blocks/entangled_tank.json deleted file mode 100644 index 4230be58..00000000 --- a/src/main/resources/data/kibe/loot_tables/blocks/entangled_tank.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ - { - "source": "key", - "target": "BlockEntityTag.key", - "op": "replace" - }, - { - "source": "owner", - "target": "BlockEntityTag.owner", - "op": "replace" - }, - { - "source": "rune1", - "target": "BlockEntityTag.rune1", - "op": "replace" - }, - { - "source": "rune2", - "target": "BlockEntityTag.rune2", - "op": "replace" - }, - { - "source": "rune3", - "target": "BlockEntityTag.rune3", - "op": "replace" - }, - { - "source": "rune4", - "target": "BlockEntityTag.rune4", - "op": "replace" - }, - { - "source": "rune5", - "target": "BlockEntityTag.rune5", - "op": "replace" - }, - { - "source": "rune6", - "target": "BlockEntityTag.rune6", - "op": "replace" - }, - { - "source": "rune7", - "target": "BlockEntityTag.rune7", - "op": "replace" - }, - { - "source": "rune8", - "target": "BlockEntityTag.rune8", - "op": "replace" - } - ] - } - ], - "name": "kibe:entangled_tank" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/kibe/loot_tables/blocks/tank.json b/src/main/resources/data/kibe/loot_tables/blocks/tank.json deleted file mode 100644 index cc6e1d54..00000000 --- a/src/main/resources/data/kibe/loot_tables/blocks/tank.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ - { - "source": "variant", - "target": "BlockEntityTag.variant", - "op": "merge" - }, - { - "source": "amount", - "target": "BlockEntityTag.amount", - "op": "replace" - } - ] - } - ], - "name": "kibe:tank" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/kibe/recipes/angel_ring.json b/src/main/resources/data/kibe/recipe/angel_ring.json similarity index 100% rename from src/main/resources/data/kibe/recipes/angel_ring.json rename to src/main/resources/data/kibe/recipe/angel_ring.json diff --git a/src/main/resources/data/kibe/recipes/basalt_generator_mk1.json b/src/main/resources/data/kibe/recipe/basalt_generator_mk1.json similarity index 100% rename from src/main/resources/data/kibe/recipes/basalt_generator_mk1.json rename to src/main/resources/data/kibe/recipe/basalt_generator_mk1.json diff --git a/src/main/resources/data/kibe/recipes/basalt_generator_mk2.json b/src/main/resources/data/kibe/recipe/basalt_generator_mk2.json similarity index 100% rename from src/main/resources/data/kibe/recipes/basalt_generator_mk2.json rename to src/main/resources/data/kibe/recipe/basalt_generator_mk2.json diff --git a/src/main/resources/data/kibe/recipes/basalt_generator_mk3.json b/src/main/resources/data/kibe/recipe/basalt_generator_mk3.json similarity index 100% rename from src/main/resources/data/kibe/recipes/basalt_generator_mk3.json rename to src/main/resources/data/kibe/recipe/basalt_generator_mk3.json diff --git a/src/main/resources/data/kibe/recipes/basalt_generator_mk4.json b/src/main/resources/data/kibe/recipe/basalt_generator_mk4.json similarity index 100% rename from src/main/resources/data/kibe/recipes/basalt_generator_mk4.json rename to src/main/resources/data/kibe/recipe/basalt_generator_mk4.json diff --git a/src/main/resources/data/kibe/recipes/basalt_generator_mk5.json b/src/main/resources/data/kibe/recipe/basalt_generator_mk5.json similarity index 100% rename from src/main/resources/data/kibe/recipes/basalt_generator_mk5.json rename to src/main/resources/data/kibe/recipe/basalt_generator_mk5.json diff --git a/src/main/resources/data/kibe/recipes/big_torch.json b/src/main/resources/data/kibe/recipe/big_torch.json similarity index 100% rename from src/main/resources/data/kibe/recipes/big_torch.json rename to src/main/resources/data/kibe/recipe/big_torch.json diff --git a/src/main/resources/data/kibe/recipes/black_elevator.json b/src/main/resources/data/kibe/recipe/black_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_elevator.json rename to src/main/resources/data/kibe/recipe/black_elevator.json diff --git a/src/main/resources/data/kibe/recipes/black_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/black_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/black_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/black_glider.json b/src/main/resources/data/kibe/recipe/black_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_glider.json rename to src/main/resources/data/kibe/recipe/black_glider.json diff --git a/src/main/resources/data/kibe/recipes/black_rune.json b/src/main/resources/data/kibe/recipe/black_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_rune.json rename to src/main/resources/data/kibe/recipe/black_rune.json diff --git a/src/main/resources/data/kibe/recipes/black_rune_from_rune.json b/src/main/resources/data/kibe/recipe/black_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/black_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/black_sleeping_bag.json b/src/main/resources/data/kibe/recipe/black_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/black_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/black_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/black_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/black_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/black_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/blue_elevator.json b/src/main/resources/data/kibe/recipe/blue_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_elevator.json rename to src/main/resources/data/kibe/recipe/blue_elevator.json diff --git a/src/main/resources/data/kibe/recipes/blue_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/blue_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/blue_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/blue_glider.json b/src/main/resources/data/kibe/recipe/blue_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_glider.json rename to src/main/resources/data/kibe/recipe/blue_glider.json diff --git a/src/main/resources/data/kibe/recipes/blue_rune.json b/src/main/resources/data/kibe/recipe/blue_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_rune.json rename to src/main/resources/data/kibe/recipe/blue_rune.json diff --git a/src/main/resources/data/kibe/recipes/blue_rune_from_rune.json b/src/main/resources/data/kibe/recipe/blue_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/blue_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/blue_sleeping_bag.json b/src/main/resources/data/kibe/recipe/blue_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/blue_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/blue_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/blue_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/blue_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/blue_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/breaker.json b/src/main/resources/data/kibe/recipe/breaker.json similarity index 100% rename from src/main/resources/data/kibe/recipes/breaker.json rename to src/main/resources/data/kibe/recipe/breaker.json diff --git a/src/main/resources/data/kibe/recipes/brown_elevator.json b/src/main/resources/data/kibe/recipe/brown_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_elevator.json rename to src/main/resources/data/kibe/recipe/brown_elevator.json diff --git a/src/main/resources/data/kibe/recipes/brown_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/brown_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/brown_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/brown_glider.json b/src/main/resources/data/kibe/recipe/brown_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_glider.json rename to src/main/resources/data/kibe/recipe/brown_glider.json diff --git a/src/main/resources/data/kibe/recipes/brown_rune.json b/src/main/resources/data/kibe/recipe/brown_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_rune.json rename to src/main/resources/data/kibe/recipe/brown_rune.json diff --git a/src/main/resources/data/kibe/recipes/brown_rune_from_rune.json b/src/main/resources/data/kibe/recipe/brown_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/brown_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/brown_sleeping_bag.json b/src/main/resources/data/kibe/recipe/brown_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/brown_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/brown_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/brown_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/brown_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/brown_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/chunk_loader.json b/src/main/resources/data/kibe/recipe/chunk_loader.json similarity index 100% rename from src/main/resources/data/kibe/recipes/chunk_loader.json rename to src/main/resources/data/kibe/recipe/chunk_loader.json diff --git a/src/main/resources/data/kibe/recipes/cobblestone_generator_mk1.json b/src/main/resources/data/kibe/recipe/cobblestone_generator_mk1.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cobblestone_generator_mk1.json rename to src/main/resources/data/kibe/recipe/cobblestone_generator_mk1.json diff --git a/src/main/resources/data/kibe/recipes/cobblestone_generator_mk2.json b/src/main/resources/data/kibe/recipe/cobblestone_generator_mk2.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cobblestone_generator_mk2.json rename to src/main/resources/data/kibe/recipe/cobblestone_generator_mk2.json diff --git a/src/main/resources/data/kibe/recipes/cobblestone_generator_mk3.json b/src/main/resources/data/kibe/recipe/cobblestone_generator_mk3.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cobblestone_generator_mk3.json rename to src/main/resources/data/kibe/recipe/cobblestone_generator_mk3.json diff --git a/src/main/resources/data/kibe/recipes/cobblestone_generator_mk4.json b/src/main/resources/data/kibe/recipe/cobblestone_generator_mk4.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cobblestone_generator_mk4.json rename to src/main/resources/data/kibe/recipe/cobblestone_generator_mk4.json diff --git a/src/main/resources/data/kibe/recipes/cobblestone_generator_mk5.json b/src/main/resources/data/kibe/recipe/cobblestone_generator_mk5.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cobblestone_generator_mk5.json rename to src/main/resources/data/kibe/recipe/cobblestone_generator_mk5.json diff --git a/src/main/resources/data/kibe/recipes/cooler.json b/src/main/resources/data/kibe/recipe/cooler.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cooler.json rename to src/main/resources/data/kibe/recipe/cooler.json diff --git a/src/main/resources/data/kibe/recipes/cursed_kibe.json b/src/main/resources/data/kibe/recipe/cursed_kibe.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cursed_kibe.json rename to src/main/resources/data/kibe/recipe/cursed_kibe.json diff --git a/src/main/resources/data/kibe/recipes/cursed_lasso.json b/src/main/resources/data/kibe/recipe/cursed_lasso.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cursed_lasso.json rename to src/main/resources/data/kibe/recipe/cursed_lasso.json diff --git a/src/main/resources/data/kibe/recipes/cursed_seeds.json b/src/main/resources/data/kibe/recipe/cursed_seeds.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cursed_seeds.json rename to src/main/resources/data/kibe/recipe/cursed_seeds.json diff --git a/src/main/resources/data/kibe/recipes/cyan_elevator.json b/src/main/resources/data/kibe/recipe/cyan_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_elevator.json rename to src/main/resources/data/kibe/recipe/cyan_elevator.json diff --git a/src/main/resources/data/kibe/recipes/cyan_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/cyan_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/cyan_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/cyan_glider.json b/src/main/resources/data/kibe/recipe/cyan_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_glider.json rename to src/main/resources/data/kibe/recipe/cyan_glider.json diff --git a/src/main/resources/data/kibe/recipes/cyan_rune.json b/src/main/resources/data/kibe/recipe/cyan_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_rune.json rename to src/main/resources/data/kibe/recipe/cyan_rune.json diff --git a/src/main/resources/data/kibe/recipes/cyan_rune_from_rune.json b/src/main/resources/data/kibe/recipe/cyan_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/cyan_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/cyan_sleeping_bag.json b/src/main/resources/data/kibe/recipe/cyan_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/cyan_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/cyan_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/cyan_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/cyan_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/cyan_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/dehumidifier.json b/src/main/resources/data/kibe/recipe/dehumidifier.json similarity index 100% rename from src/main/resources/data/kibe/recipes/dehumidifier.json rename to src/main/resources/data/kibe/recipe/dehumidifier.json diff --git a/src/main/resources/data/kibe/recipes/diamond_kibe.json b/src/main/resources/data/kibe/recipe/diamond_kibe.json similarity index 100% rename from src/main/resources/data/kibe/recipes/diamond_kibe.json rename to src/main/resources/data/kibe/recipe/diamond_kibe.json diff --git a/src/main/resources/data/kibe/recipes/diamond_lasso.json b/src/main/resources/data/kibe/recipe/diamond_lasso.json similarity index 100% rename from src/main/resources/data/kibe/recipes/diamond_lasso.json rename to src/main/resources/data/kibe/recipe/diamond_lasso.json diff --git a/src/main/resources/data/kibe/recipes/diamond_ring.json b/src/main/resources/data/kibe/recipe/diamond_ring.json similarity index 100% rename from src/main/resources/data/kibe/recipes/diamond_ring.json rename to src/main/resources/data/kibe/recipe/diamond_ring.json diff --git a/src/main/resources/data/kibe/recipes/diamond_spikes.json b/src/main/resources/data/kibe/recipe/diamond_spikes.json similarity index 100% rename from src/main/resources/data/kibe/recipes/diamond_spikes.json rename to src/main/resources/data/kibe/recipe/diamond_spikes.json diff --git a/src/main/resources/data/kibe/recipes/drawbridge.json b/src/main/resources/data/kibe/recipe/drawbridge.json similarity index 100% rename from src/main/resources/data/kibe/recipes/drawbridge.json rename to src/main/resources/data/kibe/recipe/drawbridge.json diff --git a/src/main/resources/data/kibe/recipes/entangled_bag.json b/src/main/resources/data/kibe/recipe/entangled_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/entangled_bag.json rename to src/main/resources/data/kibe/recipe/entangled_bag.json diff --git a/src/main/resources/data/kibe/recipes/entangled_bucket.json b/src/main/resources/data/kibe/recipe/entangled_bucket.json similarity index 100% rename from src/main/resources/data/kibe/recipes/entangled_bucket.json rename to src/main/resources/data/kibe/recipe/entangled_bucket.json diff --git a/src/main/resources/data/kibe/recipes/entangled_chest.json b/src/main/resources/data/kibe/recipe/entangled_chest.json similarity index 100% rename from src/main/resources/data/kibe/recipes/entangled_chest.json rename to src/main/resources/data/kibe/recipe/entangled_chest.json diff --git a/src/main/resources/data/kibe/recipes/entangled_tank.json b/src/main/resources/data/kibe/recipe/entangled_tank.json similarity index 100% rename from src/main/resources/data/kibe/recipes/entangled_tank.json rename to src/main/resources/data/kibe/recipe/entangled_tank.json diff --git a/src/main/resources/data/kibe/recipes/escape_rope.json b/src/main/resources/data/kibe/recipe/escape_rope.json similarity index 100% rename from src/main/resources/data/kibe/recipes/escape_rope.json rename to src/main/resources/data/kibe/recipe/escape_rope.json diff --git a/src/main/resources/data/kibe/recipes/experience_bottle.json b/src/main/resources/data/kibe/recipe/experience_bottle.json similarity index 100% rename from src/main/resources/data/kibe/recipes/experience_bottle.json rename to src/main/resources/data/kibe/recipe/experience_bottle.json diff --git a/src/main/resources/data/kibe/recipes/express_conveyor_belt.json b/src/main/resources/data/kibe/recipe/express_conveyor_belt.json similarity index 100% rename from src/main/resources/data/kibe/recipes/express_conveyor_belt.json rename to src/main/resources/data/kibe/recipe/express_conveyor_belt.json diff --git a/src/main/resources/data/kibe/recipes/fast_conveyor_belt.json b/src/main/resources/data/kibe/recipe/fast_conveyor_belt.json similarity index 100% rename from src/main/resources/data/kibe/recipes/fast_conveyor_belt.json rename to src/main/resources/data/kibe/recipe/fast_conveyor_belt.json diff --git a/src/main/resources/data/kibe/recipes/fluid_hopper.json b/src/main/resources/data/kibe/recipe/fluid_hopper.json similarity index 100% rename from src/main/resources/data/kibe/recipes/fluid_hopper.json rename to src/main/resources/data/kibe/recipe/fluid_hopper.json diff --git a/src/main/resources/data/kibe/recipes/glider_left_wing.json b/src/main/resources/data/kibe/recipe/glider_left_wing.json similarity index 100% rename from src/main/resources/data/kibe/recipes/glider_left_wing.json rename to src/main/resources/data/kibe/recipe/glider_left_wing.json diff --git a/src/main/resources/data/kibe/recipes/glider_left_wing_from_right.json b/src/main/resources/data/kibe/recipe/glider_left_wing_from_right.json similarity index 100% rename from src/main/resources/data/kibe/recipes/glider_left_wing_from_right.json rename to src/main/resources/data/kibe/recipe/glider_left_wing_from_right.json diff --git a/src/main/resources/data/kibe/recipes/glider_right_wing.json b/src/main/resources/data/kibe/recipe/glider_right_wing.json similarity index 100% rename from src/main/resources/data/kibe/recipes/glider_right_wing.json rename to src/main/resources/data/kibe/recipe/glider_right_wing.json diff --git a/src/main/resources/data/kibe/recipes/glider_right_wing_from_left.json b/src/main/resources/data/kibe/recipe/glider_right_wing_from_left.json similarity index 100% rename from src/main/resources/data/kibe/recipes/glider_right_wing_from_left.json rename to src/main/resources/data/kibe/recipe/glider_right_wing_from_left.json diff --git a/src/main/resources/data/kibe/recipes/gold_spikes.json b/src/main/resources/data/kibe/recipe/gold_spikes.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gold_spikes.json rename to src/main/resources/data/kibe/recipe/gold_spikes.json diff --git a/src/main/resources/data/kibe/recipes/golden_kibe.json b/src/main/resources/data/kibe/recipe/golden_kibe.json similarity index 100% rename from src/main/resources/data/kibe/recipes/golden_kibe.json rename to src/main/resources/data/kibe/recipe/golden_kibe.json diff --git a/src/main/resources/data/kibe/recipes/golden_lasso.json b/src/main/resources/data/kibe/recipe/golden_lasso.json similarity index 100% rename from src/main/resources/data/kibe/recipes/golden_lasso.json rename to src/main/resources/data/kibe/recipe/golden_lasso.json diff --git a/src/main/resources/data/kibe/recipes/gray_elevator.json b/src/main/resources/data/kibe/recipe/gray_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_elevator.json rename to src/main/resources/data/kibe/recipe/gray_elevator.json diff --git a/src/main/resources/data/kibe/recipes/gray_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/gray_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/gray_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/gray_glider.json b/src/main/resources/data/kibe/recipe/gray_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_glider.json rename to src/main/resources/data/kibe/recipe/gray_glider.json diff --git a/src/main/resources/data/kibe/recipes/gray_rune.json b/src/main/resources/data/kibe/recipe/gray_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_rune.json rename to src/main/resources/data/kibe/recipe/gray_rune.json diff --git a/src/main/resources/data/kibe/recipes/gray_rune_from_rune.json b/src/main/resources/data/kibe/recipe/gray_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/gray_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/gray_sleeping_bag.json b/src/main/resources/data/kibe/recipe/gray_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/gray_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/gray_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/gray_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/gray_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/gray_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/green_elevator.json b/src/main/resources/data/kibe/recipe/green_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_elevator.json rename to src/main/resources/data/kibe/recipe/green_elevator.json diff --git a/src/main/resources/data/kibe/recipes/green_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/green_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/green_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/green_glider.json b/src/main/resources/data/kibe/recipe/green_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_glider.json rename to src/main/resources/data/kibe/recipe/green_glider.json diff --git a/src/main/resources/data/kibe/recipes/green_rune.json b/src/main/resources/data/kibe/recipe/green_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_rune.json rename to src/main/resources/data/kibe/recipe/green_rune.json diff --git a/src/main/resources/data/kibe/recipes/green_rune_from_rune.json b/src/main/resources/data/kibe/recipe/green_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/green_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/green_sleeping_bag.json b/src/main/resources/data/kibe/recipe/green_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/green_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/green_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/green_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/green_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/green_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/heater.json b/src/main/resources/data/kibe/recipe/heater.json similarity index 100% rename from src/main/resources/data/kibe/recipes/heater.json rename to src/main/resources/data/kibe/recipe/heater.json diff --git a/src/main/resources/data/kibe/recipes/igniter.json b/src/main/resources/data/kibe/recipe/igniter.json similarity index 100% rename from src/main/resources/data/kibe/recipes/igniter.json rename to src/main/resources/data/kibe/recipe/igniter.json diff --git a/src/main/resources/data/kibe/recipes/iron_spikes.json b/src/main/resources/data/kibe/recipe/iron_spikes.json similarity index 100% rename from src/main/resources/data/kibe/recipes/iron_spikes.json rename to src/main/resources/data/kibe/recipe/iron_spikes.json diff --git a/src/main/resources/data/kibe/recipes/kibe.json b/src/main/resources/data/kibe/recipe/kibe.json similarity index 100% rename from src/main/resources/data/kibe/recipes/kibe.json rename to src/main/resources/data/kibe/recipe/kibe.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_elevator.json b/src/main/resources/data/kibe/recipe/light_blue_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_elevator.json rename to src/main/resources/data/kibe/recipe/light_blue_elevator.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/light_blue_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/light_blue_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_glider.json b/src/main/resources/data/kibe/recipe/light_blue_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_glider.json rename to src/main/resources/data/kibe/recipe/light_blue_glider.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_rune.json b/src/main/resources/data/kibe/recipe/light_blue_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_rune.json rename to src/main/resources/data/kibe/recipe/light_blue_rune.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_rune_from_rune.json b/src/main/resources/data/kibe/recipe/light_blue_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/light_blue_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_sleeping_bag.json b/src/main/resources/data/kibe/recipe/light_blue_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/light_blue_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/light_blue_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/light_blue_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_blue_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/light_blue_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_elevator.json b/src/main/resources/data/kibe/recipe/light_gray_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_elevator.json rename to src/main/resources/data/kibe/recipe/light_gray_elevator.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/light_gray_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/light_gray_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_glider.json b/src/main/resources/data/kibe/recipe/light_gray_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_glider.json rename to src/main/resources/data/kibe/recipe/light_gray_glider.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_rune.json b/src/main/resources/data/kibe/recipe/light_gray_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_rune.json rename to src/main/resources/data/kibe/recipe/light_gray_rune.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_rune_from_rune.json b/src/main/resources/data/kibe/recipe/light_gray_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/light_gray_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_sleeping_bag.json b/src/main/resources/data/kibe/recipe/light_gray_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/light_gray_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/light_gray_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/light_gray_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_gray_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/light_gray_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/light_ring.json b/src/main/resources/data/kibe/recipe/light_ring.json similarity index 100% rename from src/main/resources/data/kibe/recipes/light_ring.json rename to src/main/resources/data/kibe/recipe/light_ring.json diff --git a/src/main/resources/data/kibe/recipes/lime_elevator.json b/src/main/resources/data/kibe/recipe/lime_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_elevator.json rename to src/main/resources/data/kibe/recipe/lime_elevator.json diff --git a/src/main/resources/data/kibe/recipes/lime_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/lime_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/lime_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/lime_glider.json b/src/main/resources/data/kibe/recipe/lime_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_glider.json rename to src/main/resources/data/kibe/recipe/lime_glider.json diff --git a/src/main/resources/data/kibe/recipes/lime_rune.json b/src/main/resources/data/kibe/recipe/lime_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_rune.json rename to src/main/resources/data/kibe/recipe/lime_rune.json diff --git a/src/main/resources/data/kibe/recipes/lime_rune_from_rune.json b/src/main/resources/data/kibe/recipe/lime_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/lime_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/lime_sleeping_bag.json b/src/main/resources/data/kibe/recipe/lime_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/lime_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/lime_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/lime_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/lime_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/lime_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/liquid_xp_bucket.json b/src/main/resources/data/kibe/recipe/liquid_xp_bucket.json similarity index 100% rename from src/main/resources/data/kibe/recipes/liquid_xp_bucket.json rename to src/main/resources/data/kibe/recipe/liquid_xp_bucket.json diff --git a/src/main/resources/data/kibe/recipes/magenta_elevator.json b/src/main/resources/data/kibe/recipe/magenta_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_elevator.json rename to src/main/resources/data/kibe/recipe/magenta_elevator.json diff --git a/src/main/resources/data/kibe/recipes/magenta_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/magenta_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/magenta_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/magenta_glider.json b/src/main/resources/data/kibe/recipe/magenta_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_glider.json rename to src/main/resources/data/kibe/recipe/magenta_glider.json diff --git a/src/main/resources/data/kibe/recipes/magenta_rune.json b/src/main/resources/data/kibe/recipe/magenta_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_rune.json rename to src/main/resources/data/kibe/recipe/magenta_rune.json diff --git a/src/main/resources/data/kibe/recipes/magenta_rune_from_rune.json b/src/main/resources/data/kibe/recipe/magenta_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/magenta_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/magenta_sleeping_bag.json b/src/main/resources/data/kibe/recipe/magenta_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/magenta_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/magenta_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/magenta_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magenta_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/magenta_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/magma_ring.json b/src/main/resources/data/kibe/recipe/magma_ring.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magma_ring.json rename to src/main/resources/data/kibe/recipe/magma_ring.json diff --git a/src/main/resources/data/kibe/recipes/magnet.json b/src/main/resources/data/kibe/recipe/magnet.json similarity index 100% rename from src/main/resources/data/kibe/recipes/magnet.json rename to src/main/resources/data/kibe/recipe/magnet.json diff --git a/src/main/resources/data/kibe/recipes/measuring_tape.json b/src/main/resources/data/kibe/recipe/measuring_tape.json similarity index 100% rename from src/main/resources/data/kibe/recipes/measuring_tape.json rename to src/main/resources/data/kibe/recipe/measuring_tape.json diff --git a/src/main/resources/data/kibe/recipes/obsidian_sand.json b/src/main/resources/data/kibe/recipe/obsidian_sand.json similarity index 100% rename from src/main/resources/data/kibe/recipes/obsidian_sand.json rename to src/main/resources/data/kibe/recipe/obsidian_sand.json diff --git a/src/main/resources/data/kibe/recipes/orange_elevator.json b/src/main/resources/data/kibe/recipe/orange_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_elevator.json rename to src/main/resources/data/kibe/recipe/orange_elevator.json diff --git a/src/main/resources/data/kibe/recipes/orange_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/orange_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/orange_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/orange_glider.json b/src/main/resources/data/kibe/recipe/orange_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_glider.json rename to src/main/resources/data/kibe/recipe/orange_glider.json diff --git a/src/main/resources/data/kibe/recipes/orange_rune.json b/src/main/resources/data/kibe/recipe/orange_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_rune.json rename to src/main/resources/data/kibe/recipe/orange_rune.json diff --git a/src/main/resources/data/kibe/recipes/orange_rune_from_rune.json b/src/main/resources/data/kibe/recipe/orange_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/orange_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/orange_sleeping_bag.json b/src/main/resources/data/kibe/recipe/orange_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/orange_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/orange_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/orange_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/orange_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/orange_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/pink_elevator.json b/src/main/resources/data/kibe/recipe/pink_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_elevator.json rename to src/main/resources/data/kibe/recipe/pink_elevator.json diff --git a/src/main/resources/data/kibe/recipes/pink_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/pink_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/pink_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/pink_glider.json b/src/main/resources/data/kibe/recipe/pink_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_glider.json rename to src/main/resources/data/kibe/recipe/pink_glider.json diff --git a/src/main/resources/data/kibe/recipes/pink_rune.json b/src/main/resources/data/kibe/recipe/pink_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_rune.json rename to src/main/resources/data/kibe/recipe/pink_rune.json diff --git a/src/main/resources/data/kibe/recipes/pink_rune_from_rune.json b/src/main/resources/data/kibe/recipe/pink_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/pink_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/pink_sleeping_bag.json b/src/main/resources/data/kibe/recipe/pink_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/pink_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/pink_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/pink_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pink_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/pink_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/placer.json b/src/main/resources/data/kibe/recipe/placer.json similarity index 100% rename from src/main/resources/data/kibe/recipes/placer.json rename to src/main/resources/data/kibe/recipe/placer.json diff --git a/src/main/resources/data/kibe/recipes/pocket_crafting_table.json b/src/main/resources/data/kibe/recipe/pocket_crafting_table.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pocket_crafting_table.json rename to src/main/resources/data/kibe/recipe/pocket_crafting_table.json diff --git a/src/main/resources/data/kibe/recipes/pocket_trash_can.json b/src/main/resources/data/kibe/recipe/pocket_trash_can.json similarity index 100% rename from src/main/resources/data/kibe/recipes/pocket_trash_can.json rename to src/main/resources/data/kibe/recipe/pocket_trash_can.json diff --git a/src/main/resources/data/kibe/recipes/purple_elevator.json b/src/main/resources/data/kibe/recipe/purple_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_elevator.json rename to src/main/resources/data/kibe/recipe/purple_elevator.json diff --git a/src/main/resources/data/kibe/recipes/purple_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/purple_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/purple_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/purple_glider.json b/src/main/resources/data/kibe/recipe/purple_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_glider.json rename to src/main/resources/data/kibe/recipe/purple_glider.json diff --git a/src/main/resources/data/kibe/recipes/purple_rune.json b/src/main/resources/data/kibe/recipe/purple_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_rune.json rename to src/main/resources/data/kibe/recipe/purple_rune.json diff --git a/src/main/resources/data/kibe/recipes/purple_rune_from_rune.json b/src/main/resources/data/kibe/recipe/purple_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/purple_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/purple_sleeping_bag.json b/src/main/resources/data/kibe/recipe/purple_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/purple_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/purple_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/purple_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/purple_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/purple_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/red_elevator.json b/src/main/resources/data/kibe/recipe/red_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_elevator.json rename to src/main/resources/data/kibe/recipe/red_elevator.json diff --git a/src/main/resources/data/kibe/recipes/red_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/red_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/red_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/red_glider.json b/src/main/resources/data/kibe/recipe/red_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_glider.json rename to src/main/resources/data/kibe/recipe/red_glider.json diff --git a/src/main/resources/data/kibe/recipes/red_rune.json b/src/main/resources/data/kibe/recipe/red_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_rune.json rename to src/main/resources/data/kibe/recipe/red_rune.json diff --git a/src/main/resources/data/kibe/recipes/red_rune_from_rune.json b/src/main/resources/data/kibe/recipe/red_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/red_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/red_sleeping_bag.json b/src/main/resources/data/kibe/recipe/red_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/red_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/red_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/red_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/red_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/red_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/redstone_timer.json b/src/main/resources/data/kibe/recipe/redstone_timer.json similarity index 100% rename from src/main/resources/data/kibe/recipes/redstone_timer.json rename to src/main/resources/data/kibe/recipe/redstone_timer.json diff --git a/src/main/resources/data/kibe/recipes/regular_conveyor_belt.json b/src/main/resources/data/kibe/recipe/regular_conveyor_belt.json similarity index 100% rename from src/main/resources/data/kibe/recipes/regular_conveyor_belt.json rename to src/main/resources/data/kibe/recipe/regular_conveyor_belt.json diff --git a/src/main/resources/data/kibe/recipes/slime_boots.json b/src/main/resources/data/kibe/recipe/slime_boots.json similarity index 100% rename from src/main/resources/data/kibe/recipes/slime_boots.json rename to src/main/resources/data/kibe/recipe/slime_boots.json diff --git a/src/main/resources/data/kibe/recipes/slime_sling.json b/src/main/resources/data/kibe/recipe/slime_sling.json similarity index 100% rename from src/main/resources/data/kibe/recipes/slime_sling.json rename to src/main/resources/data/kibe/recipe/slime_sling.json diff --git a/src/main/resources/data/kibe/recipes/stone_spikes.json b/src/main/resources/data/kibe/recipe/stone_spikes.json similarity index 100% rename from src/main/resources/data/kibe/recipes/stone_spikes.json rename to src/main/resources/data/kibe/recipe/stone_spikes.json diff --git a/src/main/resources/data/kibe/recipes/tank.json b/src/main/resources/data/kibe/recipe/tank.json similarity index 100% rename from src/main/resources/data/kibe/recipes/tank.json rename to src/main/resources/data/kibe/recipe/tank.json diff --git a/src/main/resources/data/kibe/recipes/torch_sling.json b/src/main/resources/data/kibe/recipe/torch_sling.json similarity index 100% rename from src/main/resources/data/kibe/recipes/torch_sling.json rename to src/main/resources/data/kibe/recipe/torch_sling.json diff --git a/src/main/resources/data/kibe/recipes/trash_can.json b/src/main/resources/data/kibe/recipe/trash_can.json similarity index 100% rename from src/main/resources/data/kibe/recipes/trash_can.json rename to src/main/resources/data/kibe/recipe/trash_can.json diff --git a/src/main/resources/data/kibe/recipes/vacuum_hopper.json b/src/main/resources/data/kibe/recipe/vacuum_hopper.json similarity index 100% rename from src/main/resources/data/kibe/recipes/vacuum_hopper.json rename to src/main/resources/data/kibe/recipe/vacuum_hopper.json diff --git a/src/main/resources/data/kibe/recipes/void_bucket.json b/src/main/resources/data/kibe/recipe/void_bucket.json similarity index 100% rename from src/main/resources/data/kibe/recipes/void_bucket.json rename to src/main/resources/data/kibe/recipe/void_bucket.json diff --git a/src/main/resources/data/kibe/recipes/water_ring.json b/src/main/resources/data/kibe/recipe/water_ring.json similarity index 100% rename from src/main/resources/data/kibe/recipes/water_ring.json rename to src/main/resources/data/kibe/recipe/water_ring.json diff --git a/src/main/resources/data/kibe/recipes/white_elevator.json b/src/main/resources/data/kibe/recipe/white_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_elevator.json rename to src/main/resources/data/kibe/recipe/white_elevator.json diff --git a/src/main/resources/data/kibe/recipes/white_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/white_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/white_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/white_glider.json b/src/main/resources/data/kibe/recipe/white_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_glider.json rename to src/main/resources/data/kibe/recipe/white_glider.json diff --git a/src/main/resources/data/kibe/recipes/white_rune.json b/src/main/resources/data/kibe/recipe/white_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_rune.json rename to src/main/resources/data/kibe/recipe/white_rune.json diff --git a/src/main/resources/data/kibe/recipes/white_rune_from_rune.json b/src/main/resources/data/kibe/recipe/white_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/white_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/white_sleeping_bag.json b/src/main/resources/data/kibe/recipe/white_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/white_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/white_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/white_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/white_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/white_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/wither_builder.json b/src/main/resources/data/kibe/recipe/wither_builder.json similarity index 100% rename from src/main/resources/data/kibe/recipes/wither_builder.json rename to src/main/resources/data/kibe/recipe/wither_builder.json diff --git a/src/main/resources/data/kibe/recipes/wither_proof_block.json b/src/main/resources/data/kibe/recipe/wither_proof_block.json similarity index 100% rename from src/main/resources/data/kibe/recipes/wither_proof_block.json rename to src/main/resources/data/kibe/recipe/wither_proof_block.json diff --git a/src/main/resources/data/kibe/recipes/wither_proof_glass.json b/src/main/resources/data/kibe/recipe/wither_proof_glass.json similarity index 100% rename from src/main/resources/data/kibe/recipes/wither_proof_glass.json rename to src/main/resources/data/kibe/recipe/wither_proof_glass.json diff --git a/src/main/resources/data/kibe/recipes/wither_proof_sand.json b/src/main/resources/data/kibe/recipe/wither_proof_sand.json similarity index 100% rename from src/main/resources/data/kibe/recipes/wither_proof_sand.json rename to src/main/resources/data/kibe/recipe/wither_proof_sand.json diff --git a/src/main/resources/data/kibe/recipes/wooden_bucket.json b/src/main/resources/data/kibe/recipe/wooden_bucket.json similarity index 100% rename from src/main/resources/data/kibe/recipes/wooden_bucket.json rename to src/main/resources/data/kibe/recipe/wooden_bucket.json diff --git a/src/main/resources/data/kibe/recipes/xp_drain.json b/src/main/resources/data/kibe/recipe/xp_drain.json similarity index 100% rename from src/main/resources/data/kibe/recipes/xp_drain.json rename to src/main/resources/data/kibe/recipe/xp_drain.json diff --git a/src/main/resources/data/kibe/recipes/xp_shower.json b/src/main/resources/data/kibe/recipe/xp_shower.json similarity index 100% rename from src/main/resources/data/kibe/recipes/xp_shower.json rename to src/main/resources/data/kibe/recipe/xp_shower.json diff --git a/src/main/resources/data/kibe/recipes/yellow_elevator.json b/src/main/resources/data/kibe/recipe/yellow_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_elevator.json rename to src/main/resources/data/kibe/recipe/yellow_elevator.json diff --git a/src/main/resources/data/kibe/recipes/yellow_elevator_from_elevator.json b/src/main/resources/data/kibe/recipe/yellow_elevator_from_elevator.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_elevator_from_elevator.json rename to src/main/resources/data/kibe/recipe/yellow_elevator_from_elevator.json diff --git a/src/main/resources/data/kibe/recipes/yellow_glider.json b/src/main/resources/data/kibe/recipe/yellow_glider.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_glider.json rename to src/main/resources/data/kibe/recipe/yellow_glider.json diff --git a/src/main/resources/data/kibe/recipes/yellow_rune.json b/src/main/resources/data/kibe/recipe/yellow_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_rune.json rename to src/main/resources/data/kibe/recipe/yellow_rune.json diff --git a/src/main/resources/data/kibe/recipes/yellow_rune_from_rune.json b/src/main/resources/data/kibe/recipe/yellow_rune_from_rune.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_rune_from_rune.json rename to src/main/resources/data/kibe/recipe/yellow_rune_from_rune.json diff --git a/src/main/resources/data/kibe/recipes/yellow_sleeping_bag.json b/src/main/resources/data/kibe/recipe/yellow_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/yellow_sleeping_bag.json diff --git a/src/main/resources/data/kibe/recipes/yellow_sleeping_bag_from_sleeping_bag.json b/src/main/resources/data/kibe/recipe/yellow_sleeping_bag_from_sleeping_bag.json similarity index 100% rename from src/main/resources/data/kibe/recipes/yellow_sleeping_bag_from_sleeping_bag.json rename to src/main/resources/data/kibe/recipe/yellow_sleeping_bag_from_sleeping_bag.json diff --git a/src/main/resources/data/kibe/tags/blocks/elevators.json b/src/main/resources/data/kibe/tags/block/elevators.json similarity index 100% rename from src/main/resources/data/kibe/tags/blocks/elevators.json rename to src/main/resources/data/kibe/tags/block/elevators.json diff --git a/src/main/resources/data/kibe/tags/blocks/magnet_inhibitor.json b/src/main/resources/data/kibe/tags/block/magnet_inhibitor.json similarity index 100% rename from src/main/resources/data/kibe/tags/blocks/magnet_inhibitor.json rename to src/main/resources/data/kibe/tags/block/magnet_inhibitor.json diff --git a/src/main/resources/data/kibe/tags/items/elevators.json b/src/main/resources/data/kibe/tags/item/elevators.json similarity index 100% rename from src/main/resources/data/kibe/tags/items/elevators.json rename to src/main/resources/data/kibe/tags/item/elevators.json diff --git a/src/main/resources/data/kibe/tags/items/runes.json b/src/main/resources/data/kibe/tags/item/runes.json similarity index 100% rename from src/main/resources/data/kibe/tags/items/runes.json rename to src/main/resources/data/kibe/tags/item/runes.json diff --git a/src/main/resources/data/kibe/tags/items/sleeping_bags.json b/src/main/resources/data/kibe/tags/item/sleeping_bags.json similarity index 100% rename from src/main/resources/data/kibe/tags/items/sleeping_bags.json rename to src/main/resources/data/kibe/tags/item/sleeping_bags.json diff --git a/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json b/src/main/resources/data/minecraft/tags/block/dragon_immune.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/dragon_immune.json rename to src/main/resources/data/minecraft/tags/block/dragon_immune.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/main/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/block/mineable/shovel.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/main/resources/data/minecraft/tags/block/mineable/shovel.json diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json rename to src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json rename to src/main/resources/data/minecraft/tags/block/needs_iron_tool.json diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/block/needs_stone_tool.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json rename to src/main/resources/data/minecraft/tags/block/needs_stone_tool.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wither_immune.json b/src/main/resources/data/minecraft/tags/block/wither_immune.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wither_immune.json rename to src/main/resources/data/minecraft/tags/block/wither_immune.json diff --git a/src/main/resources/data/minecraft/tags/items/piglin_loved.json b/src/main/resources/data/minecraft/tags/item/piglin_loved.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/piglin_loved.json rename to src/main/resources/data/minecraft/tags/item/piglin_loved.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5f39a66e..bde72d26 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,6 +38,12 @@ "value": "io.github.lucaargolo.kibe.client.KibeModClient", "adapter": "kotlin" } + ], + "fabric-datagen": [ + { + "value": "io.github.lucaargolo.kibe.datagen.KibeDatagen", + "adapter": "kotlin" + } ] }, "accessWidener": "kibe.accesswidener",