From 939195fc67eb9fd8f70bb2bbf6b44b987c0c8792 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 5 Dec 2019 21:12:28 -0600 Subject: [PATCH] Move floating flower tags to datagen --- .../botania/tags/blocks/floating_flowers.json | 12 +- .../blocks}/mundane_floating_flowers.json | 41 ++++--- .../blocks}/special_floating_flowers.json | 107 +++++++++--------- .../botania/tags/items/floating_flowers.json | 12 +- .../tags/items}/mundane_floating_flowers.json | 41 ++++--- .../tags/items}/special_floating_flowers.json | 107 +++++++++--------- .../vazkii/botania/data/BlockTagProvider.java | 21 ++++ .../vazkii/botania/data/ItemTagProvider.java | 5 + 8 files changed, 184 insertions(+), 162 deletions(-) rename src/{main => generated}/resources/data/botania/tags/blocks/floating_flowers.json (95%) rename src/{main/resources/data/botania/tags/items => generated/resources/data/botania/tags/blocks}/mundane_floating_flowers.json (75%) rename src/{main/resources/data/botania/tags/items => generated/resources/data/botania/tags/blocks}/special_floating_flowers.json (89%) rename src/{main => generated}/resources/data/botania/tags/items/floating_flowers.json (95%) rename src/{main/resources/data/botania/tags/blocks => generated/resources/data/botania/tags/items}/mundane_floating_flowers.json (75%) rename src/{main/resources/data/botania/tags/blocks => generated/resources/data/botania/tags/items}/special_floating_flowers.json (89%) diff --git a/src/main/resources/data/botania/tags/blocks/floating_flowers.json b/src/generated/resources/data/botania/tags/blocks/floating_flowers.json similarity index 95% rename from src/main/resources/data/botania/tags/blocks/floating_flowers.json rename to src/generated/resources/data/botania/tags/blocks/floating_flowers.json index 3a3a08c3e..26da2e514 100644 --- a/src/main/resources/data/botania/tags/blocks/floating_flowers.json +++ b/src/generated/resources/data/botania/tags/blocks/floating_flowers.json @@ -1,7 +1,7 @@ -{ - "replace": false, - "values": [ - "#botania:mundane_floating_flowers", - "#botania:special_floating_flowers" - ] +{ + "replace": false, + "values": [ + "#botania:mundane_floating_flowers", + "#botania:special_floating_flowers" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/mundane_floating_flowers.json b/src/generated/resources/data/botania/tags/blocks/mundane_floating_flowers.json similarity index 75% rename from src/main/resources/data/botania/tags/items/mundane_floating_flowers.json rename to src/generated/resources/data/botania/tags/blocks/mundane_floating_flowers.json index 1786a38a6..ff91ac732 100644 --- a/src/main/resources/data/botania/tags/items/mundane_floating_flowers.json +++ b/src/generated/resources/data/botania/tags/blocks/mundane_floating_flowers.json @@ -1,22 +1,21 @@ -{ - "__comment": "Values in this tag count as regular (non-magical) floating flowers", - "replace": false, - "values": [ - "botania:white_floating_flower", - "botania:orange_floating_flower", - "botania:magenta_floating_flower", - "botania:light_blue_floating_flower", - "botania:yellow_floating_flower", - "botania:lime_floating_flower", - "botania:pink_floating_flower", - "botania:gray_floating_flower", - "botania:light_gray_floating_flower", - "botania:cyan_floating_flower", - "botania:purple_floating_flower", - "botania:blue_floating_flower", - "botania:brown_floating_flower", - "botania:green_floating_flower", - "botania:red_floating_flower", - "botania:black_floating_flower" - ] +{ + "replace": false, + "values": [ + "botania:black_floating_flower", + "botania:blue_floating_flower", + "botania:brown_floating_flower", + "botania:cyan_floating_flower", + "botania:gray_floating_flower", + "botania:green_floating_flower", + "botania:light_blue_floating_flower", + "botania:light_gray_floating_flower", + "botania:lime_floating_flower", + "botania:magenta_floating_flower", + "botania:orange_floating_flower", + "botania:pink_floating_flower", + "botania:purple_floating_flower", + "botania:red_floating_flower", + "botania:white_floating_flower", + "botania:yellow_floating_flower" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/special_floating_flowers.json b/src/generated/resources/data/botania/tags/blocks/special_floating_flowers.json similarity index 89% rename from src/main/resources/data/botania/tags/items/special_floating_flowers.json rename to src/generated/resources/data/botania/tags/blocks/special_floating_flowers.json index 15de48eb5..06560a19d 100644 --- a/src/main/resources/data/botania/tags/items/special_floating_flowers.json +++ b/src/generated/resources/data/botania/tags/blocks/special_floating_flowers.json @@ -1,55 +1,54 @@ -{ - "__comment": "Values in this tag count as magical floating flowers", - "replace": false, - "values": [ - "botania:floating_pure_daisy", - "botania:floating_manastar", - "botania:floating_endoflame", - "botania:floating_hydroangeas", - "botania:floating_thermalily", - "botania:floating_rosa_arcana", - "botania:floating_munchdew", - "botania:floating_entropinnyum", - "botania:floating_kekimurus", - "botania:floating_gourmaryllis", - "botania:floating_narslimmus", - "botania:floating_spectrolus", - "botania:floating_dandelifeon", - "botania:floating_rafflowsia", - "botania:floating_shulk_me_not", - "botania:floating_bellethorn", - "botania:floating_bellethorn_chibi", - "botania:floating_bergamute", - "botania:floating_dreadthorn", - "botania:floating_heisei_dream", - "botania:floating_tigerseye", - "botania:floating_jaded_amaranthus", - "botania:floating_orechid", - "botania:floating_fallen_kanade", - "botania:floating_exoflame", - "botania:floating_agricarnation", - "botania:floating_agricarnation_chibi", - "botania:floating_hopperhock", - "botania:floating_hopperhock_chibi", - "botania:floating_tangleberrie", - "botania:floating_jiyuulia", - "botania:floating_rannuncarpus", - "botania:floating_rannuncarpus_chibi", - "botania:floating_hyacidus", - "botania:floating_pollidisiac", - "botania:floating_clayconia", - "botania:floating_clayconia_chibi", - "botania:floating_loonium", - "botania:floating_daffomill", - "botania:floating_vinculotus", - "botania:floating_spectranthemum", - "botania:floating_medumone", - "botania:floating_marimorphosis", - "botania:floating_marimorphosis_chibi", - "botania:floating_bubbell", - "botania:floating_bubbell_chibi", - "botania:floating_solegnolia", - "botania:floating_solegnolia_chibi", - "botania:floating_orechid_ignem" - ] +{ + "replace": false, + "values": [ + "botania:floating_agricarnation", + "botania:floating_agricarnation_chibi", + "botania:floating_bellethorn", + "botania:floating_bellethorn_chibi", + "botania:floating_bergamute", + "botania:floating_bubbell", + "botania:floating_bubbell_chibi", + "botania:floating_clayconia", + "botania:floating_clayconia_chibi", + "botania:floating_daffomill", + "botania:floating_dandelifeon", + "botania:floating_dreadthorn", + "botania:floating_endoflame", + "botania:floating_entropinnyum", + "botania:floating_exoflame", + "botania:floating_fallen_kanade", + "botania:floating_gourmaryllis", + "botania:floating_heisei_dream", + "botania:floating_hopperhock", + "botania:floating_hopperhock_chibi", + "botania:floating_hyacidus", + "botania:floating_hydroangeas", + "botania:floating_jaded_amaranthus", + "botania:floating_jiyuulia", + "botania:floating_kekimurus", + "botania:floating_loonium", + "botania:floating_manastar", + "botania:floating_marimorphosis", + "botania:floating_marimorphosis_chibi", + "botania:floating_medumone", + "botania:floating_munchdew", + "botania:floating_narslimmus", + "botania:floating_orechid", + "botania:floating_orechid_ignem", + "botania:floating_pollidisiac", + "botania:floating_pure_daisy", + "botania:floating_rafflowsia", + "botania:floating_rannuncarpus", + "botania:floating_rannuncarpus_chibi", + "botania:floating_rosa_arcana", + "botania:floating_shulk_me_not", + "botania:floating_solegnolia", + "botania:floating_solegnolia_chibi", + "botania:floating_spectranthemum", + "botania:floating_spectrolus", + "botania:floating_tangleberrie", + "botania:floating_thermalily", + "botania:floating_tigerseye", + "botania:floating_vinculotus" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/floating_flowers.json b/src/generated/resources/data/botania/tags/items/floating_flowers.json similarity index 95% rename from src/main/resources/data/botania/tags/items/floating_flowers.json rename to src/generated/resources/data/botania/tags/items/floating_flowers.json index 3a3a08c3e..26da2e514 100644 --- a/src/main/resources/data/botania/tags/items/floating_flowers.json +++ b/src/generated/resources/data/botania/tags/items/floating_flowers.json @@ -1,7 +1,7 @@ -{ - "replace": false, - "values": [ - "#botania:mundane_floating_flowers", - "#botania:special_floating_flowers" - ] +{ + "replace": false, + "values": [ + "#botania:mundane_floating_flowers", + "#botania:special_floating_flowers" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json b/src/generated/resources/data/botania/tags/items/mundane_floating_flowers.json similarity index 75% rename from src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json rename to src/generated/resources/data/botania/tags/items/mundane_floating_flowers.json index 1786a38a6..ff91ac732 100644 --- a/src/main/resources/data/botania/tags/blocks/mundane_floating_flowers.json +++ b/src/generated/resources/data/botania/tags/items/mundane_floating_flowers.json @@ -1,22 +1,21 @@ -{ - "__comment": "Values in this tag count as regular (non-magical) floating flowers", - "replace": false, - "values": [ - "botania:white_floating_flower", - "botania:orange_floating_flower", - "botania:magenta_floating_flower", - "botania:light_blue_floating_flower", - "botania:yellow_floating_flower", - "botania:lime_floating_flower", - "botania:pink_floating_flower", - "botania:gray_floating_flower", - "botania:light_gray_floating_flower", - "botania:cyan_floating_flower", - "botania:purple_floating_flower", - "botania:blue_floating_flower", - "botania:brown_floating_flower", - "botania:green_floating_flower", - "botania:red_floating_flower", - "botania:black_floating_flower" - ] +{ + "replace": false, + "values": [ + "botania:black_floating_flower", + "botania:blue_floating_flower", + "botania:brown_floating_flower", + "botania:cyan_floating_flower", + "botania:gray_floating_flower", + "botania:green_floating_flower", + "botania:light_blue_floating_flower", + "botania:light_gray_floating_flower", + "botania:lime_floating_flower", + "botania:magenta_floating_flower", + "botania:orange_floating_flower", + "botania:pink_floating_flower", + "botania:purple_floating_flower", + "botania:red_floating_flower", + "botania:white_floating_flower", + "botania:yellow_floating_flower" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/special_floating_flowers.json b/src/generated/resources/data/botania/tags/items/special_floating_flowers.json similarity index 89% rename from src/main/resources/data/botania/tags/blocks/special_floating_flowers.json rename to src/generated/resources/data/botania/tags/items/special_floating_flowers.json index 15de48eb5..06560a19d 100644 --- a/src/main/resources/data/botania/tags/blocks/special_floating_flowers.json +++ b/src/generated/resources/data/botania/tags/items/special_floating_flowers.json @@ -1,55 +1,54 @@ -{ - "__comment": "Values in this tag count as magical floating flowers", - "replace": false, - "values": [ - "botania:floating_pure_daisy", - "botania:floating_manastar", - "botania:floating_endoflame", - "botania:floating_hydroangeas", - "botania:floating_thermalily", - "botania:floating_rosa_arcana", - "botania:floating_munchdew", - "botania:floating_entropinnyum", - "botania:floating_kekimurus", - "botania:floating_gourmaryllis", - "botania:floating_narslimmus", - "botania:floating_spectrolus", - "botania:floating_dandelifeon", - "botania:floating_rafflowsia", - "botania:floating_shulk_me_not", - "botania:floating_bellethorn", - "botania:floating_bellethorn_chibi", - "botania:floating_bergamute", - "botania:floating_dreadthorn", - "botania:floating_heisei_dream", - "botania:floating_tigerseye", - "botania:floating_jaded_amaranthus", - "botania:floating_orechid", - "botania:floating_fallen_kanade", - "botania:floating_exoflame", - "botania:floating_agricarnation", - "botania:floating_agricarnation_chibi", - "botania:floating_hopperhock", - "botania:floating_hopperhock_chibi", - "botania:floating_tangleberrie", - "botania:floating_jiyuulia", - "botania:floating_rannuncarpus", - "botania:floating_rannuncarpus_chibi", - "botania:floating_hyacidus", - "botania:floating_pollidisiac", - "botania:floating_clayconia", - "botania:floating_clayconia_chibi", - "botania:floating_loonium", - "botania:floating_daffomill", - "botania:floating_vinculotus", - "botania:floating_spectranthemum", - "botania:floating_medumone", - "botania:floating_marimorphosis", - "botania:floating_marimorphosis_chibi", - "botania:floating_bubbell", - "botania:floating_bubbell_chibi", - "botania:floating_solegnolia", - "botania:floating_solegnolia_chibi", - "botania:floating_orechid_ignem" - ] +{ + "replace": false, + "values": [ + "botania:floating_agricarnation", + "botania:floating_agricarnation_chibi", + "botania:floating_bellethorn", + "botania:floating_bellethorn_chibi", + "botania:floating_bergamute", + "botania:floating_bubbell", + "botania:floating_bubbell_chibi", + "botania:floating_clayconia", + "botania:floating_clayconia_chibi", + "botania:floating_daffomill", + "botania:floating_dandelifeon", + "botania:floating_dreadthorn", + "botania:floating_endoflame", + "botania:floating_entropinnyum", + "botania:floating_exoflame", + "botania:floating_fallen_kanade", + "botania:floating_gourmaryllis", + "botania:floating_heisei_dream", + "botania:floating_hopperhock", + "botania:floating_hopperhock_chibi", + "botania:floating_hyacidus", + "botania:floating_hydroangeas", + "botania:floating_jaded_amaranthus", + "botania:floating_jiyuulia", + "botania:floating_kekimurus", + "botania:floating_loonium", + "botania:floating_manastar", + "botania:floating_marimorphosis", + "botania:floating_marimorphosis_chibi", + "botania:floating_medumone", + "botania:floating_munchdew", + "botania:floating_narslimmus", + "botania:floating_orechid", + "botania:floating_orechid_ignem", + "botania:floating_pollidisiac", + "botania:floating_pure_daisy", + "botania:floating_rafflowsia", + "botania:floating_rannuncarpus", + "botania:floating_rannuncarpus_chibi", + "botania:floating_rosa_arcana", + "botania:floating_shulk_me_not", + "botania:floating_solegnolia", + "botania:floating_solegnolia_chibi", + "botania:floating_spectranthemum", + "botania:floating_spectrolus", + "botania:floating_tangleberrie", + "botania:floating_thermalily", + "botania:floating_tigerseye", + "botania:floating_vinculotus" + ] } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 8d065e2ff..2ee4f1237 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -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 diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 8c2b380e4..9f46085e9 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -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