From fa0ec3dba6ff76d45a8a2bb06fd4132df85a75ba Mon Sep 17 00:00:00 2001 From: Choonster TheMage Date: Sat, 16 Nov 2024 17:36:11 +1100 Subject: [PATCH] Run data generation --- .../resources/assets/testmod3/lang/en_us.json | 11 +--- ...d_solaris.json => music_disc_solaris.json} | 0 .../resources/assets/testmod3/sounds.json | 22 ++++++++ .../tags/worldgen/biome/is_dry/overworld.json | 0 .../tags/worldgen/biome/is_hot/overworld.json | 0 .../forge/tags/{fluids => fluid}/gaseous.json | 0 .../forge/tags/{items => item}/rubber.json | 0 .../tags/{blocks => block}/mineable/axe.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../tags/{blocks => block}/saplings.json | 0 .../tags/{items => item}/arrows.json | 0 .../tags/{items => item}/planks.json | 0 .../tags/{items => item}/saplings.json | 0 .../cobblestone_from_static_gas.json | 50 +++++++++++++++++++ .../conditional_ingredient_test.json | 4 +- .../conditional_recipe_test.json | 9 ++-- .../oak_planks_with_mod_axe.json | 8 +-- .../oak_planks_with_vanilla_axe.json | 8 +-- .../golden_helmet_from_iron_helmet.json | 8 +-- .../food/fish_from_guardian_spawner.json | 4 +- .../recipes/misc/dimension_replacement.json | 8 +-- ...dimension_replacement_from_subscripts.json | 4 +- ...guardian_spawner_from_fish_and_sticks.json | 6 +-- .../cobblestone_from_static_gas.json | 34 ------------- .../data/testmod3/jukebox_song/solaris.json | 8 +++ .../loot_modifiers/spawner_drops.json | 16 +++--- .../blocks/acacia_sapling.json | 0 .../blocks/basic_pipe.json | 0 .../blocks/birch_sapling.json | 0 .../blocks/black_multi_rotatable_block.json | 0 .../blocks/black_rotatable_block.json | 0 .../blocks/black_terracotta_slab.json | 0 .../blocks/blue_multi_rotatable_block.json | 0 .../blocks/blue_rotatable_block.json | 0 .../blocks/blue_terracotta_slab.json | 0 .../blocks/brown_multi_rotatable_block.json | 0 .../blocks/brown_rotatable_block.json | 0 .../blocks/brown_terracotta_slab.json | 0 .../blocks/chest.json | 0 .../blocks/client_player_right_click.json | 0 .../blocks/client_player_rotation.json | 0 .../blocks/cyan_multi_rotatable_block.json | 0 .../blocks/cyan_rotatable_block.json | 0 .../blocks/cyan_terracotta_slab.json | 0 .../blocks/dark_oak_sapling.json | 0 .../blocks/end_portal_frame_full.json | 0 .../blocks/fluid_pipe.json | 0 .../blocks/fluid_tank.json | 0 .../blocks/fluid_tank_restricted.json | 0 .../blocks/fullbright.json | 0 .../blocks/gray_multi_rotatable_block.json | 0 .../blocks/gray_rotatable_block.json | 0 .../blocks/gray_terracotta_slab.json | 0 .../blocks/green_multi_rotatable_block.json | 0 .../blocks/green_rotatable_block.json | 0 .../blocks/green_terracotta_slab.json | 0 .../blocks/hidden.json | 0 .../blocks/invisible.json | 0 .../blocks/item_collision_test.json | 0 .../blocks/item_debugger.json | 0 .../blocks/jungle_sapling.json | 0 .../blocks/large_collision_test.json | 0 .../light_blue_multi_rotatable_block.json | 0 .../blocks/light_blue_rotatable_block.json | 0 .../blocks/light_blue_terracotta_slab.json | 0 .../light_gray_multi_rotatable_block.json | 0 .../blocks/light_gray_rotatable_block.json | 0 .../blocks/light_gray_terracotta_slab.json | 0 .../blocks/lime_multi_rotatable_block.json | 0 .../blocks/lime_rotatable_block.json | 0 .../blocks/lime_terracotta_slab.json | 0 .../blocks/magenta_multi_rotatable_block.json | 0 .../blocks/magenta_rotatable_block.json | 0 .../blocks/magenta_terracotta_slab.json | 0 .../blocks/max_health_getter.json | 0 .../blocks/max_health_setter.json | 0 .../blocks/mirror_plane.json | 0 .../blocks/normal_brightness.json | 0 .../blocks/oak_sapling.json | 0 .../blocks/orange_multi_rotatable_block.json | 0 .../blocks/orange_rotatable_block.json | 0 .../blocks/orange_terracotta_slab.json | 0 .../blocks/pig_spawner_refiller.json | 0 .../blocks/pink_multi_rotatable_block.json | 0 .../blocks/pink_rotatable_block.json | 0 .../blocks/pink_terracotta_slab.json | 0 .../blocks/planks.json | 0 .../blocks/potion_effect.json | 0 .../blocks/purple_multi_rotatable_block.json | 0 .../blocks/purple_rotatable_block.json | 0 .../blocks/purple_terracotta_slab.json | 0 .../blocks/red_multi_rotatable_block.json | 0 .../blocks/red_rotatable_block.json | 0 .../blocks/red_terracotta_slab.json | 0 .../blocks/right_click_test.json | 0 .../blocks/rotatable_lamp.json | 0 .../blocks/small_collision_test.json | 0 .../blocks/spruce_sapling.json | 0 .../blocks/vanilla_model_test.json | 0 .../blocks/variants_block_a.json | 0 .../blocks/variants_block_b.json | 0 .../blocks/water_grass.json | 0 .../blocks/white_multi_rotatable_block.json | 0 .../blocks/white_rotatable_block.json | 0 .../blocks/white_terracotta_slab.json | 0 .../blocks/yellow_multi_rotatable_block.json | 0 .../blocks/yellow_rotatable_block.json | 0 .../blocks/yellow_terracotta_slab.json | 0 .../conditional_test.json | 6 +-- .../entities/player_avoiding_creeper.json | 7 +-- .../loot_table_test.json | 3 +- .../recipe/cobblestone_from_static_gas.json | 25 ++++++++++ .../recipe/conditional_ingredient_test.json | 21 ++++++++ .../recipe/conditional_recipe_test.json | 22 ++++++++ .../recipe/dimension_replacement.json | 12 +++++ ...dimension_replacement_from_subscripts.json | 8 +-- .../fish_from_guardian_spawner.json | 8 ++- .../golden_helmet_from_iron_helmet.json | 17 +++++++ ...guardian_spawner_from_fish_and_sticks.json | 28 +++++++++++ .../oak_planks_with_mod_axe.json | 10 ++-- .../oak_planks_with_vanilla_axe.json | 10 ++-- .../recipes/cobblestone_from_static_gas.json | 30 ----------- .../recipes/conditional_ingredient_test.json | 27 ---------- .../recipes/conditional_recipe_test.json | 24 --------- .../recipes/dimension_replacement.json | 15 ------ .../golden_helmet_from_iron_helmet.json | 23 --------- ...guardian_spawner_from_fish_and_sticks.json | 28 ----------- .../tags/{blocks => block}/saplings.json | 0 .../tags/item/repairs_replacement_armor.json | 5 ++ .../tags/{items => item}/vanilla_dyes.json | 0 .../{items => item}/vanilla_terracotta.json | 0 .../testmod3/worldgen/biome/desert_test.json | 12 ++--- src/generated/resources/pack.mcmeta | 2 +- 133 files changed, 264 insertions(+), 279 deletions(-) rename src/generated/resources/assets/testmod3/models/item/{record_solaris.json => music_disc_solaris.json} (100%) create mode 100644 src/generated/resources/assets/testmod3/sounds.json rename src/generated/resources/data/{forge => c}/tags/worldgen/biome/is_dry/overworld.json (100%) rename src/generated/resources/data/{forge => c}/tags/worldgen/biome/is_hot/overworld.json (100%) rename src/generated/resources/data/forge/tags/{fluids => fluid}/gaseous.json (100%) rename src/generated/resources/data/forge/tags/{items => item}/rubber.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/axe.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) rename src/generated/resources/data/minecraft/tags/{blocks => block}/saplings.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/arrows.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/planks.json (100%) rename src/generated/resources/data/minecraft/tags/{items => item}/saplings.json (100%) create mode 100644 src/generated/resources/data/testmod3/advancement/recipes/building_blocks/cobblestone_from_static_gas.json rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/building_blocks/conditional_ingredient_test.json (88%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/building_blocks/conditional_recipe_test.json (81%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/building_blocks/oak_planks_with_mod_axe.json (83%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/building_blocks/oak_planks_with_vanilla_axe.json (83%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/combat/golden_helmet_from_iron_helmet.json (83%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/food/fish_from_guardian_spawner.json (88%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/misc/dimension_replacement.json (83%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/misc/dimension_replacement_from_subscripts.json (88%) rename src/generated/resources/data/testmod3/{advancements => advancement}/recipes/misc/guardian_spawner_from_fish_and_sticks.json (87%) delete mode 100644 src/generated/resources/data/testmod3/advancements/recipes/building_blocks/cobblestone_from_static_gas.json create mode 100644 src/generated/resources/data/testmod3/jukebox_song/solaris.json rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/acacia_sapling.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/basic_pipe.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/birch_sapling.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/black_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/black_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/black_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/blue_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/blue_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/blue_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/brown_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/brown_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/brown_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/chest.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/client_player_right_click.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/client_player_rotation.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/cyan_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/cyan_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/cyan_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/dark_oak_sapling.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/end_portal_frame_full.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/fluid_pipe.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/fluid_tank.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/fluid_tank_restricted.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/fullbright.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/gray_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/gray_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/gray_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/green_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/green_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/green_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/hidden.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/invisible.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/item_collision_test.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/item_debugger.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/jungle_sapling.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/large_collision_test.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/light_blue_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/light_blue_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/light_blue_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/light_gray_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/light_gray_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/light_gray_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/lime_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/lime_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/lime_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/magenta_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/magenta_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/magenta_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/max_health_getter.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/max_health_setter.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/mirror_plane.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/normal_brightness.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/oak_sapling.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/orange_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/orange_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/orange_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/pig_spawner_refiller.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/pink_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/pink_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/pink_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/planks.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/potion_effect.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/purple_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/purple_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/purple_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/red_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/red_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/red_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/right_click_test.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/rotatable_lamp.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/small_collision_test.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/spruce_sapling.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/vanilla_model_test.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/variants_block_a.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/variants_block_b.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/water_grass.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/white_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/white_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/white_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/yellow_multi_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/yellow_rotatable_block.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/blocks/yellow_terracotta_slab.json (100%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/conditional_test.json (85%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/entities/player_avoiding_creeper.json (84%) rename src/generated/resources/data/testmod3/{loot_tables => loot_table}/loot_table_test.json (94%) create mode 100644 src/generated/resources/data/testmod3/recipe/cobblestone_from_static_gas.json create mode 100644 src/generated/resources/data/testmod3/recipe/conditional_ingredient_test.json create mode 100644 src/generated/resources/data/testmod3/recipe/conditional_recipe_test.json create mode 100644 src/generated/resources/data/testmod3/recipe/dimension_replacement.json rename src/generated/resources/data/testmod3/{recipes => recipe}/dimension_replacement_from_subscripts.json (51%) rename src/generated/resources/data/testmod3/{recipes => recipe}/fish_from_guardian_spawner.json (57%) create mode 100644 src/generated/resources/data/testmod3/recipe/golden_helmet_from_iron_helmet.json create mode 100644 src/generated/resources/data/testmod3/recipe/guardian_spawner_from_fish_and_sticks.json rename src/generated/resources/data/testmod3/{recipes => recipe}/oak_planks_with_mod_axe.json (55%) rename src/generated/resources/data/testmod3/{recipes => recipe}/oak_planks_with_vanilla_axe.json (54%) delete mode 100644 src/generated/resources/data/testmod3/recipes/cobblestone_from_static_gas.json delete mode 100644 src/generated/resources/data/testmod3/recipes/conditional_ingredient_test.json delete mode 100644 src/generated/resources/data/testmod3/recipes/conditional_recipe_test.json delete mode 100644 src/generated/resources/data/testmod3/recipes/dimension_replacement.json delete mode 100644 src/generated/resources/data/testmod3/recipes/golden_helmet_from_iron_helmet.json delete mode 100644 src/generated/resources/data/testmod3/recipes/guardian_spawner_from_fish_and_sticks.json rename src/generated/resources/data/testmod3/tags/{blocks => block}/saplings.json (100%) create mode 100644 src/generated/resources/data/testmod3/tags/item/repairs_replacement_armor.json rename src/generated/resources/data/testmod3/tags/{items => item}/vanilla_dyes.json (100%) rename src/generated/resources/data/testmod3/tags/{items => item}/vanilla_terracotta.json (100%) diff --git a/src/generated/resources/assets/testmod3/lang/en_us.json b/src/generated/resources/assets/testmod3/lang/en_us.json index dcde48e9..7fa51ef0 100644 --- a/src/generated/resources/assets/testmod3/lang/en_us.json +++ b/src/generated/resources/assets/testmod3/lang/en_us.json @@ -99,13 +99,6 @@ "commands.testmod3.rotatevector.result": "Rotated vector: [%s, %s, %s]", "commands.testmod3.runtests.tests_failed": "Tests failed. See log for more details.", "commands.testmod3.runtests.tests_passed": "All tests passed.", - "config.jade.plugin_testmod3.chest_facing": "Mod Chest Facing", - "config.jade.plugin_testmod3.colored_multi_rotatable_block_face_rotation": "Colored Multi-Rotatable", - "config.jade.plugin_testmod3.colored_rotatable_block_facing": "Colored Rotatable Block Facing", - "config.jade.plugin_testmod3.plane_horizontal_rotation": "Plane Horizontal Rotation", - "config.jade.plugin_testmod3.plane_vertical_rotation": "Plane Vertical Rotation", - "config.jade.plugin_testmod3.restricted_fluid_tank_enabled_facings": "Restricted Fluid Tank Enabled Facings", - "config.jade.plugin_testmod3.rotatable_lamp_facing": "Rotatable Lamp Facing", "container.testmod3.chest": "Mod Chest", "effect.testmod3.test": "Test", "entity.testmod3.block_detection_arrow": "Block Detection Arrow", @@ -157,6 +150,8 @@ "item.testmod3.max_health_getter_item": "Max Health Getter", "item.testmod3.max_health_setter_item": "Max Health Setter", "item.testmod3.model_test": "Model Test", + "item.testmod3.music_disc_solaris": "Music Disc", + "item.testmod3.music_disc_solaris.desc": "Solaris (Path of Exile)", "item.testmod3.no_mod_name": "No Mod Name", "item.testmod3.normal_bucket": "Normal Bucket", "item.testmod3.normal_gas_bucket": "Normal Gas Bucket", @@ -164,8 +159,6 @@ "item.testmod3.pig_spawner_infinite": "Infinite Pig Spawner", "item.testmod3.player_avoiding_creeper_spawn_egg": "Player-Avoiding Creeper Spawn Egg", "item.testmod3.portal_displacement_bucket": "Portal Displacement Fluid Bucket", - "item.testmod3.record_solaris": "Music Disc", - "item.testmod3.record_solaris.desc": "Solaris (Path of Exile)", "item.testmod3.replacement_boots": "Armour Replacement Boots", "item.testmod3.replacement_chestplate": "Armour Replacement Chestplate", "item.testmod3.replacement_helmet": "Armour Replacement Helmet", diff --git a/src/generated/resources/assets/testmod3/models/item/record_solaris.json b/src/generated/resources/assets/testmod3/models/item/music_disc_solaris.json similarity index 100% rename from src/generated/resources/assets/testmod3/models/item/record_solaris.json rename to src/generated/resources/assets/testmod3/models/item/music_disc_solaris.json diff --git a/src/generated/resources/assets/testmod3/sounds.json b/src/generated/resources/assets/testmod3/sounds.json new file mode 100644 index 00000000..ef9315fa --- /dev/null +++ b/src/generated/resources/assets/testmod3/sounds.json @@ -0,0 +1,22 @@ +{ + "9mm.fire": { + "sounds": [ + "testmod3:item/gun/9mm_fire" + ], + "subtitle": "subtitles.item.testmod3.gun.fire" + }, + "action.saddle": { + "sounds": [ + "mob/horse/leather" + ], + "subtitle": "subtitles.action.testmod3.saddle" + }, + "music_disc.solaris": { + "sounds": [ + { + "name": "testmod3:music_disc/solaris", + "stream": true + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dry/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dry/overworld.json rename to src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json b/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json rename to src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json diff --git a/src/generated/resources/data/forge/tags/fluids/gaseous.json b/src/generated/resources/data/forge/tags/fluid/gaseous.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/gaseous.json rename to src/generated/resources/data/forge/tags/fluid/gaseous.json diff --git a/src/generated/resources/data/forge/tags/items/rubber.json b/src/generated/resources/data/forge/tags/item/rubber.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rubber.json rename to src/generated/resources/data/forge/tags/item/rubber.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/saplings.json b/src/generated/resources/data/minecraft/tags/block/saplings.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/saplings.json rename to src/generated/resources/data/minecraft/tags/block/saplings.json diff --git a/src/generated/resources/data/minecraft/tags/items/arrows.json b/src/generated/resources/data/minecraft/tags/item/arrows.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/arrows.json rename to src/generated/resources/data/minecraft/tags/item/arrows.json diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/item/planks.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/planks.json rename to src/generated/resources/data/minecraft/tags/item/planks.json diff --git a/src/generated/resources/data/minecraft/tags/items/saplings.json b/src/generated/resources/data/minecraft/tags/item/saplings.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/saplings.json rename to src/generated/resources/data/minecraft/tags/item/saplings.json diff --git a/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/cobblestone_from_static_gas.json b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/cobblestone_from_static_gas.json new file mode 100644 index 00000000..7acf75e9 --- /dev/null +++ b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/cobblestone_from_static_gas.json @@ -0,0 +1,50 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_static_gas_bucket": { + "conditions": { + "items": [ + { + "items": "testmod3:static_gas_bucket" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_static_gas_container": { + "conditions": { + "items": [ + { + "predicates": { + "testmod3:fluid_container": { + "amount": { + "min": 1000 + }, + "fluid": "testmod3:static_gas" + } + } + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "testmod3:cobblestone_from_static_gas" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_static_gas_bucket", + "has_static_gas_container" + ] + ], + "rewards": { + "recipes": [ + "testmod3:cobblestone_from_static_gas" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/conditional_ingredient_test.json b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/conditional_ingredient_test.json similarity index 88% rename from src/generated/resources/data/testmod3/advancements/recipes/building_blocks/conditional_ingredient_test.json rename to src/generated/resources/data/testmod3/advancement/recipes/building_blocks/conditional_ingredient_test.json index 8244984b..23dcb0ef 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/conditional_ingredient_test.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/conditional_ingredient_test.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:cobblestone" - ] + "items": "minecraft:cobblestone" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/conditional_recipe_test.json b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/conditional_recipe_test.json similarity index 81% rename from src/generated/resources/data/testmod3/advancements/recipes/building_blocks/conditional_recipe_test.json rename to src/generated/resources/data/testmod3/advancement/recipes/building_blocks/conditional_recipe_test.json index 840ee213..ee3cfa52 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/conditional_recipe_test.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/conditional_recipe_test.json @@ -1,5 +1,5 @@ { - "advancements": [ + "forge:conditional": [ { "parent": "minecraft:recipes/root", "criteria": { @@ -7,9 +7,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:wooden_axe" - ] + "items": "minecraft:wooden_axe" } ] }, @@ -23,8 +21,7 @@ } }, "forge:condition": { - "type": "forge:false", - "value": {} + "type": "forge:false" }, "requirements": [ [ diff --git a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/oak_planks_with_mod_axe.json b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/oak_planks_with_mod_axe.json similarity index 83% rename from src/generated/resources/data/testmod3/advancements/recipes/building_blocks/oak_planks_with_mod_axe.json rename to src/generated/resources/data/testmod3/advancement/recipes/building_blocks/oak_planks_with_mod_axe.json index 2d7951e8..1c197dee 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/oak_planks_with_mod_axe.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/oak_planks_with_mod_axe.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "testmod3:wooden_axe" - ] + "items": "testmod3:wooden_axe" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:oak_log" - ] + "items": "minecraft:oak_log" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/oak_planks_with_vanilla_axe.json b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/oak_planks_with_vanilla_axe.json similarity index 83% rename from src/generated/resources/data/testmod3/advancements/recipes/building_blocks/oak_planks_with_vanilla_axe.json rename to src/generated/resources/data/testmod3/advancement/recipes/building_blocks/oak_planks_with_vanilla_axe.json index f063043a..dca863bc 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/oak_planks_with_vanilla_axe.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/building_blocks/oak_planks_with_vanilla_axe.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:wooden_axe" - ] + "items": "minecraft:wooden_axe" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:oak_log" - ] + "items": "minecraft:oak_log" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/combat/golden_helmet_from_iron_helmet.json b/src/generated/resources/data/testmod3/advancement/recipes/combat/golden_helmet_from_iron_helmet.json similarity index 83% rename from src/generated/resources/data/testmod3/advancements/recipes/combat/golden_helmet_from_iron_helmet.json rename to src/generated/resources/data/testmod3/advancement/recipes/combat/golden_helmet_from_iron_helmet.json index 88d7b9c7..3291ab73 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/combat/golden_helmet_from_iron_helmet.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/combat/golden_helmet_from_iron_helmet.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gold_block" - ] + "items": "minecraft:gold_block" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_helmet" - ] + "items": "minecraft:iron_helmet" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/food/fish_from_guardian_spawner.json b/src/generated/resources/data/testmod3/advancement/recipes/food/fish_from_guardian_spawner.json similarity index 88% rename from src/generated/resources/data/testmod3/advancements/recipes/food/fish_from_guardian_spawner.json rename to src/generated/resources/data/testmod3/advancement/recipes/food/fish_from_guardian_spawner.json index b888c2d5..b6760c00 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/food/fish_from_guardian_spawner.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/food/fish_from_guardian_spawner.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:spawner" - ] + "items": "minecraft:spawner" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/misc/dimension_replacement.json b/src/generated/resources/data/testmod3/advancement/recipes/misc/dimension_replacement.json similarity index 83% rename from src/generated/resources/data/testmod3/advancements/recipes/misc/dimension_replacement.json rename to src/generated/resources/data/testmod3/advancement/recipes/misc/dimension_replacement.json index fb6843fb..75476b09 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/misc/dimension_replacement.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/misc/dimension_replacement.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "testmod3:subscripts" - ] + "items": "testmod3:subscripts" } ] }, @@ -17,9 +15,7 @@ "conditions": { "items": [ { - "items": [ - "testmod3:superscripts" - ] + "items": "testmod3:superscripts" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/misc/dimension_replacement_from_subscripts.json b/src/generated/resources/data/testmod3/advancement/recipes/misc/dimension_replacement_from_subscripts.json similarity index 88% rename from src/generated/resources/data/testmod3/advancements/recipes/misc/dimension_replacement_from_subscripts.json rename to src/generated/resources/data/testmod3/advancement/recipes/misc/dimension_replacement_from_subscripts.json index 42301b30..a0298e4f 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/misc/dimension_replacement_from_subscripts.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/misc/dimension_replacement_from_subscripts.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "testmod3:subscripts" - ] + "items": "testmod3:subscripts" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/misc/guardian_spawner_from_fish_and_sticks.json b/src/generated/resources/data/testmod3/advancement/recipes/misc/guardian_spawner_from_fish_and_sticks.json similarity index 87% rename from src/generated/resources/data/testmod3/advancements/recipes/misc/guardian_spawner_from_fish_and_sticks.json rename to src/generated/resources/data/testmod3/advancement/recipes/misc/guardian_spawner_from_fish_and_sticks.json index 7548e9e6..f305c40b 100644 --- a/src/generated/resources/data/testmod3/advancements/recipes/misc/guardian_spawner_from_fish_and_sticks.json +++ b/src/generated/resources/data/testmod3/advancement/recipes/misc/guardian_spawner_from_fish_and_sticks.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:cod" - ] + "items": "minecraft:cod" } ] }, @@ -17,7 +15,7 @@ "conditions": { "items": [ { - "tag": "forge:rods/wooden" + "items": "#c:rods/wooden" } ] }, diff --git a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/cobblestone_from_static_gas.json b/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/cobblestone_from_static_gas.json deleted file mode 100644 index bfcdd52b..00000000 --- a/src/generated/resources/data/testmod3/advancements/recipes/building_blocks/cobblestone_from_static_gas.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_static_gas_bucket": { - "conditions": { - "items": [ - { - "items": [ - "testmod3:static_gas_bucket" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "testmod3:cobblestone_from_static_gas" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_static_gas_bucket" - ] - ], - "rewards": { - "recipes": [ - "testmod3:cobblestone_from_static_gas" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/jukebox_song/solaris.json b/src/generated/resources/data/testmod3/jukebox_song/solaris.json new file mode 100644 index 00000000..2a81ae8b --- /dev/null +++ b/src/generated/resources/data/testmod3/jukebox_song/solaris.json @@ -0,0 +1,8 @@ +{ + "comparator_output": 13, + "description": { + "translate": "jukebox_song.testmod3.solaris" + }, + "length_in_seconds": 454.25, + "sound_event": "testmod3:music_disc.solaris" +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/loot_modifiers/spawner_drops.json b/src/generated/resources/data/testmod3/loot_modifiers/spawner_drops.json index 63d0cf1b..384c68cf 100644 --- a/src/generated/resources/data/testmod3/loot_modifiers/spawner_drops.json +++ b/src/generated/resources/data/testmod3/loot_modifiers/spawner_drops.json @@ -8,14 +8,16 @@ { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/acacia_sapling.json b/src/generated/resources/data/testmod3/loot_table/blocks/acacia_sapling.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/acacia_sapling.json rename to src/generated/resources/data/testmod3/loot_table/blocks/acacia_sapling.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/basic_pipe.json b/src/generated/resources/data/testmod3/loot_table/blocks/basic_pipe.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/basic_pipe.json rename to src/generated/resources/data/testmod3/loot_table/blocks/basic_pipe.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/birch_sapling.json b/src/generated/resources/data/testmod3/loot_table/blocks/birch_sapling.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/birch_sapling.json rename to src/generated/resources/data/testmod3/loot_table/blocks/birch_sapling.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/black_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/black_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/black_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/black_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/black_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/black_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/black_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/black_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/black_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/black_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/black_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/black_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/blue_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/blue_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/blue_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/blue_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/blue_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/blue_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/blue_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/blue_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/blue_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/blue_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/blue_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/blue_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/brown_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/brown_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/brown_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/brown_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/brown_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/brown_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/brown_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/brown_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/brown_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/brown_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/brown_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/brown_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/chest.json b/src/generated/resources/data/testmod3/loot_table/blocks/chest.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/chest.json rename to src/generated/resources/data/testmod3/loot_table/blocks/chest.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/client_player_right_click.json b/src/generated/resources/data/testmod3/loot_table/blocks/client_player_right_click.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/client_player_right_click.json rename to src/generated/resources/data/testmod3/loot_table/blocks/client_player_right_click.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/client_player_rotation.json b/src/generated/resources/data/testmod3/loot_table/blocks/client_player_rotation.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/client_player_rotation.json rename to src/generated/resources/data/testmod3/loot_table/blocks/client_player_rotation.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/cyan_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/cyan_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/cyan_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/cyan_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/cyan_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/cyan_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/cyan_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/cyan_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/cyan_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/cyan_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/cyan_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/cyan_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/dark_oak_sapling.json b/src/generated/resources/data/testmod3/loot_table/blocks/dark_oak_sapling.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/dark_oak_sapling.json rename to src/generated/resources/data/testmod3/loot_table/blocks/dark_oak_sapling.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/end_portal_frame_full.json b/src/generated/resources/data/testmod3/loot_table/blocks/end_portal_frame_full.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/end_portal_frame_full.json rename to src/generated/resources/data/testmod3/loot_table/blocks/end_portal_frame_full.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/fluid_pipe.json b/src/generated/resources/data/testmod3/loot_table/blocks/fluid_pipe.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/fluid_pipe.json rename to src/generated/resources/data/testmod3/loot_table/blocks/fluid_pipe.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/fluid_tank.json b/src/generated/resources/data/testmod3/loot_table/blocks/fluid_tank.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/fluid_tank.json rename to src/generated/resources/data/testmod3/loot_table/blocks/fluid_tank.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/fluid_tank_restricted.json b/src/generated/resources/data/testmod3/loot_table/blocks/fluid_tank_restricted.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/fluid_tank_restricted.json rename to src/generated/resources/data/testmod3/loot_table/blocks/fluid_tank_restricted.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/fullbright.json b/src/generated/resources/data/testmod3/loot_table/blocks/fullbright.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/fullbright.json rename to src/generated/resources/data/testmod3/loot_table/blocks/fullbright.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/gray_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/gray_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/gray_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/gray_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/gray_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/gray_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/gray_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/gray_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/gray_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/gray_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/gray_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/gray_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/green_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/green_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/green_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/green_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/green_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/green_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/green_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/green_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/green_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/green_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/green_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/green_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/hidden.json b/src/generated/resources/data/testmod3/loot_table/blocks/hidden.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/hidden.json rename to src/generated/resources/data/testmod3/loot_table/blocks/hidden.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/invisible.json b/src/generated/resources/data/testmod3/loot_table/blocks/invisible.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/invisible.json rename to src/generated/resources/data/testmod3/loot_table/blocks/invisible.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/item_collision_test.json b/src/generated/resources/data/testmod3/loot_table/blocks/item_collision_test.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/item_collision_test.json rename to src/generated/resources/data/testmod3/loot_table/blocks/item_collision_test.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/item_debugger.json b/src/generated/resources/data/testmod3/loot_table/blocks/item_debugger.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/item_debugger.json rename to src/generated/resources/data/testmod3/loot_table/blocks/item_debugger.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/jungle_sapling.json b/src/generated/resources/data/testmod3/loot_table/blocks/jungle_sapling.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/jungle_sapling.json rename to src/generated/resources/data/testmod3/loot_table/blocks/jungle_sapling.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/large_collision_test.json b/src/generated/resources/data/testmod3/loot_table/blocks/large_collision_test.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/large_collision_test.json rename to src/generated/resources/data/testmod3/loot_table/blocks/large_collision_test.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/light_blue_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/light_blue_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/light_blue_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/light_blue_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/light_blue_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/light_blue_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/light_blue_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/light_blue_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/light_blue_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/light_blue_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/light_blue_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/light_blue_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/light_gray_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/light_gray_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/light_gray_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/light_gray_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/light_gray_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/light_gray_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/light_gray_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/light_gray_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/light_gray_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/light_gray_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/light_gray_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/light_gray_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/lime_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/lime_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/lime_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/lime_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/lime_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/lime_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/lime_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/lime_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/lime_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/lime_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/lime_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/lime_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/magenta_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/magenta_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/magenta_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/magenta_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/magenta_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/magenta_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/magenta_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/magenta_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/magenta_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/magenta_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/magenta_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/magenta_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/max_health_getter.json b/src/generated/resources/data/testmod3/loot_table/blocks/max_health_getter.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/max_health_getter.json rename to src/generated/resources/data/testmod3/loot_table/blocks/max_health_getter.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/max_health_setter.json b/src/generated/resources/data/testmod3/loot_table/blocks/max_health_setter.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/max_health_setter.json rename to src/generated/resources/data/testmod3/loot_table/blocks/max_health_setter.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/mirror_plane.json b/src/generated/resources/data/testmod3/loot_table/blocks/mirror_plane.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/mirror_plane.json rename to src/generated/resources/data/testmod3/loot_table/blocks/mirror_plane.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/normal_brightness.json b/src/generated/resources/data/testmod3/loot_table/blocks/normal_brightness.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/normal_brightness.json rename to src/generated/resources/data/testmod3/loot_table/blocks/normal_brightness.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/oak_sapling.json b/src/generated/resources/data/testmod3/loot_table/blocks/oak_sapling.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/oak_sapling.json rename to src/generated/resources/data/testmod3/loot_table/blocks/oak_sapling.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/orange_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/orange_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/orange_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/orange_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/orange_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/orange_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/orange_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/orange_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/orange_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/orange_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/orange_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/orange_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/pig_spawner_refiller.json b/src/generated/resources/data/testmod3/loot_table/blocks/pig_spawner_refiller.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/pig_spawner_refiller.json rename to src/generated/resources/data/testmod3/loot_table/blocks/pig_spawner_refiller.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/pink_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/pink_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/pink_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/pink_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/pink_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/pink_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/pink_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/pink_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/pink_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/pink_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/pink_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/pink_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/planks.json b/src/generated/resources/data/testmod3/loot_table/blocks/planks.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/planks.json rename to src/generated/resources/data/testmod3/loot_table/blocks/planks.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/potion_effect.json b/src/generated/resources/data/testmod3/loot_table/blocks/potion_effect.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/potion_effect.json rename to src/generated/resources/data/testmod3/loot_table/blocks/potion_effect.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/purple_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/purple_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/purple_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/purple_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/purple_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/purple_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/purple_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/purple_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/purple_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/purple_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/purple_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/purple_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/red_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/red_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/red_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/red_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/red_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/red_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/red_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/red_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/red_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/red_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/red_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/red_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/right_click_test.json b/src/generated/resources/data/testmod3/loot_table/blocks/right_click_test.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/right_click_test.json rename to src/generated/resources/data/testmod3/loot_table/blocks/right_click_test.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/rotatable_lamp.json b/src/generated/resources/data/testmod3/loot_table/blocks/rotatable_lamp.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/rotatable_lamp.json rename to src/generated/resources/data/testmod3/loot_table/blocks/rotatable_lamp.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/small_collision_test.json b/src/generated/resources/data/testmod3/loot_table/blocks/small_collision_test.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/small_collision_test.json rename to src/generated/resources/data/testmod3/loot_table/blocks/small_collision_test.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/spruce_sapling.json b/src/generated/resources/data/testmod3/loot_table/blocks/spruce_sapling.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/spruce_sapling.json rename to src/generated/resources/data/testmod3/loot_table/blocks/spruce_sapling.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/vanilla_model_test.json b/src/generated/resources/data/testmod3/loot_table/blocks/vanilla_model_test.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/vanilla_model_test.json rename to src/generated/resources/data/testmod3/loot_table/blocks/vanilla_model_test.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/variants_block_a.json b/src/generated/resources/data/testmod3/loot_table/blocks/variants_block_a.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/variants_block_a.json rename to src/generated/resources/data/testmod3/loot_table/blocks/variants_block_a.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/variants_block_b.json b/src/generated/resources/data/testmod3/loot_table/blocks/variants_block_b.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/variants_block_b.json rename to src/generated/resources/data/testmod3/loot_table/blocks/variants_block_b.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/water_grass.json b/src/generated/resources/data/testmod3/loot_table/blocks/water_grass.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/water_grass.json rename to src/generated/resources/data/testmod3/loot_table/blocks/water_grass.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/white_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/white_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/white_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/white_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/white_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/white_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/white_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/white_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/white_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/white_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/white_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/white_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/yellow_multi_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/yellow_multi_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/yellow_multi_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/yellow_multi_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/yellow_rotatable_block.json b/src/generated/resources/data/testmod3/loot_table/blocks/yellow_rotatable_block.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/yellow_rotatable_block.json rename to src/generated/resources/data/testmod3/loot_table/blocks/yellow_rotatable_block.json diff --git a/src/generated/resources/data/testmod3/loot_tables/blocks/yellow_terracotta_slab.json b/src/generated/resources/data/testmod3/loot_table/blocks/yellow_terracotta_slab.json similarity index 100% rename from src/generated/resources/data/testmod3/loot_tables/blocks/yellow_terracotta_slab.json rename to src/generated/resources/data/testmod3/loot_table/blocks/yellow_terracotta_slab.json diff --git a/src/generated/resources/data/testmod3/loot_tables/conditional_test.json b/src/generated/resources/data/testmod3/loot_table/conditional_test.json similarity index 85% rename from src/generated/resources/data/testmod3/loot_tables/conditional_test.json rename to src/generated/resources/data/testmod3/loot_table/conditional_test.json index a777b936..ae6ef6d2 100644 --- a/src/generated/resources/data/testmod3/loot_tables/conditional_test.json +++ b/src/generated/resources/data/testmod3/loot_table/conditional_test.json @@ -9,8 +9,7 @@ } ], "forge:condition": { - "type": "forge:false", - "value": {} + "type": "forge:false" }, "name": "conditional_false", "rolls": 1.0 @@ -24,8 +23,7 @@ } ], "forge:condition": { - "type": "forge:true", - "value": {} + "type": "forge:true" }, "name": "conditional_true", "rolls": 1.0 diff --git a/src/generated/resources/data/testmod3/loot_tables/entities/player_avoiding_creeper.json b/src/generated/resources/data/testmod3/loot_table/entities/player_avoiding_creeper.json similarity index 84% rename from src/generated/resources/data/testmod3/loot_tables/entities/player_avoiding_creeper.json rename to src/generated/resources/data/testmod3/loot_table/entities/player_avoiding_creeper.json index ca5773c5..0601dd18 100644 --- a/src/generated/resources/data/testmod3/loot_tables/entities/player_avoiding_creeper.json +++ b/src/generated/resources/data/testmod3/loot_table/entities/player_avoiding_creeper.json @@ -22,7 +22,8 @@ "max": 1.0, "min": 0.0 }, - "function": "minecraft:looting_enchant" + "enchantment": "minecraft:looting", + "function": "minecraft:enchanted_count_increase" } ], "name": "minecraft:gunpowder" @@ -35,7 +36,7 @@ "conditions": [ { "condition": "minecraft:entity_properties", - "entity": "killer", + "entity": "attacker", "predicate": { "type": "#minecraft:skeletons" } @@ -45,7 +46,7 @@ { "type": "minecraft:tag", "expand": true, - "name": "minecraft:music_discs" + "name": "minecraft:creeper_drop_music_discs" } ], "rolls": 1.0 diff --git a/src/generated/resources/data/testmod3/loot_tables/loot_table_test.json b/src/generated/resources/data/testmod3/loot_table/loot_table_test.json similarity index 94% rename from src/generated/resources/data/testmod3/loot_tables/loot_table_test.json rename to src/generated/resources/data/testmod3/loot_table/loot_table_test.json index 5d15bded..13756157 100644 --- a/src/generated/resources/data/testmod3/loot_tables/loot_table_test.json +++ b/src/generated/resources/data/testmod3/loot_table/loot_table_test.json @@ -35,7 +35,8 @@ "max": 1.0, "min": 0.0 }, - "function": "minecraft:looting_enchant" + "enchantment": "minecraft:looting", + "function": "minecraft:enchanted_count_increase" } ], "name": "minecraft:porkchop" diff --git a/src/generated/resources/data/testmod3/recipe/cobblestone_from_static_gas.json b/src/generated/resources/data/testmod3/recipe/cobblestone_from_static_gas.json new file mode 100644 index 00000000..61f91858 --- /dev/null +++ b/src/generated/resources/data/testmod3/recipe/cobblestone_from_static_gas.json @@ -0,0 +1,25 @@ +{ + "type": "testmod3:fluid_container_shapeless", + "category": "building", + "ingredients": [ + { + "type": "testmod3:fluid_container", + "amount": 1000, + "fluid": "testmod3:static_gas" + }, + { + "type": "testmod3:fluid_container", + "amount": 1000, + "fluid": "testmod3:static_gas" + }, + { + "type": "testmod3:fluid_container", + "amount": 1000, + "fluid": "testmod3:static_gas" + } + ], + "result": { + "count": 1, + "id": "minecraft:cobblestone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipe/conditional_ingredient_test.json b/src/generated/resources/data/testmod3/recipe/conditional_ingredient_test.json new file mode 100644 index 00000000..0206514a --- /dev/null +++ b/src/generated/resources/data/testmod3/recipe/conditional_ingredient_test.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "C": { + "type": "testmod3:conditional", + "forge:condition": { + "type": "forge:false" + }, + "ingredient": "minecraft:cobblestone" + }, + "c": "minecraft:cobblestone" + }, + "pattern": [ + "Cc" + ], + "result": { + "count": 1, + "id": "minecraft:cobblestone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipe/conditional_recipe_test.json b/src/generated/resources/data/testmod3/recipe/conditional_recipe_test.json new file mode 100644 index 00000000..9f0e70f8 --- /dev/null +++ b/src/generated/resources/data/testmod3/recipe/conditional_recipe_test.json @@ -0,0 +1,22 @@ +{ + "type": "forge:conditional", + "forge:condition": { + "type": "forge:false" + }, + "recipes": [ + { + "recipe": { + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "minecraft:wooden_axe", + "minecraft:wooden_axe" + ], + "result": { + "count": 1, + "id": "minecraft:oak_log" + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipe/dimension_replacement.json b/src/generated/resources/data/testmod3/recipe/dimension_replacement.json new file mode 100644 index 00000000..b7333612 --- /dev/null +++ b/src/generated/resources/data/testmod3/recipe/dimension_replacement.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "testmod3:subscripts", + "testmod3:superscripts" + ], + "result": { + "count": 1, + "id": "testmod3:dimension_replacement" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/dimension_replacement_from_subscripts.json b/src/generated/resources/data/testmod3/recipe/dimension_replacement_from_subscripts.json similarity index 51% rename from src/generated/resources/data/testmod3/recipes/dimension_replacement_from_subscripts.json rename to src/generated/resources/data/testmod3/recipe/dimension_replacement_from_subscripts.json index 906a8e1f..bfafe2ba 100644 --- a/src/generated/resources/data/testmod3/recipes/dimension_replacement_from_subscripts.json +++ b/src/generated/resources/data/testmod3/recipe/dimension_replacement_from_subscripts.json @@ -3,8 +3,8 @@ "category": "misc", "cookingtime": 200, "experience": 0.35, - "ingredient": { - "item": "testmod3:subscripts" - }, - "result": "testmod3:dimension_replacement" + "ingredient": "testmod3:subscripts", + "result": { + "id": "testmod3:dimension_replacement" + } } \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/fish_from_guardian_spawner.json b/src/generated/resources/data/testmod3/recipe/fish_from_guardian_spawner.json similarity index 57% rename from src/generated/resources/data/testmod3/recipes/fish_from_guardian_spawner.json rename to src/generated/resources/data/testmod3/recipe/fish_from_guardian_spawner.json index 9e3e7f42..c1dbd36c 100644 --- a/src/generated/resources/data/testmod3/recipes/fish_from_guardian_spawner.json +++ b/src/generated/resources/data/testmod3/recipe/fish_from_guardian_spawner.json @@ -4,14 +4,12 @@ "ingredients": [ { "type": "testmod3:mob_spawner", - "value": { - "entity": "minecraft:guardian", - "item": "minecraft:spawner" - } + "entity": "minecraft:guardian", + "item": "minecraft:spawner" } ], "result": { "count": 8, - "item": "minecraft:cod" + "id": "minecraft:cod" } } \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipe/golden_helmet_from_iron_helmet.json b/src/generated/resources/data/testmod3/recipe/golden_helmet_from_iron_helmet.json new file mode 100644 index 00000000..14ef3fe0 --- /dev/null +++ b/src/generated/resources/data/testmod3/recipe/golden_helmet_from_iron_helmet.json @@ -0,0 +1,17 @@ +{ + "type": "testmod3:armour_upgrade_shaped", + "category": "equipment", + "key": { + "G": "minecraft:gold_block", + "H": "minecraft:iron_helmet" + }, + "pattern": [ + "GGG", + "GHG", + "GGG" + ], + "result": { + "count": 1, + "id": "minecraft:golden_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipe/guardian_spawner_from_fish_and_sticks.json b/src/generated/resources/data/testmod3/recipe/guardian_spawner_from_fish_and_sticks.json new file mode 100644 index 00000000..f75f59f5 --- /dev/null +++ b/src/generated/resources/data/testmod3/recipe/guardian_spawner_from_fish_and_sticks.json @@ -0,0 +1,28 @@ +{ + "type": "testmod3:enhanced_shaped", + "category": "misc", + "key": { + "C": "minecraft:cod", + "S": "#c:rods/wooden" + }, + "pattern": [ + "SSS", + "SCS", + "SSS" + ], + "result": { + "components": { + "minecraft:block_entity_data": { + "SpawnData": { + "entity": { + "id": "minecraft:guardian" + } + }, + "SpawnPotentials": [], + "id": "minecraft:mob_spawner" + } + }, + "count": 1, + "id": "minecraft:spawner" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/oak_planks_with_mod_axe.json b/src/generated/resources/data/testmod3/recipe/oak_planks_with_mod_axe.json similarity index 55% rename from src/generated/resources/data/testmod3/recipes/oak_planks_with_mod_axe.json rename to src/generated/resources/data/testmod3/recipe/oak_planks_with_mod_axe.json index 52e78690..cb319343 100644 --- a/src/generated/resources/data/testmod3/recipes/oak_planks_with_mod_axe.json +++ b/src/generated/resources/data/testmod3/recipe/oak_planks_with_mod_axe.json @@ -3,15 +3,11 @@ "category": "building", "group": "minecraft:planks", "ingredients": [ - { - "item": "testmod3:wooden_axe" - }, - { - "item": "minecraft:oak_log" - } + "testmod3:wooden_axe", + "minecraft:oak_log" ], "result": { "count": 2, - "item": "minecraft:oak_planks" + "id": "minecraft:oak_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/oak_planks_with_vanilla_axe.json b/src/generated/resources/data/testmod3/recipe/oak_planks_with_vanilla_axe.json similarity index 54% rename from src/generated/resources/data/testmod3/recipes/oak_planks_with_vanilla_axe.json rename to src/generated/resources/data/testmod3/recipe/oak_planks_with_vanilla_axe.json index 3337b67a..3b86cacf 100644 --- a/src/generated/resources/data/testmod3/recipes/oak_planks_with_vanilla_axe.json +++ b/src/generated/resources/data/testmod3/recipe/oak_planks_with_vanilla_axe.json @@ -3,15 +3,11 @@ "category": "building", "group": "minecraft:planks", "ingredients": [ - { - "item": "minecraft:wooden_axe" - }, - { - "item": "minecraft:oak_log" - } + "minecraft:wooden_axe", + "minecraft:oak_log" ], "result": { "count": 2, - "item": "minecraft:oak_planks" + "id": "minecraft:oak_planks" } } \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/cobblestone_from_static_gas.json b/src/generated/resources/data/testmod3/recipes/cobblestone_from_static_gas.json deleted file mode 100644 index f940d186..00000000 --- a/src/generated/resources/data/testmod3/recipes/cobblestone_from_static_gas.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "testmod3:fluid_container_shapeless", - "category": "building", - "ingredients": [ - { - "type": "testmod3:fluid_container", - "value": { - "amount": 1000, - "fluid": "testmod3:static_gas" - } - }, - { - "type": "testmod3:fluid_container", - "value": { - "amount": 1000, - "fluid": "testmod3:static_gas" - } - }, - { - "type": "testmod3:fluid_container", - "value": { - "amount": 1000, - "fluid": "testmod3:static_gas" - } - } - ], - "result": { - "item": "minecraft:cobblestone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/conditional_ingredient_test.json b/src/generated/resources/data/testmod3/recipes/conditional_ingredient_test.json deleted file mode 100644 index 2ce0e1c7..00000000 --- a/src/generated/resources/data/testmod3/recipes/conditional_ingredient_test.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "C": { - "type": "testmod3:conditional", - "value": { - "forge:condition": { - "type": "forge:false", - "value": {} - }, - "ingredient": { - "item": "minecraft:cobblestone" - } - } - }, - "c": { - "item": "minecraft:cobblestone" - } - }, - "pattern": [ - "Cc" - ], - "result": { - "item": "minecraft:cobblestone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/conditional_recipe_test.json b/src/generated/resources/data/testmod3/recipes/conditional_recipe_test.json deleted file mode 100644 index e871a43f..00000000 --- a/src/generated/resources/data/testmod3/recipes/conditional_recipe_test.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "type": "forge:conditional", - "forge:condition": { - "type": "forge:false", - "value": {} - }, - "recipes": [ - { - "type": "minecraft:crafting_shapeless", - "category": "building", - "ingredients": [ - { - "item": "minecraft:wooden_axe" - }, - { - "item": "minecraft:wooden_axe" - } - ], - "result": { - "item": "minecraft:oak_log" - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/dimension_replacement.json b/src/generated/resources/data/testmod3/recipes/dimension_replacement.json deleted file mode 100644 index 3e6e0c26..00000000 --- a/src/generated/resources/data/testmod3/recipes/dimension_replacement.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "testmod3:subscripts" - }, - { - "item": "testmod3:superscripts" - } - ], - "result": { - "item": "testmod3:dimension_replacement" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/golden_helmet_from_iron_helmet.json b/src/generated/resources/data/testmod3/recipes/golden_helmet_from_iron_helmet.json deleted file mode 100644 index 814b0c20..00000000 --- a/src/generated/resources/data/testmod3/recipes/golden_helmet_from_iron_helmet.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "type": "testmod3:armour_upgrade_shaped", - "category": "equipment", - "key": { - "G": { - "item": "minecraft:gold_block" - }, - "H": { - "item": "minecraft:iron_helmet" - } - }, - "pattern": [ - "GGG", - "GHG", - "GGG" - ], - "result": { - "item": "minecraft:golden_helmet", - "nbt": { - "Damage": 0 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/recipes/guardian_spawner_from_fish_and_sticks.json b/src/generated/resources/data/testmod3/recipes/guardian_spawner_from_fish_and_sticks.json deleted file mode 100644 index f58e67d3..00000000 --- a/src/generated/resources/data/testmod3/recipes/guardian_spawner_from_fish_and_sticks.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "testmod3:enhanced_shaped", - "category": "misc", - "key": { - "C": { - "item": "minecraft:cod" - }, - "S": { - "tag": "forge:rods/wooden" - } - }, - "pattern": [ - "SSS", - "SCS", - "SSS" - ], - "result": { - "item": "minecraft:spawner", - "nbt": { - "BlockEntityTag": { - "SpawnData": { - "id": "minecraft:guardian" - }, - "SpawnPotentials": [] - } - } - } -} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/tags/blocks/saplings.json b/src/generated/resources/data/testmod3/tags/block/saplings.json similarity index 100% rename from src/generated/resources/data/testmod3/tags/blocks/saplings.json rename to src/generated/resources/data/testmod3/tags/block/saplings.json diff --git a/src/generated/resources/data/testmod3/tags/item/repairs_replacement_armor.json b/src/generated/resources/data/testmod3/tags/item/repairs_replacement_armor.json new file mode 100644 index 00000000..dce0723b --- /dev/null +++ b/src/generated/resources/data/testmod3/tags/item/repairs_replacement_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "testmod3:arrow" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/testmod3/tags/items/vanilla_dyes.json b/src/generated/resources/data/testmod3/tags/item/vanilla_dyes.json similarity index 100% rename from src/generated/resources/data/testmod3/tags/items/vanilla_dyes.json rename to src/generated/resources/data/testmod3/tags/item/vanilla_dyes.json diff --git a/src/generated/resources/data/testmod3/tags/items/vanilla_terracotta.json b/src/generated/resources/data/testmod3/tags/item/vanilla_terracotta.json similarity index 100% rename from src/generated/resources/data/testmod3/tags/items/vanilla_terracotta.json rename to src/generated/resources/data/testmod3/tags/item/vanilla_terracotta.json diff --git a/src/generated/resources/data/testmod3/worldgen/biome/desert_test.json b/src/generated/resources/data/testmod3/worldgen/biome/desert_test.json index 395a3692..2e8eaa08 100644 --- a/src/generated/resources/data/testmod3/worldgen/biome/desert_test.json +++ b/src/generated/resources/data/testmod3/worldgen/biome/desert_test.json @@ -1,11 +1,9 @@ { - "carvers": { - "air": [ - "minecraft:cave", - "minecraft:cave_extra_underground", - "minecraft:canyon" - ] - }, + "carvers": [ + "minecraft:cave", + "minecraft:cave_extra_underground", + "minecraft:canyon" + ], "downfall": 0.0, "effects": { "fog_color": 12638463, diff --git a/src/generated/resources/pack.mcmeta b/src/generated/resources/pack.mcmeta index 5a67bde6..d9cb13c5 100644 --- a/src/generated/resources/pack.mcmeta +++ b/src/generated/resources/pack.mcmeta @@ -3,6 +3,6 @@ "description": { "translate": "pack.testmod3.description" }, - "pack_format": 22 + "pack_format": 42 } } \ No newline at end of file