From e956a9c9f341a7f00056a9a9284e54c31ba442bb Mon Sep 17 00:00:00 2001 From: GizmoTheMoonPig <67468252+GizmoTheMoonPig@users.noreply.github.com> Date: Thu, 8 Sep 2022 09:10:48 -0600 Subject: [PATCH] Create a Forge EntityType Tag for Bosses (#9017) --- .../data/forge/tags/entity_types/bosses.json | 6 ++++ .../net/minecraftforge/common/ForgeMod.java | 2 ++ .../java/net/minecraftforge/common/Tags.java | 14 ++++++++ .../data/ForgeEntityTypeTagsProvider.java | 32 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 src/generated/resources/data/forge/tags/entity_types/bosses.json create mode 100644 src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java diff --git a/src/generated/resources/data/forge/tags/entity_types/bosses.json b/src/generated/resources/data/forge/tags/entity_types/bosses.json new file mode 100644 index 0000000000..4be4cce831 --- /dev/null +++ b/src/generated/resources/data/forge/tags/entity_types/bosses.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:ender_dragon", + "minecraft:wither" + ] +} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java index 5c49893e5e..f93a2254bc 100644 --- a/src/main/java/net/minecraftforge/common/ForgeMod.java +++ b/src/main/java/net/minecraftforge/common/ForgeMod.java @@ -99,6 +99,7 @@ import net.minecraftforge.common.crafting.conditions.OrCondition; import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; import net.minecraftforge.common.crafting.conditions.TrueCondition; import net.minecraftforge.common.data.ForgeBlockTagsProvider; +import net.minecraftforge.common.data.ForgeEntityTypeTagsProvider; import net.minecraftforge.common.data.ForgeItemTagsProvider; import net.minecraftforge.common.data.ForgeLootTableProvider; import net.minecraftforge.common.data.ForgeRecipeProvider; @@ -497,6 +498,7 @@ public class ForgeMod ForgeBlockTagsProvider blockTags = new ForgeBlockTagsProvider(gen, existingFileHelper); gen.addProvider(event.includeServer(), blockTags); gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(gen, blockTags, existingFileHelper)); + gen.addProvider(event.includeServer(), new ForgeEntityTypeTagsProvider(gen, existingFileHelper)); gen.addProvider(event.includeServer(), new ForgeFluidTagsProvider(gen, existingFileHelper)); gen.addProvider(event.includeServer(), new ForgeRecipeProvider(gen)); gen.addProvider(event.includeServer(), new ForgeLootTableProvider(gen)); diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 2a7dfed4c4..87b468c0cd 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -12,6 +12,7 @@ import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.level.biome.Biome; @@ -24,6 +25,7 @@ public class Tags public static void init () { Blocks.init(); + EntityTypes.init(); Items.init(); Fluids.init(); Biomes.init(); @@ -180,6 +182,18 @@ public class Tags } } + public static class EntityTypes + { + private static void init() {} + + public static final TagKey> BOSSES = tag("bosses"); + + private static TagKey> tag(String name) + { + return TagKey.create(Registry.ENTITY_TYPE_REGISTRY, new ResourceLocation("forge", name)); + } + } + public static class Items { private static void init(){} diff --git a/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java new file mode 100644 index 0000000000..055cdd005c --- /dev/null +++ b/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common.data; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.EntityTypeTagsProvider; +import net.minecraft.world.entity.EntityType; +import net.minecraftforge.common.Tags; + +public class ForgeEntityTypeTagsProvider extends EntityTypeTagsProvider +{ + + public ForgeEntityTypeTagsProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) + { + super(generator, "forge", existingFileHelper); + } + + @Override + public void addTags() + { + tag(Tags.EntityTypes.BOSSES).add(EntityType.ENDER_DRAGON, EntityType.WITHER); + } + + @Override + public String getName() + { + return "Forge EntityType Tags"; + } +}