From f505829686ac35896c1dfb8e839a596767c46bf0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Jun 2020 20:20:36 -0500 Subject: [PATCH] Update forge, fix datagens by generating special flower tags --- build.gradle | 2 +- .../blocks/functional_special_flowers.json | 76 +++++++++---------- .../blocks}/generating_special_flowers.json | 34 ++++----- .../tags/blocks/misc_special_flowers.json | 7 ++ .../botania/tags/blocks}/special_flowers.json | 14 ++-- .../items/functional_special_flowers.json | 76 +++++++++---------- .../items}/generating_special_flowers.json | 34 ++++----- .../tags/items/misc_special_flowers.json | 7 ++ .../botania/tags/items}/special_flowers.json | 14 ++-- .../data/forge/tags/items/shears.json | 1 - .../vazkii/botania/data/BlockTagProvider.java | 28 +++++++ .../vazkii/botania/data/ItemTagProvider.java | 5 ++ .../tags/blocks/misc_special_flowers.json | 7 -- .../tags/items/misc_special_flowers.json | 7 -- 14 files changed, 172 insertions(+), 140 deletions(-) rename src/{main => generated}/resources/data/botania/tags/blocks/functional_special_flowers.json (96%) rename src/{main/resources/data/botania/tags/items => generated/resources/data/botania/tags/blocks}/generating_special_flowers.json (82%) create mode 100644 src/generated/resources/data/botania/tags/blocks/misc_special_flowers.json rename src/{main/resources/data/botania/tags/items => generated/resources/data/botania/tags/blocks}/special_flowers.json (95%) rename src/{main => generated}/resources/data/botania/tags/items/functional_special_flowers.json (96%) rename src/{main/resources/data/botania/tags/blocks => generated/resources/data/botania/tags/items}/generating_special_flowers.json (82%) create mode 100644 src/generated/resources/data/botania/tags/items/misc_special_flowers.json rename src/{main/resources/data/botania/tags/blocks => generated/resources/data/botania/tags/items}/special_flowers.json (95%) delete mode 100644 src/main/resources/data/botania/tags/blocks/misc_special_flowers.json delete mode 100644 src/main/resources/data/botania/tags/items/misc_special_flowers.json diff --git a/build.gradle b/build.gradle index c4bfac4a2..3505c2dfe 100644 --- a/build.gradle +++ b/build.gradle @@ -98,7 +98,7 @@ test { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-32.0.24" + minecraft "net.minecraftforge:forge:${mc_version}-32.0.32" compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.188:api") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-36.188") diff --git a/src/main/resources/data/botania/tags/blocks/functional_special_flowers.json b/src/generated/resources/data/botania/tags/blocks/functional_special_flowers.json similarity index 96% rename from src/main/resources/data/botania/tags/blocks/functional_special_flowers.json rename to src/generated/resources/data/botania/tags/blocks/functional_special_flowers.json index 0b9ea9463..5681a772c 100644 --- a/src/main/resources/data/botania/tags/blocks/functional_special_flowers.json +++ b/src/generated/resources/data/botania/tags/blocks/functional_special_flowers.json @@ -1,39 +1,39 @@ -{ - "replace": false, - "values": [ - "botania:agricarnation", - "botania:agricarnation_chibi", - "botania:bellethorn", - "botania:bellethorn_chibi", - "botania:bergamute", - "botania:bubbell", - "botania:bubbell_chibi", - "botania:clayconia", - "botania:clayconia_chibi", - "botania:daffomill", - "botania:dreadthorn", - "botania:exoflame", - "botania:fallen_kanade", - "botania:heisei_dream", - "botania:hopperhock", - "botania:hopperhock_chibi", - "botania:hyacidus", - "botania:jaded_amaranthus", - "botania:jiyuulia", - "botania:loonium", - "botania:marimorphosis", - "botania:marimorphosis_chibi", - "botania:medumone", - "botania:orechid", - "botania:orechid_ignem", - "botania:pollidisiac", - "botania:rannuncarpus", - "botania:rannuncarpus_chibi", - "botania:solegnolia", - "botania:solegnolia_chibi", - "botania:spectranthemum", - "botania:tangleberrie", - "botania:tigerseye", - "botania:vinculotus" - ] +{ + "replace": false, + "values": [ + "botania:agricarnation", + "botania:agricarnation_chibi", + "botania:bellethorn", + "botania:bellethorn_chibi", + "botania:bergamute", + "botania:bubbell", + "botania:bubbell_chibi", + "botania:clayconia", + "botania:clayconia_chibi", + "botania:daffomill", + "botania:dreadthorn", + "botania:exoflame", + "botania:fallen_kanade", + "botania:heisei_dream", + "botania:hopperhock", + "botania:hopperhock_chibi", + "botania:hyacidus", + "botania:jaded_amaranthus", + "botania:jiyuulia", + "botania:loonium", + "botania:marimorphosis", + "botania:marimorphosis_chibi", + "botania:medumone", + "botania:orechid", + "botania:orechid_ignem", + "botania:pollidisiac", + "botania:rannuncarpus", + "botania:rannuncarpus_chibi", + "botania:solegnolia", + "botania:solegnolia_chibi", + "botania:spectranthemum", + "botania:tangleberrie", + "botania:tigerseye", + "botania:vinculotus" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/generating_special_flowers.json b/src/generated/resources/data/botania/tags/blocks/generating_special_flowers.json similarity index 82% rename from src/main/resources/data/botania/tags/items/generating_special_flowers.json rename to src/generated/resources/data/botania/tags/blocks/generating_special_flowers.json index c6ff178ed..6d38a1d56 100644 --- a/src/main/resources/data/botania/tags/items/generating_special_flowers.json +++ b/src/generated/resources/data/botania/tags/blocks/generating_special_flowers.json @@ -1,18 +1,18 @@ -{ - "replace": false, - "values": [ - "botania:endoflame", - "botania:hydroangeas", - "botania:thermalily", - "botania:rosa_arcana", - "botania:munchdew", - "botania:entropinnyum", - "botania:kekimurus", - "botania:gourmaryllis", - "botania:narslimmus", - "botania:spectrolus", - "botania:dandelifeon", - "botania:rafflowsia", - "botania:shulk_me_not" - ] +{ + "replace": false, + "values": [ + "botania:dandelifeon", + "botania:endoflame", + "botania:entropinnyum", + "botania:gourmaryllis", + "botania:hydroangeas", + "botania:kekimurus", + "botania:munchdew", + "botania:narslimmus", + "botania:rafflowsia", + "botania:rosa_arcana", + "botania:shulk_me_not", + "botania:spectrolus", + "botania:thermalily" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/botania/tags/blocks/misc_special_flowers.json b/src/generated/resources/data/botania/tags/blocks/misc_special_flowers.json new file mode 100644 index 000000000..5388ec0fe --- /dev/null +++ b/src/generated/resources/data/botania/tags/blocks/misc_special_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:manastar", + "botania:pure_daisy" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/special_flowers.json b/src/generated/resources/data/botania/tags/blocks/special_flowers.json similarity index 95% rename from src/main/resources/data/botania/tags/items/special_flowers.json rename to src/generated/resources/data/botania/tags/blocks/special_flowers.json index 94e1109be..4eb37fa19 100644 --- a/src/main/resources/data/botania/tags/items/special_flowers.json +++ b/src/generated/resources/data/botania/tags/blocks/special_flowers.json @@ -1,8 +1,8 @@ -{ - "replace": false, - "values": [ - "#botania:misc_special_flowers", - "#botania:generating_special_flowers", - "#botania:functional_special_flowers" - ] +{ + "replace": false, + "values": [ + "#botania:misc_special_flowers", + "#botania:generating_special_flowers", + "#botania:functional_special_flowers" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/functional_special_flowers.json b/src/generated/resources/data/botania/tags/items/functional_special_flowers.json similarity index 96% rename from src/main/resources/data/botania/tags/items/functional_special_flowers.json rename to src/generated/resources/data/botania/tags/items/functional_special_flowers.json index 0b9ea9463..5681a772c 100644 --- a/src/main/resources/data/botania/tags/items/functional_special_flowers.json +++ b/src/generated/resources/data/botania/tags/items/functional_special_flowers.json @@ -1,39 +1,39 @@ -{ - "replace": false, - "values": [ - "botania:agricarnation", - "botania:agricarnation_chibi", - "botania:bellethorn", - "botania:bellethorn_chibi", - "botania:bergamute", - "botania:bubbell", - "botania:bubbell_chibi", - "botania:clayconia", - "botania:clayconia_chibi", - "botania:daffomill", - "botania:dreadthorn", - "botania:exoflame", - "botania:fallen_kanade", - "botania:heisei_dream", - "botania:hopperhock", - "botania:hopperhock_chibi", - "botania:hyacidus", - "botania:jaded_amaranthus", - "botania:jiyuulia", - "botania:loonium", - "botania:marimorphosis", - "botania:marimorphosis_chibi", - "botania:medumone", - "botania:orechid", - "botania:orechid_ignem", - "botania:pollidisiac", - "botania:rannuncarpus", - "botania:rannuncarpus_chibi", - "botania:solegnolia", - "botania:solegnolia_chibi", - "botania:spectranthemum", - "botania:tangleberrie", - "botania:tigerseye", - "botania:vinculotus" - ] +{ + "replace": false, + "values": [ + "botania:agricarnation", + "botania:agricarnation_chibi", + "botania:bellethorn", + "botania:bellethorn_chibi", + "botania:bergamute", + "botania:bubbell", + "botania:bubbell_chibi", + "botania:clayconia", + "botania:clayconia_chibi", + "botania:daffomill", + "botania:dreadthorn", + "botania:exoflame", + "botania:fallen_kanade", + "botania:heisei_dream", + "botania:hopperhock", + "botania:hopperhock_chibi", + "botania:hyacidus", + "botania:jaded_amaranthus", + "botania:jiyuulia", + "botania:loonium", + "botania:marimorphosis", + "botania:marimorphosis_chibi", + "botania:medumone", + "botania:orechid", + "botania:orechid_ignem", + "botania:pollidisiac", + "botania:rannuncarpus", + "botania:rannuncarpus_chibi", + "botania:solegnolia", + "botania:solegnolia_chibi", + "botania:spectranthemum", + "botania:tangleberrie", + "botania:tigerseye", + "botania:vinculotus" + ] } \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/generating_special_flowers.json b/src/generated/resources/data/botania/tags/items/generating_special_flowers.json similarity index 82% rename from src/main/resources/data/botania/tags/blocks/generating_special_flowers.json rename to src/generated/resources/data/botania/tags/items/generating_special_flowers.json index c6ff178ed..6d38a1d56 100644 --- a/src/main/resources/data/botania/tags/blocks/generating_special_flowers.json +++ b/src/generated/resources/data/botania/tags/items/generating_special_flowers.json @@ -1,18 +1,18 @@ -{ - "replace": false, - "values": [ - "botania:endoflame", - "botania:hydroangeas", - "botania:thermalily", - "botania:rosa_arcana", - "botania:munchdew", - "botania:entropinnyum", - "botania:kekimurus", - "botania:gourmaryllis", - "botania:narslimmus", - "botania:spectrolus", - "botania:dandelifeon", - "botania:rafflowsia", - "botania:shulk_me_not" - ] +{ + "replace": false, + "values": [ + "botania:dandelifeon", + "botania:endoflame", + "botania:entropinnyum", + "botania:gourmaryllis", + "botania:hydroangeas", + "botania:kekimurus", + "botania:munchdew", + "botania:narslimmus", + "botania:rafflowsia", + "botania:rosa_arcana", + "botania:shulk_me_not", + "botania:spectrolus", + "botania:thermalily" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/botania/tags/items/misc_special_flowers.json b/src/generated/resources/data/botania/tags/items/misc_special_flowers.json new file mode 100644 index 000000000..5388ec0fe --- /dev/null +++ b/src/generated/resources/data/botania/tags/items/misc_special_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:manastar", + "botania:pure_daisy" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/special_flowers.json b/src/generated/resources/data/botania/tags/items/special_flowers.json similarity index 95% rename from src/main/resources/data/botania/tags/blocks/special_flowers.json rename to src/generated/resources/data/botania/tags/items/special_flowers.json index 94e1109be..4eb37fa19 100644 --- a/src/main/resources/data/botania/tags/blocks/special_flowers.json +++ b/src/generated/resources/data/botania/tags/items/special_flowers.json @@ -1,8 +1,8 @@ -{ - "replace": false, - "values": [ - "#botania:misc_special_flowers", - "#botania:generating_special_flowers", - "#botania:functional_special_flowers" - ] +{ + "replace": false, + "values": [ + "#botania:misc_special_flowers", + "#botania:generating_special_flowers", + "#botania:functional_special_flowers" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/shears.json b/src/generated/resources/data/forge/tags/items/shears.json index 689176b88..10a17c471 100644 --- a/src/generated/resources/data/forge/tags/items/shears.json +++ b/src/generated/resources/data/forge/tags/items/shears.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:shears", "botania:elementium_shears", "botania:manasteel_shears" ] diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 2b731781c..655db1b93 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -8,24 +8,31 @@ */ package vazkii.botania.data; +import com.mojang.datafixers.util.Pair; import net.minecraft.block.*; import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.item.DyeColor; import net.minecraft.tags.BlockTags; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import vazkii.botania.common.block.BlockFloatingSpecialFlower; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.nio.file.Path; import java.util.Arrays; import java.util.Comparator; import java.util.function.Predicate; +import static vazkii.botania.common.block.ModSubtiles.*; + public class BlockTagProvider extends BlockTagsProvider { public BlockTagProvider(DataGenerator generator) { super(generator); @@ -87,6 +94,27 @@ public class BlockTagProvider extends BlockTagsProvider { .toArray(Block[]::new) ); + + func_240522_a_(ModTags.Blocks.MISC_SPECIAL_FLOWERS).func_240534_a_(manastar, pureDaisy); + func_240522_a_(ModTags.Blocks.GENERATING_SPECIAL_FLOWERS).func_240534_a_( + dandelifeon, endoflame, entropinnyum, + gourmaryllis, hydroangeas, kekimurus, + munchdew, narslimmus, rafflowsia, rosaArcana, + shulkMeNot, spectrolus, thermalily + ); + func_240522_a_(ModTags.Blocks.FUNCTIONAL_SPECIAL_FLOWERS).func_240534_a_( + agricarnation, agricarnationChibi, bellethorn, bellethornChibi, + bergamute, bubbell, bubbellChibi, clayconia, clayconiaChibi, + daffomill, dreadthorn, exoflame, fallenKanade, heiseiDream, + hopperhock, hopperhockChibi, hyacidus, jadedAmaranthus, + jiyuulia, loonium, marimorphosis, marimorphosisChibi, + medumone, orechid, orechidIgnem, pollidisiac, rannuncarpus, rannuncarpusChibi, + solegnolia, solegnoliaChibi, spectranthemum, tangleberrie, tigerseye, vinculotus + ); + func_240522_a_(ModTags.Blocks.SPECIAL_FLOWERS).func_240531_a_(ModTags.Blocks.MISC_SPECIAL_FLOWERS) + .func_240531_a_(ModTags.Blocks.GENERATING_SPECIAL_FLOWERS) + .func_240531_a_(ModTags.Blocks.FUNCTIONAL_SPECIAL_FLOWERS); + func_240522_a_(BlockTags.TALL_FLOWERS).func_240531_a_(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS); func_240522_a_(BlockTags.SMALL_FLOWERS).func_240531_a_(ModTags.Blocks.MYSTICAL_FLOWERS); func_240522_a_(BlockTags.FLOWERS).func_240531_a_(ModTags.Blocks.SPECIAL_FLOWERS); diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index ab5725e59..42097fd57 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -46,6 +46,11 @@ public class ItemTagProvider extends ItemTagsProvider { this.func_240521_a_(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS, ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); this.func_240521_a_(ModTags.Blocks.MYSTICAL_FLOWERS, ModTags.Items.MYSTICAL_FLOWERS); + this.func_240521_a_(ModTags.Blocks.MISC_SPECIAL_FLOWERS, ModTags.Items.MISC_SPECIAL_FLOWERS); + this.func_240521_a_(ModTags.Blocks.GENERATING_SPECIAL_FLOWERS, ModTags.Items.GENERATING_SPECIAL_FLOWERS); + this.func_240521_a_(ModTags.Blocks.FUNCTIONAL_SPECIAL_FLOWERS, ModTags.Items.FUNCTIONAL_SPECIAL_FLOWERS); + this.func_240521_a_(ModTags.Blocks.SPECIAL_FLOWERS, ModTags.Items.SPECIAL_FLOWERS); + this.func_240522_a_(ItemTags.TALL_FLOWERS).func_240531_a_(ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); this.func_240522_a_(ItemTags.SMALL_FLOWERS).func_240531_a_(ModTags.Items.MYSTICAL_FLOWERS); this.func_240522_a_(ItemTags.FLOWERS).func_240531_a_(ModTags.Items.SPECIAL_FLOWERS); diff --git a/src/main/resources/data/botania/tags/blocks/misc_special_flowers.json b/src/main/resources/data/botania/tags/blocks/misc_special_flowers.json deleted file mode 100644 index ed1e046a4..000000000 --- a/src/main/resources/data/botania/tags/blocks/misc_special_flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:pure_daisy", - "botania:manastar" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/misc_special_flowers.json b/src/main/resources/data/botania/tags/items/misc_special_flowers.json deleted file mode 100644 index ed1e046a4..000000000 --- a/src/main/resources/data/botania/tags/items/misc_special_flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "botania:pure_daisy", - "botania:manastar" - ] -} \ No newline at end of file