diff --git a/src/main/resources/data/minecraft/tags/blocks/rails.json b/src/generated/resources/data/minecraft/tags/blocks/rails.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/rails.json rename to src/generated/resources/data/minecraft/tags/blocks/rails.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 000000000..95369b300 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,50 @@ +{ + "replace": false, + "values": [ + "botania:black_pavement_slab", + "botania:blaze_quartz_slab", + "botania:blue_pavement_slab", + "botania:dark_quartz_slab", + "botania:dreamwood_planks_slab", + "botania:dreamwood_slab", + "botania:elf_quartz_slab", + "botania:green_pavement_slab", + "botania:lavender_quartz_slab", + "botania:livingrock_bricks_slab", + "botania:livingrock_slab", + "botania:livingwood_planks_slab", + "botania:livingwood_slab", + "botania:mana_quartz_slab", + "botania:metamorphic_desert_bricks_slab", + "botania:metamorphic_desert_cobblestone_slab", + "botania:metamorphic_desert_stone_slab", + "botania:metamorphic_forest_bricks_slab", + "botania:metamorphic_forest_cobblestone_slab", + "botania:metamorphic_forest_stone_slab", + "botania:metamorphic_fungal_bricks_slab", + "botania:metamorphic_fungal_cobblestone_slab", + "botania:metamorphic_fungal_stone_slab", + "botania:metamorphic_mesa_bricks_slab", + "botania:metamorphic_mesa_cobblestone_slab", + "botania:metamorphic_mesa_stone_slab", + "botania:metamorphic_mountain_bricks_slab", + "botania:metamorphic_mountain_cobblestone_slab", + "botania:metamorphic_mountain_stone_slab", + "botania:metamorphic_plains_bricks_slab", + "botania:metamorphic_plains_cobblestone_slab", + "botania:metamorphic_plains_stone_slab", + "botania:metamorphic_swamp_bricks_slab", + "botania:metamorphic_swamp_cobblestone_slab", + "botania:metamorphic_swamp_stone_slab", + "botania:metamorphic_taiga_bricks_slab", + "botania:metamorphic_taiga_cobblestone_slab", + "botania:metamorphic_taiga_stone_slab", + "botania:red_pavement_slab", + "botania:red_quartz_slab", + "botania:shimmerrock_slab", + "botania:shimmerwood_planks_slab", + "botania:sunny_quartz_slab", + "botania:white_pavement_slab", + "botania:yellow_pavement_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json new file mode 100644 index 000000000..da4fdd9f5 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -0,0 +1,50 @@ +{ + "replace": false, + "values": [ + "botania:black_pavement_stairs", + "botania:blaze_quartz_stairs", + "botania:blue_pavement_stairs", + "botania:dark_quartz_stairs", + "botania:dreamwood_planks_stairs", + "botania:dreamwood_stairs", + "botania:elf_quartz_stairs", + "botania:green_pavement_stairs", + "botania:lavender_quartz_stairs", + "botania:livingrock_bricks_stairs", + "botania:livingrock_stairs", + "botania:livingwood_planks_stairs", + "botania:livingwood_stairs", + "botania:mana_quartz_stairs", + "botania:metamorphic_desert_bricks_stairs", + "botania:metamorphic_desert_cobblestone_stairs", + "botania:metamorphic_desert_stone_stairs", + "botania:metamorphic_forest_bricks_stairs", + "botania:metamorphic_forest_cobblestone_stairs", + "botania:metamorphic_forest_stone_stairs", + "botania:metamorphic_fungal_bricks_stairs", + "botania:metamorphic_fungal_cobblestone_stairs", + "botania:metamorphic_fungal_stone_stairs", + "botania:metamorphic_mesa_bricks_stairs", + "botania:metamorphic_mesa_cobblestone_stairs", + "botania:metamorphic_mesa_stone_stairs", + "botania:metamorphic_mountain_bricks_stairs", + "botania:metamorphic_mountain_cobblestone_stairs", + "botania:metamorphic_mountain_stone_stairs", + "botania:metamorphic_plains_bricks_stairs", + "botania:metamorphic_plains_cobblestone_stairs", + "botania:metamorphic_plains_stone_stairs", + "botania:metamorphic_swamp_bricks_stairs", + "botania:metamorphic_swamp_cobblestone_stairs", + "botania:metamorphic_swamp_stone_stairs", + "botania:metamorphic_taiga_bricks_stairs", + "botania:metamorphic_taiga_cobblestone_stairs", + "botania:metamorphic_taiga_stone_stairs", + "botania:red_pavement_stairs", + "botania:red_quartz_stairs", + "botania:shimmerrock_stairs", + "botania:shimmerwood_planks_stairs", + "botania:sunny_quartz_stairs", + "botania:white_pavement_stairs", + "botania:yellow_pavement_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 000000000..3b9bf1514 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "botania:dreamwood_wall", + "botania:livingrock_wall", + "botania:livingwood_wall", + "botania:metamorphic_desert_cobblestone_wall", + "botania:metamorphic_forest_cobblestone_wall", + "botania:metamorphic_fungal_cobblestone_wall", + "botania:metamorphic_mesa_cobblestone_wall", + "botania:metamorphic_mountain_cobblestone_wall", + "botania:metamorphic_plains_cobblestone_wall", + "botania:metamorphic_swamp_cobblestone_wall", + "botania:metamorphic_taiga_cobblestone_wall" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/rails.json b/src/generated/resources/data/minecraft/tags/items/rails.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/rails.json rename to src/generated/resources/data/minecraft/tags/items/rails.json diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 000000000..95369b300 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,50 @@ +{ + "replace": false, + "values": [ + "botania:black_pavement_slab", + "botania:blaze_quartz_slab", + "botania:blue_pavement_slab", + "botania:dark_quartz_slab", + "botania:dreamwood_planks_slab", + "botania:dreamwood_slab", + "botania:elf_quartz_slab", + "botania:green_pavement_slab", + "botania:lavender_quartz_slab", + "botania:livingrock_bricks_slab", + "botania:livingrock_slab", + "botania:livingwood_planks_slab", + "botania:livingwood_slab", + "botania:mana_quartz_slab", + "botania:metamorphic_desert_bricks_slab", + "botania:metamorphic_desert_cobblestone_slab", + "botania:metamorphic_desert_stone_slab", + "botania:metamorphic_forest_bricks_slab", + "botania:metamorphic_forest_cobblestone_slab", + "botania:metamorphic_forest_stone_slab", + "botania:metamorphic_fungal_bricks_slab", + "botania:metamorphic_fungal_cobblestone_slab", + "botania:metamorphic_fungal_stone_slab", + "botania:metamorphic_mesa_bricks_slab", + "botania:metamorphic_mesa_cobblestone_slab", + "botania:metamorphic_mesa_stone_slab", + "botania:metamorphic_mountain_bricks_slab", + "botania:metamorphic_mountain_cobblestone_slab", + "botania:metamorphic_mountain_stone_slab", + "botania:metamorphic_plains_bricks_slab", + "botania:metamorphic_plains_cobblestone_slab", + "botania:metamorphic_plains_stone_slab", + "botania:metamorphic_swamp_bricks_slab", + "botania:metamorphic_swamp_cobblestone_slab", + "botania:metamorphic_swamp_stone_slab", + "botania:metamorphic_taiga_bricks_slab", + "botania:metamorphic_taiga_cobblestone_slab", + "botania:metamorphic_taiga_stone_slab", + "botania:red_pavement_slab", + "botania:red_quartz_slab", + "botania:shimmerrock_slab", + "botania:shimmerwood_planks_slab", + "botania:sunny_quartz_slab", + "botania:white_pavement_slab", + "botania:yellow_pavement_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 000000000..da4fdd9f5 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,50 @@ +{ + "replace": false, + "values": [ + "botania:black_pavement_stairs", + "botania:blaze_quartz_stairs", + "botania:blue_pavement_stairs", + "botania:dark_quartz_stairs", + "botania:dreamwood_planks_stairs", + "botania:dreamwood_stairs", + "botania:elf_quartz_stairs", + "botania:green_pavement_stairs", + "botania:lavender_quartz_stairs", + "botania:livingrock_bricks_stairs", + "botania:livingrock_stairs", + "botania:livingwood_planks_stairs", + "botania:livingwood_stairs", + "botania:mana_quartz_stairs", + "botania:metamorphic_desert_bricks_stairs", + "botania:metamorphic_desert_cobblestone_stairs", + "botania:metamorphic_desert_stone_stairs", + "botania:metamorphic_forest_bricks_stairs", + "botania:metamorphic_forest_cobblestone_stairs", + "botania:metamorphic_forest_stone_stairs", + "botania:metamorphic_fungal_bricks_stairs", + "botania:metamorphic_fungal_cobblestone_stairs", + "botania:metamorphic_fungal_stone_stairs", + "botania:metamorphic_mesa_bricks_stairs", + "botania:metamorphic_mesa_cobblestone_stairs", + "botania:metamorphic_mesa_stone_stairs", + "botania:metamorphic_mountain_bricks_stairs", + "botania:metamorphic_mountain_cobblestone_stairs", + "botania:metamorphic_mountain_stone_stairs", + "botania:metamorphic_plains_bricks_stairs", + "botania:metamorphic_plains_cobblestone_stairs", + "botania:metamorphic_plains_stone_stairs", + "botania:metamorphic_swamp_bricks_stairs", + "botania:metamorphic_swamp_cobblestone_stairs", + "botania:metamorphic_swamp_stone_stairs", + "botania:metamorphic_taiga_bricks_stairs", + "botania:metamorphic_taiga_cobblestone_stairs", + "botania:metamorphic_taiga_stone_stairs", + "botania:red_pavement_stairs", + "botania:red_quartz_stairs", + "botania:shimmerrock_stairs", + "botania:shimmerwood_planks_stairs", + "botania:sunny_quartz_stairs", + "botania:white_pavement_stairs", + "botania:yellow_pavement_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json new file mode 100644 index 000000000..3b9bf1514 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/walls.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "botania:dreamwood_wall", + "botania:livingrock_wall", + "botania:livingwood_wall", + "botania:metamorphic_desert_cobblestone_wall", + "botania:metamorphic_forest_cobblestone_wall", + "botania:metamorphic_fungal_cobblestone_wall", + "botania:metamorphic_mesa_cobblestone_wall", + "botania:metamorphic_mountain_cobblestone_wall", + "botania:metamorphic_plains_cobblestone_wall", + "botania:metamorphic_swamp_cobblestone_wall", + "botania:metamorphic_taiga_cobblestone_wall" + ] +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/data/BlockTagProvider.java b/src/main/java/vazkii/botania/common/data/BlockTagProvider.java new file mode 100644 index 000000000..505dc4029 --- /dev/null +++ b/src/main/java/vazkii/botania/common/data/BlockTagProvider.java @@ -0,0 +1,49 @@ +package vazkii.botania.common.data; + +import net.minecraft.block.Block; +import net.minecraft.block.SlabBlock; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.WallBlock; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.Comparator; +import java.util.function.Predicate; + +public class BlockTagProvider extends BlockTagsProvider { + public BlockTagProvider(DataGenerator generator) { + super(generator); + } + + @Override + protected void registerTags() { + Predicate botania = b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()); + + getBuilder(BlockTags.RAILS).add(ModBlocks.ghostRail); + + getBuilder(BlockTags.SLABS).add(registry.stream().filter(botania) + .filter(b -> b instanceof SlabBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + + getBuilder(BlockTags.STAIRS).add(registry.stream().filter(botania) + .filter(b -> b instanceof StairsBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + + getBuilder(BlockTags.WALLS).add(registry.stream().filter(botania) + .filter(b -> b instanceof WallBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + } + + @Nonnull + @Override + public String getName() { + return "Botania block tags"; + } +} diff --git a/src/main/java/vazkii/botania/common/data/DataGenerators.java b/src/main/java/vazkii/botania/common/data/DataGenerators.java index 42b30895c..e47706ad9 100644 --- a/src/main/java/vazkii/botania/common/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/common/data/DataGenerators.java @@ -10,5 +10,7 @@ public class DataGenerators { @SubscribeEvent public static void gatherData(GatherDataEvent evt) { evt.getGenerator().addProvider(new BlockLootProvider(evt.getGenerator())); + evt.getGenerator().addProvider(new BlockTagProvider(evt.getGenerator())); + evt.getGenerator().addProvider(new ItemTagProvider(evt.getGenerator())); } } diff --git a/src/main/java/vazkii/botania/common/data/ItemTagProvider.java b/src/main/java/vazkii/botania/common/data/ItemTagProvider.java new file mode 100644 index 000000000..f1cf98b3a --- /dev/null +++ b/src/main/java/vazkii/botania/common/data/ItemTagProvider.java @@ -0,0 +1,28 @@ +package vazkii.botania.common.data; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; + +import javax.annotation.Nonnull; + +public class ItemTagProvider extends ItemTagsProvider { + public ItemTagProvider(DataGenerator generatorIn) { + super(generatorIn); + } + + @Override + protected void registerTags() { + this.copy(BlockTags.RAILS, ItemTags.RAILS); + this.copy(BlockTags.SLABS, ItemTags.SLABS); + this.copy(BlockTags.STAIRS, ItemTags.STAIRS); + this.copy(BlockTags.WALLS, ItemTags.WALLS); + } + + @Nonnull + @Override + public String getName() { + return "Botania item tags"; + } +}