Run data generation

Choonster-Minecraft-Mods · Nov 16, 2024 · fa0ec3d · fa0ec3d
1 parent 6d65c9a
commit fa0ec3d
Show file tree

Hide file tree

Showing 133 changed files with 264 additions and 279 deletions.
diff --git 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,15 +150,15 @@
   "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",
   "item.testmod3.pig_spawner_finite": "Finite Pig Spawner",
   "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/.../testmod3/models/item/record_solaris.json → ...tmod3/models/item/music_disc_solaris.json b/.../testmod3/models/item/record_solaris.json → ...tmod3/models/item/music_disc_solaris.json
diff --git a/src/generated/resources/assets/testmod3/sounds.json 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
+      }
+    ]
+  }
+}
diff --git a/...tags/worldgen/biome/is_dry/overworld.json → ...tags/worldgen/biome/is_dry/overworld.json b/...tags/worldgen/biome/is_dry/overworld.json → ...tags/worldgen/biome/is_dry/overworld.json
diff --git a/...tags/worldgen/biome/is_hot/overworld.json → ...tags/worldgen/biome/is_hot/overworld.json b/...tags/worldgen/biome/is_hot/overworld.json → ...tags/worldgen/biome/is_hot/overworld.json
diff --git a/...urces/data/forge/tags/fluids/gaseous.json → ...ources/data/forge/tags/fluid/gaseous.json b/...urces/data/forge/tags/fluids/gaseous.json → ...ources/data/forge/tags/fluid/gaseous.json
diff --git a/...sources/data/forge/tags/items/rubber.json → ...esources/data/forge/tags/item/rubber.json b/...sources/data/forge/tags/items/rubber.json → ...esources/data/forge/tags/item/rubber.json
diff --git a/...a/minecraft/tags/blocks/mineable/axe.json → ...ta/minecraft/tags/block/mineable/axe.json b/...a/minecraft/tags/blocks/mineable/axe.json → ...ta/minecraft/tags/block/mineable/axe.json
diff --git a/...necraft/tags/blocks/mineable/pickaxe.json → ...inecraft/tags/block/mineable/pickaxe.json b/...necraft/tags/blocks/mineable/pickaxe.json → ...inecraft/tags/block/mineable/pickaxe.json
diff --git a/.../data/minecraft/tags/blocks/saplings.json → ...s/data/minecraft/tags/block/saplings.json b/.../data/minecraft/tags/blocks/saplings.json → ...s/data/minecraft/tags/block/saplings.json
diff --git a/...ces/data/minecraft/tags/items/arrows.json → ...rces/data/minecraft/tags/item/arrows.json b/...ces/data/minecraft/tags/items/arrows.json → ...rces/data/minecraft/tags/item/arrows.json
diff --git a/...ces/data/minecraft/tags/items/planks.json → ...rces/data/minecraft/tags/item/planks.json b/...ces/data/minecraft/tags/items/planks.json → ...rces/data/minecraft/tags/item/planks.json
diff --git a/...s/data/minecraft/tags/items/saplings.json → ...es/data/minecraft/tags/item/saplings.json b/...s/data/minecraft/tags/items/saplings.json → ...es/data/minecraft/tags/item/saplings.json
diff --git a/...ources/data/testmod3/advancement/recipes/building_blocks/cobblestone_from_static_gas.json b/...ources/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"
+    ]
+  }
+}
diff --git a/...g_blocks/conditional_ingredient_test.json → ...g_blocks/conditional_ingredient_test.json b/...g_blocks/conditional_ingredient_test.json → ...g_blocks/conditional_ingredient_test.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:cobblestone"
-            ]
+            "items": "minecraft:cobblestone"
           }
         ]
       },

diff --git a/...lding_blocks/conditional_recipe_test.json → ...lding_blocks/conditional_recipe_test.json b/...lding_blocks/conditional_recipe_test.json → ...lding_blocks/conditional_recipe_test.json
@@ -1,15 +1,13 @@
 {
-  "advancements": [
+  "forge:conditional": [
     {
       "parent": "minecraft:recipes/root",
       "criteria": {
         "has_axe": {
           "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/...lding_blocks/oak_planks_with_mod_axe.json → ...lding_blocks/oak_planks_with_mod_axe.json b/...lding_blocks/oak_planks_with_mod_axe.json → ...lding_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/...g_blocks/oak_planks_with_vanilla_axe.json → ...g_blocks/oak_planks_with_vanilla_axe.json b/...g_blocks/oak_planks_with_vanilla_axe.json → ...g_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/...ombat/golden_helmet_from_iron_helmet.json → ...ombat/golden_helmet_from_iron_helmet.json b/...ombat/golden_helmet_from_iron_helmet.json → ...ombat/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/...ipes/food/fish_from_guardian_spawner.json → ...ipes/food/fish_from_guardian_spawner.json b/...ipes/food/fish_from_guardian_spawner.json → ...ipes/food/fish_from_guardian_spawner.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:spawner"
-            ]
+            "items": "minecraft:spawner"
           }
         ]
       },

diff --git a/...s/recipes/misc/dimension_replacement.json → ...t/recipes/misc/dimension_replacement.json b/...s/recipes/misc/dimension_replacement.json → ...t/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/...imension_replacement_from_subscripts.json → ...imension_replacement_from_subscripts.json b/...imension_replacement_from_subscripts.json → ...imension_replacement_from_subscripts.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "testmod3:subscripts"
-            ]
+            "items": "testmod3:subscripts"
           }
         ]
       },

diff --git a/...uardian_spawner_from_fish_and_sticks.json → ...uardian_spawner_from_fish_and_sticks.json b/...uardian_spawner_from_fish_and_sticks.json → ...uardian_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/...urces/data/testmod3/advancements/recipes/building_blocks/cobblestone_from_static_gas.json b/...urces/data/testmod3/advancements/recipes/building_blocks/cobblestone_from_static_gas.json
diff --git a/src/generated/resources/data/testmod3/jukebox_song/solaris.json 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"
+}
diff --git 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/...d3/loot_tables/blocks/acacia_sapling.json → ...od3/loot_table/blocks/acacia_sapling.json b/...d3/loot_tables/blocks/acacia_sapling.json → ...od3/loot_table/blocks/acacia_sapling.json
diff --git a/...stmod3/loot_tables/blocks/basic_pipe.json → ...estmod3/loot_table/blocks/basic_pipe.json b/...stmod3/loot_tables/blocks/basic_pipe.json → ...estmod3/loot_table/blocks/basic_pipe.json
diff --git a/...od3/loot_tables/blocks/birch_sapling.json → ...mod3/loot_table/blocks/birch_sapling.json b/...od3/loot_tables/blocks/birch_sapling.json → ...mod3/loot_table/blocks/birch_sapling.json
diff --git a/...s/blocks/black_multi_rotatable_block.json → ...e/blocks/black_multi_rotatable_block.json b/...s/blocks/black_multi_rotatable_block.json → ...e/blocks/black_multi_rotatable_block.json
diff --git a/..._tables/blocks/black_rotatable_block.json → ...t_table/blocks/black_rotatable_block.json b/..._tables/blocks/black_rotatable_block.json → ...t_table/blocks/black_rotatable_block.json
diff --git a/..._tables/blocks/black_terracotta_slab.json → ...t_table/blocks/black_terracotta_slab.json b/..._tables/blocks/black_terracotta_slab.json → ...t_table/blocks/black_terracotta_slab.json
diff --git a/...es/blocks/blue_multi_rotatable_block.json → ...le/blocks/blue_multi_rotatable_block.json b/...es/blocks/blue_multi_rotatable_block.json → ...le/blocks/blue_multi_rotatable_block.json
diff --git a/...t_tables/blocks/blue_rotatable_block.json → ...ot_table/blocks/blue_rotatable_block.json b/...t_tables/blocks/blue_rotatable_block.json → ...ot_table/blocks/blue_rotatable_block.json
diff --git a/...t_tables/blocks/blue_terracotta_slab.json → ...ot_table/blocks/blue_terracotta_slab.json b/...t_tables/blocks/blue_terracotta_slab.json → ...ot_table/blocks/blue_terracotta_slab.json
diff --git a/...s/blocks/brown_multi_rotatable_block.json → ...e/blocks/brown_multi_rotatable_block.json b/...s/blocks/brown_multi_rotatable_block.json → ...e/blocks/brown_multi_rotatable_block.json
diff --git a/..._tables/blocks/brown_rotatable_block.json → ...t_table/blocks/brown_rotatable_block.json b/..._tables/blocks/brown_rotatable_block.json → ...t_table/blocks/brown_rotatable_block.json
diff --git a/..._tables/blocks/brown_terracotta_slab.json → ...t_table/blocks/brown_terracotta_slab.json b/..._tables/blocks/brown_terracotta_slab.json → ...t_table/blocks/brown_terracotta_slab.json
diff --git a/...ta/testmod3/loot_tables/blocks/chest.json → ...ata/testmod3/loot_table/blocks/chest.json b/...ta/testmod3/loot_tables/blocks/chest.json → ...ata/testmod3/loot_table/blocks/chest.json
diff --git a/...les/blocks/client_player_right_click.json → ...ble/blocks/client_player_right_click.json b/...les/blocks/client_player_right_click.json → ...ble/blocks/client_player_right_click.json
diff --git a/...tables/blocks/client_player_rotation.json → ..._table/blocks/client_player_rotation.json b/...tables/blocks/client_player_rotation.json → ..._table/blocks/client_player_rotation.json
diff --git a/...es/blocks/cyan_multi_rotatable_block.json → ...le/blocks/cyan_multi_rotatable_block.json b/...es/blocks/cyan_multi_rotatable_block.json → ...le/blocks/cyan_multi_rotatable_block.json
diff --git a/...t_tables/blocks/cyan_rotatable_block.json → ...ot_table/blocks/cyan_rotatable_block.json b/...t_tables/blocks/cyan_rotatable_block.json → ...ot_table/blocks/cyan_rotatable_block.json
diff --git a/...t_tables/blocks/cyan_terracotta_slab.json → ...ot_table/blocks/cyan_terracotta_slab.json b/...t_tables/blocks/cyan_terracotta_slab.json → ...ot_table/blocks/cyan_terracotta_slab.json
diff --git a/.../loot_tables/blocks/dark_oak_sapling.json → ...3/loot_table/blocks/dark_oak_sapling.json b/.../loot_tables/blocks/dark_oak_sapling.json → ...3/loot_table/blocks/dark_oak_sapling.json
diff --git a/..._tables/blocks/end_portal_frame_full.json → ...t_table/blocks/end_portal_frame_full.json b/..._tables/blocks/end_portal_frame_full.json → ...t_table/blocks/end_portal_frame_full.json
diff --git a/...stmod3/loot_tables/blocks/fluid_pipe.json → ...estmod3/loot_table/blocks/fluid_pipe.json b/...stmod3/loot_tables/blocks/fluid_pipe.json → ...estmod3/loot_table/blocks/fluid_pipe.json
diff --git a/...stmod3/loot_tables/blocks/fluid_tank.json → ...estmod3/loot_table/blocks/fluid_tank.json b/...stmod3/loot_tables/blocks/fluid_tank.json → ...estmod3/loot_table/blocks/fluid_tank.json
diff --git a/..._tables/blocks/fluid_tank_restricted.json → ...t_table/blocks/fluid_tank_restricted.json b/..._tables/blocks/fluid_tank_restricted.json → ...t_table/blocks/fluid_tank_restricted.json
diff --git a/...stmod3/loot_tables/blocks/fullbright.json → ...estmod3/loot_table/blocks/fullbright.json b/...stmod3/loot_tables/blocks/fullbright.json → ...estmod3/loot_table/blocks/fullbright.json
diff --git a/...es/blocks/gray_multi_rotatable_block.json → ...le/blocks/gray_multi_rotatable_block.json b/...es/blocks/gray_multi_rotatable_block.json → ...le/blocks/gray_multi_rotatable_block.json
diff --git a/...t_tables/blocks/gray_rotatable_block.json → ...ot_table/blocks/gray_rotatable_block.json b/...t_tables/blocks/gray_rotatable_block.json → ...ot_table/blocks/gray_rotatable_block.json
diff --git a/...t_tables/blocks/gray_terracotta_slab.json → ...ot_table/blocks/gray_terracotta_slab.json b/...t_tables/blocks/gray_terracotta_slab.json → ...ot_table/blocks/gray_terracotta_slab.json
diff --git a/...s/blocks/green_multi_rotatable_block.json → ...e/blocks/green_multi_rotatable_block.json b/...s/blocks/green_multi_rotatable_block.json → ...e/blocks/green_multi_rotatable_block.json
diff --git a/..._tables/blocks/green_rotatable_block.json → ...t_table/blocks/green_rotatable_block.json b/..._tables/blocks/green_rotatable_block.json → ...t_table/blocks/green_rotatable_block.json
diff --git a/..._tables/blocks/green_terracotta_slab.json → ...t_table/blocks/green_terracotta_slab.json b/..._tables/blocks/green_terracotta_slab.json → ...t_table/blocks/green_terracotta_slab.json
diff --git a/...a/testmod3/loot_tables/blocks/hidden.json → ...ta/testmod3/loot_table/blocks/hidden.json b/...a/testmod3/loot_tables/blocks/hidden.json → ...ta/testmod3/loot_table/blocks/hidden.json
diff --git a/...estmod3/loot_tables/blocks/invisible.json → ...testmod3/loot_table/blocks/invisible.json b/...estmod3/loot_tables/blocks/invisible.json → ...testmod3/loot_table/blocks/invisible.json
diff --git a/...ot_tables/blocks/item_collision_test.json → ...oot_table/blocks/item_collision_test.json b/...ot_tables/blocks/item_collision_test.json → ...oot_table/blocks/item_collision_test.json
diff --git a/...od3/loot_tables/blocks/item_debugger.json → ...mod3/loot_table/blocks/item_debugger.json b/...od3/loot_tables/blocks/item_debugger.json → ...mod3/loot_table/blocks/item_debugger.json
diff --git a/...d3/loot_tables/blocks/jungle_sapling.json → ...od3/loot_table/blocks/jungle_sapling.json b/...d3/loot_tables/blocks/jungle_sapling.json → ...od3/loot_table/blocks/jungle_sapling.json
diff --git a/...t_tables/blocks/large_collision_test.json → ...ot_table/blocks/large_collision_test.json b/...t_tables/blocks/large_collision_test.json → ...ot_table/blocks/large_collision_test.json
diff --git a/...cks/light_blue_multi_rotatable_block.json → ...cks/light_blue_multi_rotatable_block.json b/...cks/light_blue_multi_rotatable_block.json → ...cks/light_blue_multi_rotatable_block.json
diff --git a/...es/blocks/light_blue_rotatable_block.json → ...le/blocks/light_blue_rotatable_block.json b/...es/blocks/light_blue_rotatable_block.json → ...le/blocks/light_blue_rotatable_block.json
diff --git a/...es/blocks/light_blue_terracotta_slab.json → ...le/blocks/light_blue_terracotta_slab.json b/...es/blocks/light_blue_terracotta_slab.json → ...le/blocks/light_blue_terracotta_slab.json
diff --git a/...cks/light_gray_multi_rotatable_block.json → ...cks/light_gray_multi_rotatable_block.json b/...cks/light_gray_multi_rotatable_block.json → ...cks/light_gray_multi_rotatable_block.json
diff --git a/...es/blocks/light_gray_rotatable_block.json → ...le/blocks/light_gray_rotatable_block.json b/...es/blocks/light_gray_rotatable_block.json → ...le/blocks/light_gray_rotatable_block.json
diff --git a/...es/blocks/light_gray_terracotta_slab.json → ...le/blocks/light_gray_terracotta_slab.json b/...es/blocks/light_gray_terracotta_slab.json → ...le/blocks/light_gray_terracotta_slab.json
diff --git a/...es/blocks/lime_multi_rotatable_block.json → ...le/blocks/lime_multi_rotatable_block.json b/...es/blocks/lime_multi_rotatable_block.json → ...le/blocks/lime_multi_rotatable_block.json
diff --git a/...t_tables/blocks/lime_rotatable_block.json → ...ot_table/blocks/lime_rotatable_block.json b/...t_tables/blocks/lime_rotatable_block.json → ...ot_table/blocks/lime_rotatable_block.json
diff --git a/...t_tables/blocks/lime_terracotta_slab.json → ...ot_table/blocks/lime_terracotta_slab.json b/...t_tables/blocks/lime_terracotta_slab.json → ...ot_table/blocks/lime_terracotta_slab.json
diff --git a/...blocks/magenta_multi_rotatable_block.json → ...blocks/magenta_multi_rotatable_block.json b/...blocks/magenta_multi_rotatable_block.json → ...blocks/magenta_multi_rotatable_block.json
diff --git a/...ables/blocks/magenta_rotatable_block.json → ...table/blocks/magenta_rotatable_block.json b/...ables/blocks/magenta_rotatable_block.json → ...table/blocks/magenta_rotatable_block.json
diff --git a/...ables/blocks/magenta_terracotta_slab.json → ...table/blocks/magenta_terracotta_slab.json b/...ables/blocks/magenta_terracotta_slab.json → ...table/blocks/magenta_terracotta_slab.json
diff --git a/...loot_tables/blocks/max_health_getter.json → .../loot_table/blocks/max_health_getter.json b/...loot_tables/blocks/max_health_getter.json → .../loot_table/blocks/max_health_getter.json
diff --git a/...loot_tables/blocks/max_health_setter.json → .../loot_table/blocks/max_health_setter.json b/...loot_tables/blocks/max_health_setter.json → .../loot_table/blocks/max_health_setter.json
diff --git a/...mod3/loot_tables/blocks/mirror_plane.json → ...tmod3/loot_table/blocks/mirror_plane.json b/...mod3/loot_tables/blocks/mirror_plane.json → ...tmod3/loot_table/blocks/mirror_plane.json
diff --git a/...loot_tables/blocks/normal_brightness.json → .../loot_table/blocks/normal_brightness.json b/...loot_tables/blocks/normal_brightness.json → .../loot_table/blocks/normal_brightness.json
diff --git a/...tmod3/loot_tables/blocks/oak_sapling.json → ...stmod3/loot_table/blocks/oak_sapling.json b/...tmod3/loot_tables/blocks/oak_sapling.json → ...stmod3/loot_table/blocks/oak_sapling.json
diff --git a/.../blocks/orange_multi_rotatable_block.json → .../blocks/orange_multi_rotatable_block.json b/.../blocks/orange_multi_rotatable_block.json → .../blocks/orange_multi_rotatable_block.json
diff --git a/...tables/blocks/orange_rotatable_block.json → ..._table/blocks/orange_rotatable_block.json b/...tables/blocks/orange_rotatable_block.json → ..._table/blocks/orange_rotatable_block.json
diff --git a/...tables/blocks/orange_terracotta_slab.json → ..._table/blocks/orange_terracotta_slab.json b/...tables/blocks/orange_terracotta_slab.json → ..._table/blocks/orange_terracotta_slab.json
diff --git a/...t_tables/blocks/pig_spawner_refiller.json → ...ot_table/blocks/pig_spawner_refiller.json b/...t_tables/blocks/pig_spawner_refiller.json → ...ot_table/blocks/pig_spawner_refiller.json
diff --git a/...es/blocks/pink_multi_rotatable_block.json → ...le/blocks/pink_multi_rotatable_block.json b/...es/blocks/pink_multi_rotatable_block.json → ...le/blocks/pink_multi_rotatable_block.json
diff --git a/...t_tables/blocks/pink_rotatable_block.json → ...ot_table/blocks/pink_rotatable_block.json b/...t_tables/blocks/pink_rotatable_block.json → ...ot_table/blocks/pink_rotatable_block.json
diff --git a/...t_tables/blocks/pink_terracotta_slab.json → ...ot_table/blocks/pink_terracotta_slab.json b/...t_tables/blocks/pink_terracotta_slab.json → ...ot_table/blocks/pink_terracotta_slab.json
diff --git a/...a/testmod3/loot_tables/blocks/planks.json → ...ta/testmod3/loot_table/blocks/planks.json b/...a/testmod3/loot_tables/blocks/planks.json → ...ta/testmod3/loot_table/blocks/planks.json
diff --git a/...od3/loot_tables/blocks/potion_effect.json → ...mod3/loot_table/blocks/potion_effect.json b/...od3/loot_tables/blocks/potion_effect.json → ...mod3/loot_table/blocks/potion_effect.json
diff --git a/.../blocks/purple_multi_rotatable_block.json → .../blocks/purple_multi_rotatable_block.json b/.../blocks/purple_multi_rotatable_block.json → .../blocks/purple_multi_rotatable_block.json
diff --git a/...tables/blocks/purple_rotatable_block.json → ..._table/blocks/purple_rotatable_block.json b/...tables/blocks/purple_rotatable_block.json → ..._table/blocks/purple_rotatable_block.json
diff --git a/...tables/blocks/purple_terracotta_slab.json → ..._table/blocks/purple_terracotta_slab.json b/...tables/blocks/purple_terracotta_slab.json → ..._table/blocks/purple_terracotta_slab.json
diff --git a/...les/blocks/red_multi_rotatable_block.json → ...ble/blocks/red_multi_rotatable_block.json b/...les/blocks/red_multi_rotatable_block.json → ...ble/blocks/red_multi_rotatable_block.json
diff --git a/...ot_tables/blocks/red_rotatable_block.json → ...oot_table/blocks/red_rotatable_block.json b/...ot_tables/blocks/red_rotatable_block.json → ...oot_table/blocks/red_rotatable_block.json
diff --git a/...ot_tables/blocks/red_terracotta_slab.json → ...oot_table/blocks/red_terracotta_slab.json b/...ot_tables/blocks/red_terracotta_slab.json → ...oot_table/blocks/red_terracotta_slab.json
diff --git a/.../loot_tables/blocks/right_click_test.json → ...3/loot_table/blocks/right_click_test.json b/.../loot_tables/blocks/right_click_test.json → ...3/loot_table/blocks/right_click_test.json
diff --git a/...d3/loot_tables/blocks/rotatable_lamp.json → ...od3/loot_table/blocks/rotatable_lamp.json b/...d3/loot_tables/blocks/rotatable_lamp.json → ...od3/loot_table/blocks/rotatable_lamp.json
diff --git a/...t_tables/blocks/small_collision_test.json → ...ot_table/blocks/small_collision_test.json b/...t_tables/blocks/small_collision_test.json → ...ot_table/blocks/small_collision_test.json
diff --git a/...d3/loot_tables/blocks/spruce_sapling.json → ...od3/loot_table/blocks/spruce_sapling.json b/...d3/loot_tables/blocks/spruce_sapling.json → ...od3/loot_table/blocks/spruce_sapling.json
diff --git a/...oot_tables/blocks/vanilla_model_test.json → ...loot_table/blocks/vanilla_model_test.json b/...oot_tables/blocks/vanilla_model_test.json → ...loot_table/blocks/vanilla_model_test.json
diff --git a/.../loot_tables/blocks/variants_block_a.json → ...3/loot_table/blocks/variants_block_a.json b/.../loot_tables/blocks/variants_block_a.json → ...3/loot_table/blocks/variants_block_a.json
diff --git a/.../loot_tables/blocks/variants_block_b.json → ...3/loot_table/blocks/variants_block_b.json b/.../loot_tables/blocks/variants_block_b.json → ...3/loot_table/blocks/variants_block_b.json
diff --git a/...tmod3/loot_tables/blocks/water_grass.json → ...stmod3/loot_table/blocks/water_grass.json b/...tmod3/loot_tables/blocks/water_grass.json → ...stmod3/loot_table/blocks/water_grass.json
diff --git a/...s/blocks/white_multi_rotatable_block.json → ...e/blocks/white_multi_rotatable_block.json b/...s/blocks/white_multi_rotatable_block.json → ...e/blocks/white_multi_rotatable_block.json
diff --git a/..._tables/blocks/white_rotatable_block.json → ...t_table/blocks/white_rotatable_block.json b/..._tables/blocks/white_rotatable_block.json → ...t_table/blocks/white_rotatable_block.json
diff --git a/..._tables/blocks/white_terracotta_slab.json → ...t_table/blocks/white_terracotta_slab.json b/..._tables/blocks/white_terracotta_slab.json → ...t_table/blocks/white_terracotta_slab.json
diff --git a/.../blocks/yellow_multi_rotatable_block.json → .../blocks/yellow_multi_rotatable_block.json b/.../blocks/yellow_multi_rotatable_block.json → .../blocks/yellow_multi_rotatable_block.json
diff --git a/...tables/blocks/yellow_rotatable_block.json → ..._table/blocks/yellow_rotatable_block.json b/...tables/blocks/yellow_rotatable_block.json → ..._table/blocks/yellow_rotatable_block.json
diff --git a/...tables/blocks/yellow_terracotta_slab.json → ..._table/blocks/yellow_terracotta_slab.json b/...tables/blocks/yellow_terracotta_slab.json → ..._table/blocks/yellow_terracotta_slab.json
diff --git a/...estmod3/loot_tables/conditional_test.json → ...testmod3/loot_table/conditional_test.json b/...estmod3/loot_tables/conditional_test.json → ...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/...les/entities/player_avoiding_creeper.json → ...ble/entities/player_avoiding_creeper.json b/...les/entities/player_avoiding_creeper.json → ...ble/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