Move mystical flower and double flower tags to datagen. Also remove some unnecessarily specific tags.

This commit is contained in:
Vincent Lee committed 2019-12-05 21:35:06 -06:00
1 parent 939195fc67
commit 9593c82e0e
91 files changed
+115 -349

No files matched your search

@@ -57,44 +57,7 @@ public class ModTags {
public static final Tag<Item> DISPOSABLE = tag("disposable");
public static final Tag<Item> SEMI_DISPOSABLE = tag("semi_disposable");
public static final Tag<Item> FLOWERS = tag("flowers");
public static final Tag<Item> FLOWERS_BLACK = tag("flowers/black");
public static final Tag<Item> FLOWERS_BLUE = tag("flowers/blue");
public static final Tag<Item> FLOWERS_BROWN = tag("flowers/brown");
public static final Tag<Item> FLOWERS_CYAN = tag("flowers/cyan");
public static final Tag<Item> FLOWERS_GRAY = tag("flowers/gray");
public static final Tag<Item> FLOWERS_GREEN = tag("flowers/green");
public static final Tag<Item> FLOWERS_LIGHT_BLUE = tag("flowers/light_blue");
public static final Tag<Item> FLOWERS_LIGHT_GRAY = tag("flowers/light_gray");
public static final Tag<Item> FLOWERS_LIME = tag("flowers/lime");
public static final Tag<Item> FLOWERS_MAGENTA = tag("flowers/magenta");
public static final Tag<Item> FLOWERS_ORANGE = tag("flowers/orange");
public static final Tag<Item> FLOWERS_PINK = tag("flowers/pink");
public static final Tag<Item> FLOWERS_PURPLE = tag("flowers/purple");
public static final Tag<Item> FLOWERS_RED = tag("flowers/red");
public static final Tag<Item> FLOWERS_WHITE = tag("flowers/white");
public static final Tag<Item> FLOWERS_YELLOW = tag("flowers/yellow");
public static final Tag<Item> DOUBLE_FLOWERS_BLACK = tag("double_flowers/black");
public static final Tag<Item> DOUBLE_FLOWERS_BLUE = tag("double_flowers/blue");
public static final Tag<Item> DOUBLE_FLOWERS_BROWN = tag("double_flowers/brown");
public static final Tag<Item> DOUBLE_FLOWERS_CYAN = tag("double_flowers/cyan");
public static final Tag<Item> DOUBLE_FLOWERS_GRAY = tag("double_flowers/gray");
public static final Tag<Item> DOUBLE_FLOWERS_GREEN = tag("double_flowers/green");
public static final Tag<Item> DOUBLE_FLOWERS_LIGHT_BLUE = tag("double_flowers/light_blue");
public static final Tag<Item> DOUBLE_FLOWERS_LIGHT_GRAY = tag("double_flowers/light_gray");
public static final Tag<Item> DOUBLE_FLOWERS_LIME = tag("double_flowers/lime");
public static final Tag<Item> DOUBLE_FLOWERS_MAGENTA = tag("double_flowers/magenta");
public static final Tag<Item> DOUBLE_FLOWERS_ORANGE = tag("double_flowers/orange");
public static final Tag<Item> DOUBLE_FLOWERS_PINK = tag("double_flowers/pink");
public static final Tag<Item> DOUBLE_FLOWERS_PURPLE = tag("double_flowers/purple");
public static final Tag<Item> DOUBLE_FLOWERS_RED = tag("double_flowers/red");
public static final Tag<Item> DOUBLE_FLOWERS_WHITE = tag("double_flowers/white");
public static final Tag<Item> DOUBLE_FLOWERS_YELLOW = tag("double_flowers/yellow");
public static final Tag<Item> PETALS = tag("petals");
public static final Tag<Item> PETALS_BLACK = tag("petals/black");
public static final Tag<Item> PETALS_BLUE = tag("petals/blue");
public static final Tag<Item> PETALS_BROWN = tag("petals/brown");
@@ -60,6 +60,20 @@ public class BlockTagProvider extends BlockTagsProvider {
);
getBuilder(ModTags.Blocks.FLOATING_FLOWERS).add(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS, ModTags.Blocks.SPECIAL_FLOATING_FLOWERS);
getBuilder(ModTags.Blocks.MYSTICAL_FLOWERS).add(
Arrays.stream(DyeColor.values())
.map(ModBlocks::getFlower)
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new)
);
getBuilder(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS).add(
Arrays.stream(DyeColor.values())
.map(ModBlocks::getDoubleFlower)
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new)
);
}
@Nonnull
@@ -23,6 +23,8 @@ public class ItemTagProvider extends ItemTagsProvider {
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);
this.copy(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS, ModTags.Items.DOUBLE_MYSTICAL_FLOWERS);
this.copy(ModTags.Blocks.MYSTICAL_FLOWERS, ModTags.Items.MYSTICAL_FLOWERS);
}
@Nonnull