Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add conventional tag for all animals #4168

Open
wants to merge 4 commits into
base: 1.21.1
Choose a base branch
from
+88 −0
Open

Add conventional tag for all animals #4168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
605586f
add animal tag to ConventionalEntityTypeTags
CammiePone Oct 16, 2024
7b93b77
forgot to run the datagen config
CammiePone Oct 16, 2024
f259f43
Merge branch 'FabricMC:1.21.1' into 1.21.1
CammiePone Nov 19, 2024
b66b3e8
add javadocs for ANIMALS tag
CammiePone Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses");
translationBuilder.add(ConventionalEntityTypeTags.MINECARTS, "Minecarts");
translationBuilder.add(ConventionalEntityTypeTags.BOATS, "Boats");
translationBuilder.add(ConventionalEntityTypeTags.ANIMALS, "Animals");
translationBuilder.add(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED, "Capturing Not Supported");
translationBuilder.add(ConventionalEntityTypeTags.TELEPORTING_NOT_SUPPORTED, "Teleporting Not Supported");

Expand Down
39 changes: 39 additions & 0 deletions ...va/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EntityTypeTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,45 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {
getOrCreateTagBuilder(ConventionalEntityTypeTags.BOATS)
.add(EntityType.BOAT)
.add(EntityType.CHEST_BOAT);
getOrCreateTagBuilder(ConventionalEntityTypeTags.ANIMALS)
.add(EntityType.ARMADILLO)
.add(EntityType.AXOLOTL)
.add(EntityType.BEE)
.add(EntityType.CAMEL)
.add(EntityType.CAT)
.add(EntityType.CHICKEN)
.add(EntityType.COD)
.add(EntityType.COW)
.add(EntityType.DOLPHIN)
.add(EntityType.DONKEY)
.add(EntityType.FOX)
.add(EntityType.FROG)
.add(EntityType.GLOW_SQUID)
.add(EntityType.GOAT)
.add(EntityType.HOGLIN)
.add(EntityType.HORSE)
.add(EntityType.LLAMA)
.add(EntityType.MOOSHROOM)
.add(EntityType.MULE)
.add(EntityType.OCELOT)
.add(EntityType.PANDA)
.add(EntityType.PARROT)
.add(EntityType.PIG)
.add(EntityType.POLAR_BEAR)
.add(EntityType.PUFFERFISH)
.add(EntityType.RABBIT)
.add(EntityType.SALMON)
.add(EntityType.SHEEP)
.add(EntityType.SKELETON_HORSE)
.add(EntityType.SNIFFER)
.add(EntityType.SQUID)
.add(EntityType.STRIDER)
.add(EntityType.TADPOLE)
.add(EntityType.TRADER_LLAMA)
.add(EntityType.TROPICAL_FISH)
.add(EntityType.TURTLE)
.add(EntityType.WOLF)
.add(EntityType.ZOMBIE_HORSE);
getOrCreateTagBuilder(ConventionalEntityTypeTags.CAPTURING_NOT_SUPPORTED);
getOrCreateTagBuilder(ConventionalEntityTypeTags.TELEPORTING_NOT_SUPPORTED);
}
Expand Down
1 change: 1 addition & 0 deletions ...nvention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"tag.enchantment.c.increase_block_drops": "Increases Block Drops",
"tag.enchantment.c.increase_entity_drops": "Increases Entity Drops",
"tag.enchantment.c.weapon_damage_enhancements": "Weapon Damage Enhancements",
"tag.entity_type.c.animals": "Animals",
"tag.entity_type.c.boats": "Boats",
"tag.entity_type.c.bosses": "Bosses",
"tag.entity_type.c.capturing_not_supported": "Capturing Not Supported",
Expand Down
42 changes: 42 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/entity_type/animals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"values": [
"minecraft:armadillo",
"minecraft:axolotl",
"minecraft:bee",
"minecraft:camel",
"minecraft:cat",
"minecraft:chicken",
"minecraft:cod",
"minecraft:cow",
"minecraft:dolphin",
"minecraft:donkey",
"minecraft:fox",
"minecraft:frog",
"minecraft:glow_squid",
"minecraft:goat",
"minecraft:hoglin",
"minecraft:horse",
"minecraft:llama",
"minecraft:mooshroom",
"minecraft:mule",
"minecraft:ocelot",
"minecraft:panda",
"minecraft:parrot",
"minecraft:pig",
"minecraft:polar_bear",
"minecraft:pufferfish",
"minecraft:rabbit",
"minecraft:salmon",
"minecraft:sheep",
"minecraft:skeleton_horse",
"minecraft:sniffer",
"minecraft:squid",
"minecraft:strider",
"minecraft:tadpole",
"minecraft:trader_llama",
"minecraft:tropical_fish",
"minecraft:turtle",
"minecraft:wolf",
"minecraft:zombie_horse"
]
}
5 changes: 5 additions & 0 deletions ...2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalEntityTypeTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ private ConventionalEntityTypeTags() {
public static final TagKey<EntityType<?>> MINECARTS = register("minecarts");
public static final TagKey<EntityType<?>> BOATS = register("boats");

/**
* Tag containing entity types that extend AnimalEntity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is the case, then Tadpole, Bats, Squid, Glow Squid, and all the fish needs to be removed from the tag.

*/
public static final TagKey<EntityType<?>> ANIMALS = register("animals");

/**
* Entities should be included in this tag if they are not allowed to be picked up by items or grabbed in a way
* that a player can easily move the entity to anywhere they want. Ideal for special entities that should not
Expand Down