fix #16 (i think)

Fix several bugs which amounted to #16.
BarchamMal · Jul 26, 2024 · 2dac6fc · 2dac6fc
1 parent c6538c3
commit 2dac6fc
Show file tree

Hide file tree

Showing 85 changed files with 89 additions and 66 deletions.
diff --git a/src/main/java/barch/mc_extended/Glue/BlockBuilder.java b/src/main/java/barch/mc_extended/Glue/BlockBuilder.java
@@ -6,12 +6,12 @@
 public class BlockBuilder {
 
 
-    private static FabricBlockSettings Settings;
+    private static Block.Settings Settings;
 
 
-    public static FabricBlockSettings CloneBlock(Block block) {
+    public static Block.Settings CloneBlock(Block block) {
 
-        Settings = FabricBlockSettings.create()
+        Settings = Block.Settings.create()
                 .sounds(block.getDefaultState().getSoundGroup())
                 .strength(block.getHardness())
                 .resistance(block.getBlastResistance())

diff --git a/src/main/java/barch/mc_extended/Minerals/Ruby.java b/src/main/java/barch/mc_extended/Minerals/Ruby.java
@@ -5,24 +5,29 @@
 import barch.mc_extended.Glue.ItemGrouped;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.ExperienceDroppingBlock;
+import net.minecraft.block.MapColor;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroups;
 import net.minecraft.item.Items;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.intprovider.ConstantIntProvider;
+import net.minecraft.util.math.intprovider.UniformIntProvider;
 
 import static barch.mc_extended.MCExtended.*;
 
 public class Ruby {
 
-    public static final Block RUBY_ORE = new Block(BlockBuilder.CloneBlock(Blocks.DIAMOND_ORE).mapColor(DyeColor.LIGHT_GRAY).requiresTool().resistance(1200).hardness(30));
-    public static final Block DEEPSLATE_RUBY_ORE = new Block(BlockBuilder.CloneBlock(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(DyeColor.GRAY).requiresTool().resistance(1200).hardness(30));
-    public static final Block RUBY_BLOCK = new Block(BlockBuilder.CloneBlock(Blocks.DIAMOND_BLOCK).mapColor(DyeColor.RED).requiresTool().resistance(1200).hardness(30));
+    public static final Block RUBY_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), BlockBuilder.CloneBlock(Blocks.DIAMOND_ORE).mapColor(DyeColor.LIGHT_GRAY).requiresTool().strength(3,3));
+    public static final Block DEEPSLATE_RUBY_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), BlockBuilder.CloneBlock(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(DyeColor.GRAY).requiresTool().strength(5, 6));
+    public static final Block RUBY_BLOCK = new Block(BlockBuilder.CloneBlock(Blocks.DIAMOND_BLOCK).mapColor(DyeColor.RED).requiresTool().strength(5,6));
 
-    public static final Item RUBY = new Item(new Item.Settings());
+     public static final Item RUBY = new Item(new Item.Settings());
 
     public static void RegisterAll() {
 

diff --git a/src/main/java/barch/mc_extended/Minerals/Sapphire.java b/src/main/java/barch/mc_extended/Minerals/Sapphire.java
@@ -5,22 +5,24 @@
 import barch.mc_extended.Glue.ItemGrouped;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.ExperienceDroppingBlock;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroups;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.intprovider.UniformIntProvider;
 
 import static barch.mc_extended.MCExtended.NAMESPACE;
 import static barch.mc_extended.Minerals.Ruby.*;
 
 public class Sapphire {
 
-    public static final Block SAPPHIRE_ORE = new Block(BlockBuilder.CloneBlock(Blocks.DIAMOND_ORE).mapColor(DyeColor.LIGHT_GRAY).requiresTool().resistance(1200).hardness(30));
-    public static final Block DEEPSLATE_SAPPHIRE_ORE = new Block(BlockBuilder.CloneBlock(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(DyeColor.GRAY).requiresTool().resistance(1200).hardness(30));
-    public static final Block SAPPHIRE_BLOCK = new Block(BlockBuilder.CloneBlock(Blocks.DIAMOND_BLOCK).mapColor(DyeColor.RED).requiresTool().resistance(1200).hardness(30));
+    public static final Block SAPPHIRE_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), BlockBuilder.CloneBlock(Blocks.DIAMOND_ORE).mapColor(DyeColor.LIGHT_GRAY).requiresTool().strength(3,3));
+    public static final Block DEEPSLATE_SAPPHIRE_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), BlockBuilder.CloneBlock(Blocks.DEEPSLATE_DIAMOND_ORE).mapColor(DyeColor.GRAY).requiresTool().strength(5,6));
+    public static final Block SAPPHIRE_BLOCK = new Block(BlockBuilder.CloneBlock(Blocks.DIAMOND_BLOCK).mapColor(DyeColor.RED).requiresTool().strength(5,6));
 
     public static final Item SAPPHIRE = new Item(new Item.Settings());
 

diff --git a/...tended/loot_table/block/botany_table.json → ...ended/loot_table/blocks/botany_table.json b/...tended/loot_table/block/botany_table.json → ...ended/loot_table/blocks/botany_table.json
diff --git a/...tended/loot_table/block/bronze_block.json → ...ended/loot_table/blocks/bronze_block.json b/...tended/loot_table/block/bronze_block.json → ...ended/loot_table/blocks/bronze_block.json
diff --git a/...nded/loot_table/block/corundum_block.json → ...ded/loot_table/blocks/corundum_block.json b/...nded/loot_table/block/corundum_block.json → ...ded/loot_table/blocks/corundum_block.json
diff --git a/.../loot_table/block/deepslate_ruby_ore.json → ...loot_table/blocks/deepslate_ruby_ore.json b/.../loot_table/block/deepslate_ruby_ore.json → ...loot_table/blocks/deepslate_ruby_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...t_table/block/deepslate_sapphire_ore.json → ..._table/blocks/deepslate_sapphire_ore.json b/...t_table/block/deepslate_sapphire_ore.json → ..._table/blocks/deepslate_sapphire_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...oot_table/block/deepslate_silver_ore.json → ...ot_table/blocks/deepslate_silver_ore.json b/...oot_table/block/deepslate_silver_ore.json → ...ot_table/blocks/deepslate_silver_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...d/loot_table/block/deepslate_tin_ore.json → .../loot_table/blocks/deepslate_tin_ore.json b/...d/loot_table/block/deepslate_tin_ore.json → .../loot_table/blocks/deepslate_tin_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...-extended/loot_table/block/gem_table.json → ...extended/loot_table/blocks/gem_table.json b/...-extended/loot_table/block/gem_table.json → ...extended/loot_table/blocks/gem_table.json
diff --git a/...extended/loot_table/block/onion_crop.json → ...xtended/loot_table/blocks/onion_crop.json b/...extended/loot_table/block/onion_crop.json → ...xtended/loot_table/blocks/onion_crop.json
diff --git a/...ed/loot_table/block/raw_bronze_block.json → ...d/loot_table/blocks/raw_bronze_block.json b/...ed/loot_table/block/raw_bronze_block.json → ...d/loot_table/blocks/raw_bronze_block.json
diff --git a/...ed/loot_table/block/raw_silver_block.json → ...d/loot_table/blocks/raw_silver_block.json b/...ed/loot_table/block/raw_silver_block.json → ...d/loot_table/blocks/raw_silver_block.json
diff --git a/...ended/loot_table/block/raw_tin_block.json → ...nded/loot_table/blocks/raw_tin_block.json b/...ended/loot_table/block/raw_tin_block.json → ...nded/loot_table/blocks/raw_tin_block.json
diff --git a/...extended/loot_table/block/ruby_block.json → ...xtended/loot_table/blocks/ruby_block.json b/...extended/loot_table/block/ruby_block.json → ...xtended/loot_table/blocks/ruby_block.json
diff --git a/...c-extended/loot_table/block/ruby_ore.json → ...-extended/loot_table/blocks/ruby_ore.json b/...c-extended/loot_table/block/ruby_ore.json → ...-extended/loot_table/blocks/ruby_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...nded/loot_table/block/sapphire_block.json → ...ded/loot_table/blocks/sapphire_block.json b/...nded/loot_table/block/sapphire_block.json → ...ded/loot_table/blocks/sapphire_block.json
diff --git a/...tended/loot_table/block/sapphire_ore.json → ...ended/loot_table/blocks/sapphire_ore.json b/...tended/loot_table/block/sapphire_ore.json → ...ended/loot_table/blocks/sapphire_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...tended/loot_table/block/silver_block.json → ...ended/loot_table/blocks/silver_block.json b/...tended/loot_table/block/silver_block.json → ...ended/loot_table/blocks/silver_block.json
diff --git a/...extended/loot_table/block/silver_ore.json → ...xtended/loot_table/blocks/silver_ore.json b/...extended/loot_table/block/silver_ore.json → ...xtended/loot_table/blocks/silver_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...tended/loot_table/block/spinach_crop.json → ...ended/loot_table/blocks/spinach_crop.json b/...tended/loot_table/block/spinach_crop.json → ...ended/loot_table/blocks/spinach_crop.json
diff --git a/...-extended/loot_table/block/tin_block.json → ...extended/loot_table/blocks/tin_block.json b/...-extended/loot_table/block/tin_block.json → ...extended/loot_table/blocks/tin_block.json
diff --git a/...mc-extended/loot_table/block/tin_ore.json → ...c-extended/loot_table/blocks/tin_ore.json b/...mc-extended/loot_table/block/tin_ore.json → ...c-extended/loot_table/blocks/tin_ore.json
@@ -13,14 +13,16 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
+                    "predicates": {
+                      "minecraft:enchantments": [
+                        {
+                          "enchantments": "minecraft:silk_touch",
+                          "levels": {
+                            "min": 1
+                          }
                         }
-                      }
-                    ]
+                      ]
+                    }
                   }
                 }
               ],

diff --git a/...tended/loot_table/block/tomato_block.json → ...ended/loot_table/blocks/tomato_block.json b/...tended/loot_table/block/tomato_block.json → ...ended/loot_table/blocks/tomato_block.json
diff --git a/...xtended/loot_table/block/tomato_crop.json → ...tended/loot_table/blocks/tomato_crop.json b/...xtended/loot_table/block/tomato_crop.json → ...tended/loot_table/blocks/tomato_crop.json
diff --git a/...nded/loot_table/block/white_mushroom.json → ...ded/loot_table/blocks/white_mushroom.json b/...nded/loot_table/block/white_mushroom.json → ...ded/loot_table/blocks/white_mushroom.json
diff --git a/...oot_table/block/white_mushroom_block.json → ...ot_table/blocks/white_mushroom_block.json b/...oot_table/block/white_mushroom_block.json → ...ot_table/blocks/white_mushroom_block.json
diff --git a/...extended/loot_table/block/wild_onion.json → ...xtended/loot_table/blocks/wild_onion.json b/...extended/loot_table/block/wild_onion.json → ...xtended/loot_table/blocks/wild_onion.json
diff --git a/...tended/loot_table/block/wild_spinach.json → ...ended/loot_table/blocks/wild_spinach.json b/...tended/loot_table/block/wild_spinach.json → ...ended/loot_table/blocks/wild_spinach.json
diff --git a/...xtended/loot_table/chest/beach_house.json → ...tended/loot_table/chests/beach_house.json b/...xtended/loot_table/chest/beach_house.json → ...tended/loot_table/chests/beach_house.json
diff --git a/...xtended/loot_table/entity/ender_cube.json → ...ended/loot_table/entities/ender_cube.json b/...xtended/loot_table/entity/ender_cube.json → ...ended/loot_table/entities/ender_cube.json
diff --git a/...a/mc-extended/loot_table/entity/lost.json → ...mc-extended/loot_table/entities/lost.json b/...a/mc-extended/loot_table/entity/lost.json → ...mc-extended/loot_table/entities/lost.json
diff --git a/...ended/loot_table/entity/silver_golem.json → ...ded/loot_table/entities/silver_golem.json b/...ended/loot_table/entity/silver_golem.json → ...ded/loot_table/entities/silver_golem.json
diff --git a/...xtended/loot_table/entity/trout_fish.json → ...ended/loot_table/entities/trout_fish.json b/...xtended/loot_table/entity/trout_fish.json → ...ended/loot_table/entities/trout_fish.json
diff --git a/...data/mc-extended/tag/block/ruby_ores.json → ...ata/mc-extended/tags/block/ruby_ores.json b/...data/mc-extended/tag/block/ruby_ores.json → ...ata/mc-extended/tags/block/ruby_ores.json
diff --git a/.../mc-extended/tag/block/sapphire_ores.json → ...mc-extended/tags/block/sapphire_ores.json b/.../mc-extended/tag/block/sapphire_ores.json → ...mc-extended/tags/block/sapphire_ores.json
diff --git a/...ta/mc-extended/tag/block/silver_ores.json → ...a/mc-extended/tags/block/silver_ores.json b/...ta/mc-extended/tag/block/silver_ores.json → ...a/mc-extended/tags/block/silver_ores.json
diff --git a/.../data/mc-extended/tag/block/tin_ores.json → ...data/mc-extended/tags/block/tin_ores.json b/.../data/mc-extended/tag/block/tin_ores.json → ...data/mc-extended/tags/block/tin_ores.json
diff --git a/...ces/data/mc-extended/tag/item/acidic.json → ...es/data/mc-extended/tags/item/acidic.json b/...ces/data/mc-extended/tag/item/acidic.json → ...es/data/mc-extended/tags/item/acidic.json
diff --git a/...s/data/mc-extended/tag/item/corundum.json → .../data/mc-extended/tags/item/corundum.json b/...s/data/mc-extended/tag/item/corundum.json → .../data/mc-extended/tags/item/corundum.json
diff --git a/...ta/mc-extended/tag/item/hard_gem_axe.json → ...a/mc-extended/tags/item/hard_gem_axe.json b/...ta/mc-extended/tag/item/hard_gem_axe.json → ...a/mc-extended/tags/item/hard_gem_axe.json
diff --git a/.../mc-extended/tag/item/hard_gem_boots.json → ...mc-extended/tags/item/hard_gem_boots.json b/.../mc-extended/tag/item/hard_gem_boots.json → ...mc-extended/tags/item/hard_gem_boots.json
diff --git a/...xtended/tag/item/hard_gem_chestplate.json → ...tended/tags/item/hard_gem_chestplate.json b/...xtended/tag/item/hard_gem_chestplate.json → ...tended/tags/item/hard_gem_chestplate.json
diff --git a/...mc-extended/tag/item/hard_gem_helmet.json → ...c-extended/tags/item/hard_gem_helmet.json b/...mc-extended/tag/item/hard_gem_helmet.json → ...c-extended/tags/item/hard_gem_helmet.json
diff --git a/...ta/mc-extended/tag/item/hard_gem_hoe.json → ...a/mc-extended/tags/item/hard_gem_hoe.json b/...ta/mc-extended/tag/item/hard_gem_hoe.json → ...a/mc-extended/tags/item/hard_gem_hoe.json
diff --git a/...-extended/tag/item/hard_gem_leggings.json → ...extended/tags/item/hard_gem_leggings.json b/...-extended/tag/item/hard_gem_leggings.json → ...extended/tags/item/hard_gem_leggings.json
diff --git a/...c-extended/tag/item/hard_gem_pickaxe.json → ...-extended/tags/item/hard_gem_pickaxe.json b/...c-extended/tag/item/hard_gem_pickaxe.json → ...-extended/tags/item/hard_gem_pickaxe.json
diff --git a/...mc-extended/tag/item/hard_gem_shovel.json → ...c-extended/tags/item/hard_gem_shovel.json b/...mc-extended/tag/item/hard_gem_shovel.json → ...c-extended/tags/item/hard_gem_shovel.json
diff --git a/.../mc-extended/tag/item/hard_gem_sword.json → ...mc-extended/tags/item/hard_gem_sword.json b/.../mc-extended/tag/item/hard_gem_sword.json → ...mc-extended/tags/item/hard_gem_sword.json
diff --git a/...c-extended/tag/item/iron_like_ingots.json → ...-extended/tags/item/iron_like_ingots.json b/...c-extended/tag/item/iron_like_ingots.json → ...-extended/tags/item/iron_like_ingots.json
diff --git a/.../data/mc-extended/tag/item/ruby_ores.json → ...data/mc-extended/tags/item/ruby_ores.json b/.../data/mc-extended/tag/item/ruby_ores.json → ...data/mc-extended/tags/item/ruby_ores.json
diff --git a/...a/mc-extended/tag/item/sapphire_ores.json → .../mc-extended/tags/item/sapphire_ores.json b/...a/mc-extended/tag/item/sapphire_ores.json → .../mc-extended/tags/item/sapphire_ores.json
diff --git a/...ata/mc-extended/tag/item/silver_ores.json → ...ta/mc-extended/tags/item/silver_ores.json b/...ata/mc-extended/tag/item/silver_ores.json → ...ta/mc-extended/tags/item/silver_ores.json
diff --git a/...s/data/mc-extended/tag/item/tin_ores.json → .../data/mc-extended/tags/item/tin_ores.json b/...s/data/mc-extended/tag/item/tin_ores.json → .../data/mc-extended/tags/item/tin_ores.json
diff --git a/...n/biome/has_structure/village_jungle.json → ...n/biome/has_structure/village_jungle.json b/...n/biome/has_structure/village_jungle.json → ...n/biome/has_structure/village_jungle.json
diff --git a/...ed/tag/worldgen/biome/losts_spawn_in.json → ...d/tags/worldgen/biome/losts_spawn_in.json b/...ed/tag/worldgen/biome/losts_spawn_in.json → ...d/tags/worldgen/biome/losts_spawn_in.json
diff --git a/...ed/tag/worldgen/biome/ruby_spawns_in.json → ...d/tags/worldgen/biome/ruby_spawns_in.json b/...ed/tag/worldgen/biome/ruby_spawns_in.json → ...d/tags/worldgen/biome/ruby_spawns_in.json
diff --git a/...ag/worldgen/biome/sapphire_spawns_in.json → ...gs/worldgen/biome/sapphire_spawns_in.json b/...ag/worldgen/biome/sapphire_spawns_in.json → ...gs/worldgen/biome/sapphire_spawns_in.json
diff --git a/...ldgen/biome/white_mushrooms_spawn_in.json → ...ldgen/biome/white_mushrooms_spawn_in.json b/...ldgen/biome/white_mushrooms_spawn_in.json → ...ldgen/biome/white_mushrooms_spawn_in.json
diff --git a/...necraft/tag/block/beacon_base_blocks.json → ...ecraft/tags/block/beacon_base_blocks.json b/...necraft/tag/block/beacon_base_blocks.json → ...ecraft/tags/block/beacon_base_blocks.json
diff --git a/...inecraft/tag/block/hoglin_repellents.json → ...necraft/tags/block/hoglin_repellents.json b/...inecraft/tag/block/hoglin_repellents.json → ...necraft/tags/block/hoglin_repellents.json
diff --git a/...ata/minecraft/tag/block/mineable/axe.json → ...ta/minecraft/tags/block/mineable/axe.json b/...ata/minecraft/tag/block/mineable/axe.json → ...ta/minecraft/tags/block/mineable/axe.json
diff --git a/...ata/minecraft/tag/block/mineable/hoe.json → ...ta/minecraft/tags/block/mineable/hoe.json b/...ata/minecraft/tag/block/mineable/hoe.json → ...ta/minecraft/tags/block/mineable/hoe.json
diff --git a/...minecraft/tag/block/mineable/pickaxe.json → ...inecraft/tags/block/mineable/pickaxe.json b/...minecraft/tag/block/mineable/pickaxe.json → ...inecraft/tags/block/mineable/pickaxe.json
diff --git a/...necraft/tag/block/needs_diamond_tool.json → ...ecraft/tags/block/needs_diamond_tool.json b/...necraft/tag/block/needs_diamond_tool.json → ...ecraft/tags/block/needs_diamond_tool.json
diff --git a/.../minecraft/tag/block/needs_iron_tool.json → ...minecraft/tags/block/needs_iron_tool.json b/.../minecraft/tag/block/needs_iron_tool.json → ...minecraft/tags/block/needs_iron_tool.json
diff --git a/...inecraft/tag/block/piglin_repellents.json → ...necraft/tags/block/piglin_repellents.json b/...inecraft/tag/block/piglin_repellents.json → ...necraft/tags/block/piglin_repellents.json
diff --git a/...ta/minecraft/tag/block/small_flowers.json → ...a/minecraft/tags/block/small_flowers.json b/...ta/minecraft/tag/block/small_flowers.json → ...a/minecraft/tags/block/small_flowers.json
diff --git a/...raft/tag/block/soul_fire_base_blocks.json → ...aft/tags/block/soul_fire_base_blocks.json b/...raft/tag/block/soul_fire_base_blocks.json → ...aft/tags/block/soul_fire_base_blocks.json
diff --git a/...t/tag/entity_type/fall_damage_immune.json → .../tags/entity_type/fall_damage_immune.json b/...t/tag/entity_type/fall_damage_immune.json → .../tags/entity_type/fall_damage_immune.json
diff --git a/.../minecraft/tag/entity_type/frog_food.json → ...minecraft/tags/entity_type/frog_food.json b/.../minecraft/tag/entity_type/frog_food.json → ...minecraft/tags/entity_type/frog_food.json
diff --git a/.../minecraft/tag/entity_type/skeletons.json → ...minecraft/tags/entity_type/skeletons.json b/.../minecraft/tag/entity_type/skeletons.json → ...minecraft/tags/entity_type/skeletons.json
diff --git a/...sources/data/minecraft/tag/item/axes.json → ...ources/data/minecraft/tags/item/axes.json b/...sources/data/minecraft/tag/item/axes.json → ...ources/data/minecraft/tags/item/axes.json
diff --git a/...ecraft/tag/item/beacon_payment_items.json → ...craft/tags/item/beacon_payment_items.json b/...ecraft/tag/item/beacon_payment_items.json → ...craft/tags/item/beacon_payment_items.json
diff --git a/...a/minecraft/tag/item/bookshelf_books.json → .../minecraft/tags/item/bookshelf_books.json b/...a/minecraft/tag/item/bookshelf_books.json → .../minecraft/tags/item/bookshelf_books.json
diff --git a/...ft/tag/item/cluster_max_harvestables.json → ...t/tags/item/cluster_max_harvestables.json b/...ft/tag/item/cluster_max_harvestables.json → ...t/tags/item/cluster_max_harvestables.json
diff --git a/...sources/data/minecraft/tag/item/hoes.json → ...ources/data/minecraft/tags/item/hoes.json b/...sources/data/minecraft/tag/item/hoes.json → ...ources/data/minecraft/tags/item/hoes.json
diff --git a/...ces/data/minecraft/tag/item/mushroom.json → ...es/data/minecraft/tags/item/mushroom.json b/...ces/data/minecraft/tag/item/mushroom.json → ...es/data/minecraft/tags/item/mushroom.json
diff --git a/...ces/data/minecraft/tag/item/pickaxes.json → ...es/data/minecraft/tags/item/pickaxes.json b/...ces/data/minecraft/tag/item/pickaxes.json → ...es/data/minecraft/tags/item/pickaxes.json
diff --git a/...rces/data/minecraft/tag/item/shovels.json → ...ces/data/minecraft/tags/item/shovels.json b/...rces/data/minecraft/tag/item/shovels.json → ...ces/data/minecraft/tags/item/shovels.json
diff --git a/...urces/data/minecraft/tag/item/swords.json → ...rces/data/minecraft/tags/item/swords.json b/...urces/data/minecraft/tag/item/swords.json → ...rces/data/minecraft/tags/item/swords.json
diff --git a/...a/minecraft/tag/item/trimmable_armor.json → .../minecraft/tags/item/trimmable_armor.json b/...a/minecraft/tag/item/trimmable_armor.json → .../minecraft/tags/item/trimmable_armor.json
diff --git a/...ft/tag/item/villager_plantable_seeds.json → ...t/tags/item/villager_plantable_seeds.json b/...ft/tag/item/villager_plantable_seeds.json → ...t/tags/item/villager_plantable_seeds.json
diff --git a/...of_interest_type/acquirable_job_site.json → ...of_interest_type/acquirable_job_site.json b/...of_interest_type/acquirable_job_site.json → ...of_interest_type/acquirable_job_site.json