diff --git a/src/main/java/barch/mc_extended/Glue/BlockBuilder.java b/src/main/java/barch/mc_extended/Glue/BlockBuilder.java index 68f28a3..9c977c6 100644 --- 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 index dc382d5..9c2385b 100644 --- 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 index 838855b..11f7108 100644 --- a/src/main/java/barch/mc_extended/Minerals/Sapphire.java +++ b/src/main/java/barch/mc_extended/Minerals/Sapphire.java @@ -5,6 +5,7 @@ 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; @@ -12,15 +13,16 @@ 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/src/main/resources/data/mc-extended/loot_table/block/botany_table.json b/src/main/resources/data/mc-extended/loot_table/blocks/botany_table.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/botany_table.json rename to src/main/resources/data/mc-extended/loot_table/blocks/botany_table.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/bronze_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/bronze_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/bronze_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/bronze_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/corundum_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/corundum_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/corundum_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/corundum_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/deepslate_ruby_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/deepslate_ruby_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/deepslate_ruby_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/deepslate_ruby_ore.json index 947ab5d..966beb6 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/deepslate_ruby_ore.json +++ b/src/main/resources/data/mc-extended/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/src/main/resources/data/mc-extended/loot_table/block/deepslate_sapphire_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/deepslate_sapphire_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/deepslate_sapphire_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/deepslate_sapphire_ore.json index d855d00..0fe2b61 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/deepslate_sapphire_ore.json +++ b/src/main/resources/data/mc-extended/loot_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/src/main/resources/data/mc-extended/loot_table/block/deepslate_silver_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/deepslate_silver_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/deepslate_silver_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/deepslate_silver_ore.json index 2c87267..31bd2cf 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/deepslate_silver_ore.json +++ b/src/main/resources/data/mc-extended/loot_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/src/main/resources/data/mc-extended/loot_table/block/deepslate_tin_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/deepslate_tin_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/deepslate_tin_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/deepslate_tin_ore.json index 37514f4..6b53df5 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/deepslate_tin_ore.json +++ b/src/main/resources/data/mc-extended/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/src/main/resources/data/mc-extended/loot_table/block/gem_table.json b/src/main/resources/data/mc-extended/loot_table/blocks/gem_table.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/gem_table.json rename to src/main/resources/data/mc-extended/loot_table/blocks/gem_table.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/onion_crop.json b/src/main/resources/data/mc-extended/loot_table/blocks/onion_crop.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/onion_crop.json rename to src/main/resources/data/mc-extended/loot_table/blocks/onion_crop.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/raw_bronze_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/raw_bronze_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/raw_bronze_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/raw_bronze_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/raw_silver_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/raw_silver_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/raw_silver_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/raw_silver_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/raw_tin_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/raw_tin_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/raw_tin_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/raw_tin_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/ruby_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/ruby_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/ruby_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/ruby_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/ruby_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/ruby_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/ruby_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/ruby_ore.json index 4998972..2778a78 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/ruby_ore.json +++ b/src/main/resources/data/mc-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/src/main/resources/data/mc-extended/loot_table/block/sapphire_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/sapphire_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/sapphire_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/sapphire_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/sapphire_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/sapphire_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/sapphire_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/sapphire_ore.json index b017bc4..ef0ccb1 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/sapphire_ore.json +++ b/src/main/resources/data/mc-extended/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/src/main/resources/data/mc-extended/loot_table/block/silver_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/silver_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/silver_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/silver_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/silver_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/silver_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/silver_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/silver_ore.json index 2c87267..31bd2cf 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/silver_ore.json +++ b/src/main/resources/data/mc-extended/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/src/main/resources/data/mc-extended/loot_table/block/spinach_crop.json b/src/main/resources/data/mc-extended/loot_table/blocks/spinach_crop.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/spinach_crop.json rename to src/main/resources/data/mc-extended/loot_table/blocks/spinach_crop.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/tin_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/tin_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/tin_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/tin_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/tin_ore.json b/src/main/resources/data/mc-extended/loot_table/blocks/tin_ore.json similarity index 75% rename from src/main/resources/data/mc-extended/loot_table/block/tin_ore.json rename to src/main/resources/data/mc-extended/loot_table/blocks/tin_ore.json index 37514f4..6b53df5 100644 --- a/src/main/resources/data/mc-extended/loot_table/block/tin_ore.json +++ b/src/main/resources/data/mc-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/src/main/resources/data/mc-extended/loot_table/block/tomato_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/tomato_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/tomato_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/tomato_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/tomato_crop.json b/src/main/resources/data/mc-extended/loot_table/blocks/tomato_crop.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/tomato_crop.json rename to src/main/resources/data/mc-extended/loot_table/blocks/tomato_crop.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/white_mushroom.json b/src/main/resources/data/mc-extended/loot_table/blocks/white_mushroom.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/white_mushroom.json rename to src/main/resources/data/mc-extended/loot_table/blocks/white_mushroom.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/white_mushroom_block.json b/src/main/resources/data/mc-extended/loot_table/blocks/white_mushroom_block.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/white_mushroom_block.json rename to src/main/resources/data/mc-extended/loot_table/blocks/white_mushroom_block.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/wild_onion.json b/src/main/resources/data/mc-extended/loot_table/blocks/wild_onion.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/wild_onion.json rename to src/main/resources/data/mc-extended/loot_table/blocks/wild_onion.json diff --git a/src/main/resources/data/mc-extended/loot_table/block/wild_spinach.json b/src/main/resources/data/mc-extended/loot_table/blocks/wild_spinach.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/block/wild_spinach.json rename to src/main/resources/data/mc-extended/loot_table/blocks/wild_spinach.json diff --git a/src/main/resources/data/mc-extended/loot_table/chest/beach_house.json b/src/main/resources/data/mc-extended/loot_table/chests/beach_house.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/chest/beach_house.json rename to src/main/resources/data/mc-extended/loot_table/chests/beach_house.json diff --git a/src/main/resources/data/mc-extended/loot_table/entity/ender_cube.json b/src/main/resources/data/mc-extended/loot_table/entities/ender_cube.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/entity/ender_cube.json rename to src/main/resources/data/mc-extended/loot_table/entities/ender_cube.json diff --git a/src/main/resources/data/mc-extended/loot_table/entity/lost.json b/src/main/resources/data/mc-extended/loot_table/entities/lost.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/entity/lost.json rename to src/main/resources/data/mc-extended/loot_table/entities/lost.json diff --git a/src/main/resources/data/mc-extended/loot_table/entity/silver_golem.json b/src/main/resources/data/mc-extended/loot_table/entities/silver_golem.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/entity/silver_golem.json rename to src/main/resources/data/mc-extended/loot_table/entities/silver_golem.json diff --git a/src/main/resources/data/mc-extended/loot_table/entity/trout_fish.json b/src/main/resources/data/mc-extended/loot_table/entities/trout_fish.json similarity index 100% rename from src/main/resources/data/mc-extended/loot_table/entity/trout_fish.json rename to src/main/resources/data/mc-extended/loot_table/entities/trout_fish.json diff --git a/src/main/resources/data/mc-extended/tag/block/ruby_ores.json b/src/main/resources/data/mc-extended/tags/block/ruby_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/block/ruby_ores.json rename to src/main/resources/data/mc-extended/tags/block/ruby_ores.json diff --git a/src/main/resources/data/mc-extended/tag/block/sapphire_ores.json b/src/main/resources/data/mc-extended/tags/block/sapphire_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/block/sapphire_ores.json rename to src/main/resources/data/mc-extended/tags/block/sapphire_ores.json diff --git a/src/main/resources/data/mc-extended/tag/block/silver_ores.json b/src/main/resources/data/mc-extended/tags/block/silver_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/block/silver_ores.json rename to src/main/resources/data/mc-extended/tags/block/silver_ores.json diff --git a/src/main/resources/data/mc-extended/tag/block/tin_ores.json b/src/main/resources/data/mc-extended/tags/block/tin_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/block/tin_ores.json rename to src/main/resources/data/mc-extended/tags/block/tin_ores.json diff --git a/src/main/resources/data/mc-extended/tag/item/acidic.json b/src/main/resources/data/mc-extended/tags/item/acidic.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/acidic.json rename to src/main/resources/data/mc-extended/tags/item/acidic.json diff --git a/src/main/resources/data/mc-extended/tag/item/corundum.json b/src/main/resources/data/mc-extended/tags/item/corundum.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/corundum.json rename to src/main/resources/data/mc-extended/tags/item/corundum.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_axe.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_axe.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_axe.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_axe.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_boots.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_boots.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_boots.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_boots.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_chestplate.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_chestplate.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_chestplate.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_chestplate.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_helmet.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_helmet.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_helmet.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_helmet.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_hoe.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_hoe.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_hoe.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_hoe.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_leggings.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_leggings.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_leggings.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_leggings.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_pickaxe.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_pickaxe.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_pickaxe.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_pickaxe.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_shovel.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_shovel.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_shovel.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_shovel.json diff --git a/src/main/resources/data/mc-extended/tag/item/hard_gem_sword.json b/src/main/resources/data/mc-extended/tags/item/hard_gem_sword.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/hard_gem_sword.json rename to src/main/resources/data/mc-extended/tags/item/hard_gem_sword.json diff --git a/src/main/resources/data/mc-extended/tag/item/iron_like_ingots.json b/src/main/resources/data/mc-extended/tags/item/iron_like_ingots.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/iron_like_ingots.json rename to src/main/resources/data/mc-extended/tags/item/iron_like_ingots.json diff --git a/src/main/resources/data/mc-extended/tag/item/ruby_ores.json b/src/main/resources/data/mc-extended/tags/item/ruby_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/ruby_ores.json rename to src/main/resources/data/mc-extended/tags/item/ruby_ores.json diff --git a/src/main/resources/data/mc-extended/tag/item/sapphire_ores.json b/src/main/resources/data/mc-extended/tags/item/sapphire_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/sapphire_ores.json rename to src/main/resources/data/mc-extended/tags/item/sapphire_ores.json diff --git a/src/main/resources/data/mc-extended/tag/item/silver_ores.json b/src/main/resources/data/mc-extended/tags/item/silver_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/silver_ores.json rename to src/main/resources/data/mc-extended/tags/item/silver_ores.json diff --git a/src/main/resources/data/mc-extended/tag/item/tin_ores.json b/src/main/resources/data/mc-extended/tags/item/tin_ores.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/item/tin_ores.json rename to src/main/resources/data/mc-extended/tags/item/tin_ores.json diff --git a/src/main/resources/data/mc-extended/tag/worldgen/biome/has_structure/village_jungle.json b/src/main/resources/data/mc-extended/tags/worldgen/biome/has_structure/village_jungle.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/worldgen/biome/has_structure/village_jungle.json rename to src/main/resources/data/mc-extended/tags/worldgen/biome/has_structure/village_jungle.json diff --git a/src/main/resources/data/mc-extended/tag/worldgen/biome/losts_spawn_in.json b/src/main/resources/data/mc-extended/tags/worldgen/biome/losts_spawn_in.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/worldgen/biome/losts_spawn_in.json rename to src/main/resources/data/mc-extended/tags/worldgen/biome/losts_spawn_in.json diff --git a/src/main/resources/data/mc-extended/tag/worldgen/biome/ruby_spawns_in.json b/src/main/resources/data/mc-extended/tags/worldgen/biome/ruby_spawns_in.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/worldgen/biome/ruby_spawns_in.json rename to src/main/resources/data/mc-extended/tags/worldgen/biome/ruby_spawns_in.json diff --git a/src/main/resources/data/mc-extended/tag/worldgen/biome/sapphire_spawns_in.json b/src/main/resources/data/mc-extended/tags/worldgen/biome/sapphire_spawns_in.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/worldgen/biome/sapphire_spawns_in.json rename to src/main/resources/data/mc-extended/tags/worldgen/biome/sapphire_spawns_in.json diff --git a/src/main/resources/data/mc-extended/tag/worldgen/biome/white_mushrooms_spawn_in.json b/src/main/resources/data/mc-extended/tags/worldgen/biome/white_mushrooms_spawn_in.json similarity index 100% rename from src/main/resources/data/mc-extended/tag/worldgen/biome/white_mushrooms_spawn_in.json rename to src/main/resources/data/mc-extended/tags/worldgen/biome/white_mushrooms_spawn_in.json diff --git a/src/main/resources/data/minecraft/tag/block/beacon_base_blocks.json b/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/beacon_base_blocks.json rename to src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json diff --git a/src/main/resources/data/minecraft/tag/block/hoglin_repellents.json b/src/main/resources/data/minecraft/tags/block/hoglin_repellents.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/hoglin_repellents.json rename to src/main/resources/data/minecraft/tags/block/hoglin_repellents.json diff --git a/src/main/resources/data/minecraft/tag/block/mineable/axe.json b/src/main/resources/data/minecraft/tags/block/mineable/axe.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/mineable/axe.json rename to src/main/resources/data/minecraft/tags/block/mineable/axe.json diff --git a/src/main/resources/data/minecraft/tag/block/mineable/hoe.json b/src/main/resources/data/minecraft/tags/block/mineable/hoe.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/mineable/hoe.json rename to src/main/resources/data/minecraft/tags/block/mineable/hoe.json diff --git a/src/main/resources/data/minecraft/tag/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/mineable/pickaxe.json rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/src/main/resources/data/minecraft/tag/block/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/needs_diamond_tool.json rename to src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json diff --git a/src/main/resources/data/minecraft/tag/block/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/needs_iron_tool.json rename to src/main/resources/data/minecraft/tags/block/needs_iron_tool.json diff --git a/src/main/resources/data/minecraft/tag/block/piglin_repellents.json b/src/main/resources/data/minecraft/tags/block/piglin_repellents.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/piglin_repellents.json rename to src/main/resources/data/minecraft/tags/block/piglin_repellents.json diff --git a/src/main/resources/data/minecraft/tag/block/small_flowers.json b/src/main/resources/data/minecraft/tags/block/small_flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/small_flowers.json rename to src/main/resources/data/minecraft/tags/block/small_flowers.json diff --git a/src/main/resources/data/minecraft/tag/block/soul_fire_base_blocks.json b/src/main/resources/data/minecraft/tags/block/soul_fire_base_blocks.json similarity index 100% rename from src/main/resources/data/minecraft/tag/block/soul_fire_base_blocks.json rename to src/main/resources/data/minecraft/tags/block/soul_fire_base_blocks.json diff --git a/src/main/resources/data/minecraft/tag/entity_type/fall_damage_immune.json b/src/main/resources/data/minecraft/tags/entity_type/fall_damage_immune.json similarity index 100% rename from src/main/resources/data/minecraft/tag/entity_type/fall_damage_immune.json rename to src/main/resources/data/minecraft/tags/entity_type/fall_damage_immune.json diff --git a/src/main/resources/data/minecraft/tag/entity_type/frog_food.json b/src/main/resources/data/minecraft/tags/entity_type/frog_food.json similarity index 100% rename from src/main/resources/data/minecraft/tag/entity_type/frog_food.json rename to src/main/resources/data/minecraft/tags/entity_type/frog_food.json diff --git a/src/main/resources/data/minecraft/tag/entity_type/skeletons.json b/src/main/resources/data/minecraft/tags/entity_type/skeletons.json similarity index 100% rename from src/main/resources/data/minecraft/tag/entity_type/skeletons.json rename to src/main/resources/data/minecraft/tags/entity_type/skeletons.json diff --git a/src/main/resources/data/minecraft/tag/item/axes.json b/src/main/resources/data/minecraft/tags/item/axes.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/axes.json rename to src/main/resources/data/minecraft/tags/item/axes.json diff --git a/src/main/resources/data/minecraft/tag/item/beacon_payment_items.json b/src/main/resources/data/minecraft/tags/item/beacon_payment_items.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/beacon_payment_items.json rename to src/main/resources/data/minecraft/tags/item/beacon_payment_items.json diff --git a/src/main/resources/data/minecraft/tag/item/bookshelf_books.json b/src/main/resources/data/minecraft/tags/item/bookshelf_books.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/bookshelf_books.json rename to src/main/resources/data/minecraft/tags/item/bookshelf_books.json diff --git a/src/main/resources/data/minecraft/tag/item/cluster_max_harvestables.json b/src/main/resources/data/minecraft/tags/item/cluster_max_harvestables.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/cluster_max_harvestables.json rename to src/main/resources/data/minecraft/tags/item/cluster_max_harvestables.json diff --git a/src/main/resources/data/minecraft/tag/item/hoes.json b/src/main/resources/data/minecraft/tags/item/hoes.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/hoes.json rename to src/main/resources/data/minecraft/tags/item/hoes.json diff --git a/src/main/resources/data/minecraft/tag/item/mushroom.json b/src/main/resources/data/minecraft/tags/item/mushroom.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/mushroom.json rename to src/main/resources/data/minecraft/tags/item/mushroom.json diff --git a/src/main/resources/data/minecraft/tag/item/pickaxes.json b/src/main/resources/data/minecraft/tags/item/pickaxes.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/pickaxes.json rename to src/main/resources/data/minecraft/tags/item/pickaxes.json diff --git a/src/main/resources/data/minecraft/tag/item/shovels.json b/src/main/resources/data/minecraft/tags/item/shovels.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/shovels.json rename to src/main/resources/data/minecraft/tags/item/shovels.json diff --git a/src/main/resources/data/minecraft/tag/item/swords.json b/src/main/resources/data/minecraft/tags/item/swords.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/swords.json rename to src/main/resources/data/minecraft/tags/item/swords.json diff --git a/src/main/resources/data/minecraft/tag/item/trimmable_armor.json b/src/main/resources/data/minecraft/tags/item/trimmable_armor.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/trimmable_armor.json rename to src/main/resources/data/minecraft/tags/item/trimmable_armor.json diff --git a/src/main/resources/data/minecraft/tag/item/villager_plantable_seeds.json b/src/main/resources/data/minecraft/tags/item/villager_plantable_seeds.json similarity index 100% rename from src/main/resources/data/minecraft/tag/item/villager_plantable_seeds.json rename to src/main/resources/data/minecraft/tags/item/villager_plantable_seeds.json diff --git a/src/main/resources/data/minecraft/tag/point_of_interest_type/acquirable_job_site.json b/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json similarity index 100% rename from src/main/resources/data/minecraft/tag/point_of_interest_type/acquirable_job_site.json rename to src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json