Move floating flower tags to datagen

This commit is contained in:
Vincent Lee committed 2019-12-05 21:12:28 -06:00
1 parent 3804675961
commit 939195fc67
8 files changed
+184 -162

No files matched your search

@@ -6,11 +6,16 @@ import net.minecraft.block.StairsBlock;
import net.minecraft.block.WallBlock;
import net.minecraft.data.BlockTagsProvider;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.DyeColor;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import vazkii.botania.common.block.BlockFloatingSpecialFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.ModTags;
import javax.annotation.Nonnull;
import java.util.Arrays;
import java.util.Comparator;
import java.util.function.Predicate;
@@ -39,6 +44,22 @@ public class BlockTagProvider extends BlockTagsProvider {
.filter(b -> b instanceof WallBlock)
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new));
getBuilder(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS).add(
Arrays.stream(DyeColor.values())
.map(ModBlocks::getFloatingFlower)
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new)
);
getBuilder(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS).add(registry.stream().filter(botania)
.filter(b -> b instanceof BlockFloatingSpecialFlower)
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new)
);
getBuilder(ModTags.Blocks.FLOATING_FLOWERS).add(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS, ModTags.Blocks.SPECIAL_FLOATING_FLOWERS);
}
@Nonnull
@@ -4,6 +4,7 @@ import net.minecraft.data.DataGenerator;
import net.minecraft.data.ItemTagsProvider;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import vazkii.botania.common.lib.ModTags;
import javax.annotation.Nonnull;
@@ -18,6 +19,10 @@ public class ItemTagProvider extends ItemTagsProvider {
this.copy(BlockTags.SLABS, ItemTags.SLABS);
this.copy(BlockTags.STAIRS, ItemTags.STAIRS);
this.copy(BlockTags.WALLS, ItemTags.WALLS);
this.copy(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS, ModTags.Items.MUNDANE_FLOATING_FLOWERS);
this.copy(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS, ModTags.Items.SPECIAL_FLOATING_FLOWERS);
this.copy(ModTags.Blocks.FLOATING_FLOWERS, ModTags.Items.FLOATING_FLOWERS);
}
@Nonnull