mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Update forge, fix datagens by generating special flower tags
This commit is contained in:
1 parent
4e561a4f99
commit
f505829686
14 files changed
+172
-140
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user