Add Hud Render Events

.gitattributes

@@ -1,3 +1,2 @@
-*.java text eol=lf
-*.json text eol=lf
-*.bat text eol=crlf
+* text=auto eol=lf
+*.bat text eol=crlf

build.gradle

@@ -271,6 +271,8 @@ allprojects {
 	}
 
 	spotless {
+		lineEndings = com.diffplug.spotless.LineEnding.UNIX
+
 		java {
 			licenseHeaderFile(rootProject.file("HEADER"))
 			removeUnusedImports()

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

@@ -177,6 +177,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
 		translationBuilder.add(ConventionalItemTags.COAL, "Coal");
 		translationBuilder.add(ConventionalItemTags.POTIONS, "Potions");
 		translationBuilder.add(ConventionalItemTags.FOODS, "Foods");
+		translationBuilder.add(ConventionalItemTags.ANIMAL_FOODS, "Animal Foods");
 		translationBuilder.add(ConventionalItemTags.FRUIT_FOODS, "Fruits");
 		translationBuilder.add(ConventionalItemTags.VEGETABLE_FOODS, "Vegetables");
 		translationBuilder.add(ConventionalItemTags.BERRY_FOODS, "Berries");

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java

@@ -296,6 +296,32 @@ private void generateFoodTags() {
 				.add(Items.CHICKEN)
 				.add(Items.ROTTEN_FLESH);
 
+		getOrCreateTagBuilder(ConventionalItemTags.ANIMAL_FOODS)
+				.addOptionalTag(ItemTags.ARMADILLO_FOOD)
+				.addOptionalTag(ItemTags.AXOLOTL_FOOD)
+				.addOptionalTag(ItemTags.BEE_FOOD)
+				.addOptionalTag(ItemTags.CAMEL_FOOD)
+				.addOptionalTag(ItemTags.CAT_FOOD)
+				.addOptionalTag(ItemTags.CHICKEN_FOOD)
+				.addOptionalTag(ItemTags.COW_FOOD)
+				.addOptionalTag(ItemTags.FOX_FOOD)
+				.addOptionalTag(ItemTags.FROG_FOOD)
+				.addOptionalTag(ItemTags.GOAT_FOOD)
+				.addOptionalTag(ItemTags.HOGLIN_FOOD)
+				.addOptionalTag(ItemTags.HORSE_FOOD)
+				.addOptionalTag(ItemTags.LLAMA_FOOD)
+				.addOptionalTag(ItemTags.OCELOT_FOOD)
+				.addOptionalTag(ItemTags.PANDA_FOOD)
+				.addOptionalTag(ItemTags.PARROT_FOOD)
+				.addOptionalTag(ItemTags.PIG_FOOD)
+				.addOptionalTag(ItemTags.PIGLIN_FOOD)
+				.addOptionalTag(ItemTags.RABBIT_FOOD)
+				.addOptionalTag(ItemTags.SHEEP_FOOD)
+				.addOptionalTag(ItemTags.SNIFFER_FOOD)
+				.addOptionalTag(ItemTags.STRIDER_FOOD)
+				.addOptionalTag(ItemTags.TURTLE_FOOD)
+				.addOptionalTag(ItemTags.WOLF_FOOD);
+
 		getOrCreateTagBuilder(ConventionalItemTags.FOODS)
 				.add(Items.BAKED_POTATO)
 				.add(Items.PUMPKIN_PIE)
@@ -597,7 +623,8 @@ private void generateToolTags() {
 				.addOptionalTag(ItemTags.CROSSBOW_ENCHANTABLE)
 				.addOptionalTag(ItemTags.MACE_ENCHANTABLE)
 				.addOptionalTag(ItemTags.FIRE_ASPECT_ENCHANTABLE)
-				.addOptionalTag(ItemTags.DURABILITY_ENCHANTABLE);
+				.addOptionalTag(ItemTags.DURABILITY_ENCHANTABLE)
+				.addOptionalTag(ItemTags.VANISHING_ENCHANTABLE);
 
 		// Deprecated tags below
 

fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json

@@ -90,6 +90,7 @@
   "tag.fluid.c.lava": "Lava",
   "tag.fluid.c.milk": "Milk",
   "tag.fluid.c.water": "Water",
+  "tag.item.c.animal_foods": "Animal Foods",
   "tag.item.c.armors": "Armors",
   "tag.item.c.barrels": "Barrels",
   "tag.item.c.barrels.wooden": "Wooden Barrels",

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/animal_foods.json

@@ -0,0 +1,100 @@
+{
+  "values": [
+    {
+      "id": "#minecraft:armadillo_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:axolotl_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:bee_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:camel_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:cat_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:chicken_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:cow_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:fox_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:frog_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:goat_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:hoglin_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:horse_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:llama_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:ocelot_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:panda_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:parrot_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:pig_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:piglin_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:rabbit_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:sheep_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:sniffer_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:strider_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:turtle_food",
+      "required": false
+    },
+    {
+      "id": "#minecraft:wolf_food",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/enchantables.json

@@ -51,6 +51,10 @@
     {
       "id": "#minecraft:enchantable/durability",
       "required": false
+    },
+    {
+      "id": "#minecraft:enchantable/vanishing",
+      "required": false
     }
   ]
 }

fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java

@@ -18,6 +18,7 @@
 
 import net.minecraft.item.Item;
 import net.minecraft.registry.tag.BlockTags;
+import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.registry.tag.TagKey;
 
 import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration;
@@ -134,6 +135,10 @@ private ConventionalItemTags() {
 
 	// Foods
 	public static final TagKey<Item> FOODS = register("foods");
+	/**
+	 * All foods edible by animals excluding poisonous foods. (Does not include {@link ItemTags#PARROT_POISONOUS_FOOD})
+	 */
+	public static final TagKey<Item> ANIMAL_FOODS = register("animal_foods");
 	/**
 	 * Apples and other foods that are considered fruits in the culinary field belong in this tag.
 	 * Cherries would go here as they are considered a "stone fruit" within culinary fields.

fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/de_de.json

@@ -116,6 +116,17 @@
   "tag.item.c.concrete_powder": "Trockenbeton",
   "tag.item.c.concrete_powders": "Trockenbetone",
   "tag.item.c.concretes": "Betone",
+  "tag.item.c.crops": "Pflanzen",
+  "tag.item.c.crops.beetroot": "Rote Beete-Pflanzen",
+  "tag.item.c.crops.cactus": "Kaktuspflanzen",
+  "tag.item.c.crops.carrot": "Karottenpflanzen",
+  "tag.item.c.crops.cocoa_bean": "Kakaobohnenpflanzen",
+  "tag.item.c.crops.melon": "Melonenpflanzen",
+  "tag.item.c.crops.nether_wart": "Netherwarzenpflanzen",
+  "tag.item.c.crops.potato": "Kartoffelpflanzen",
+  "tag.item.c.crops.pumpkin": "Kürbispflanzen",
+  "tag.item.c.crops.sugar_cane": "Zuckerrohrpflanzen",
+  "tag.item.c.crops.wheat": "Weizenpflanzen",
   "tag.item.c.dusts": "Staub",
   "tag.item.c.dusts.glowstone": "Leuchtsteinstaub",
   "tag.item.c.dusts.redstone": "Redstonestaub",
@@ -206,6 +217,8 @@
   "tag.item.c.leathers": "Leder",
   "tag.item.c.music_discs": "Schallplatten",
   "tag.item.c.nuggets": "Klumpen",
+  "tag.item.c.nuggets.gold": "Goldklumpen",
+  "tag.item.c.nuggets.iron": "Eisenklumpen",
   "tag.item.c.ores": "Erze",
   "tag.item.c.ores.netherite_scrap": "Netheriteschrott-Erze",
   "tag.item.c.ores.quartz": "Quarzerze",

fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/it_it.json

@@ -116,6 +116,17 @@
   "tag.item.c.concrete_powder": "Polvere di Calcestruzzo",
   "tag.item.c.concrete_powders": "Polveri di Calcestruzzo",
   "tag.item.c.concretes": "Calcestruzzi",
+  "tag.item.c.crops": "Colture",
+  "tag.item.c.crops.beetroot": "Colture di Barbabietola",
+  "tag.item.c.crops.cactus": "Colture di Cactus",
+  "tag.item.c.crops.carrot": "Colture di Carota",
+  "tag.item.c.crops.cocoa_bean": "Colture di Fava di Cacao",
+  "tag.item.c.crops.melon": "Colture di Cocomero",
+  "tag.item.c.crops.nether_wart": "Colture di Verruca del Nether",
+  "tag.item.c.crops.potato": "Colture di Patata",
+  "tag.item.c.crops.pumpkin": "Colture di Zucca",
+  "tag.item.c.crops.sugar_cane": "Colture di Canna da Zucchero",
+  "tag.item.c.crops.wheat": "Colture di Grano",
   "tag.item.c.dusts": "Polveri",
   "tag.item.c.dusts.glowstone": "Polveri di Luminite",
   "tag.item.c.dusts.redstone": "Polveri di Redstone",
@@ -206,6 +217,8 @@
   "tag.item.c.leathers": "Cuoi",
   "tag.item.c.music_discs": "Dischi Musicali",
   "tag.item.c.nuggets": "Pepite",
+  "tag.item.c.nuggets.gold": "Pepite d'oro",
+  "tag.item.c.nuggets.iron": "Pepite di ferro",
   "tag.item.c.ores": "Minerali",
   "tag.item.c.ores.netherite_scrap": "Minerali di Frammenti di Netherite",
   "tag.item.c.ores.quartz": "Minerali di Quarzo",

fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/ja_jp.json

@@ -29,7 +29,11 @@
   "tag.block.c.dyed.white": "白色のブロック",
   "tag.block.c.dyed.yellow": "黄色のブロック",
   "tag.block.c.glass_blocks": "ガラスブロック",
+  "tag.block.c.glass_blocks.cheap": "簡素なガラスブロック",
+  "tag.block.c.glass_blocks.colorless": "透明のガラスブロック",
+  "tag.block.c.glass_blocks.tinted": "遮光ガラスブロック",
   "tag.block.c.glass_panes": "ガラス板",
+  "tag.block.c.glass_panes.colorless": "透明のガラス板",
   "tag.block.c.glazed_terracotta": "彩釉テラコッタ",
   "tag.block.c.glazed_terracottas": "彩釉テラコッタ",
   "tag.block.c.hidden_from_recipe_viewers": "レシピ閲覧画面に表示しない",
@@ -112,6 +116,17 @@
   "tag.item.c.concrete_powder": "コンクリートパウダー",
   "tag.item.c.concrete_powders": "コンクリートパウダー",
   "tag.item.c.concretes": "コンクリート",
+  "tag.item.c.crops": "作物",
+  "tag.item.c.crops.beetroot": "ビートルートの作物",
+  "tag.item.c.crops.cactus": "サボテンの作物",
+  "tag.item.c.crops.carrot": "ニンジンの作物",
+  "tag.item.c.crops.cocoa_bean": "カカオ豆の作物",
+  "tag.item.c.crops.melon": "メロンの作物",
+  "tag.item.c.crops.nether_wart": "ネザーウォートの作物",
+  "tag.item.c.crops.potato": "ジャガイモの作物",
+  "tag.item.c.crops.pumpkin": "カボチャの作物",
+  "tag.item.c.crops.sugar_cane": "サトウキビの作物",
+  "tag.item.c.crops.wheat": "小麦の作物",
   "tag.item.c.dusts": "ダスト",
   "tag.item.c.dusts.glowstone": "グロウストーンダスト",
   "tag.item.c.dusts.redstone": "レッドストーンダスト",
@@ -150,19 +165,33 @@
   "tag.item.c.dyes.white": "白色の染料",
   "tag.item.c.dyes.yellow": "黄色の染料",
   "tag.item.c.enchantables": "エンチャント可能",
+  "tag.item.c.ender_pearls": "エンダーパール",
+  "tag.item.c.fertilizers": "肥料",
   "tag.item.c.foods": "食べ物",
   "tag.item.c.foods.berries": "ベリー",
+  "tag.item.c.foods.berry": "ベリー",
+  "tag.item.c.foods.bread": "パン",
   "tag.item.c.foods.breads": "パン",
   "tag.item.c.foods.candies": "キャンディ",
+  "tag.item.c.foods.candy": "飴",
+  "tag.item.c.foods.cooked_fish": "焼き魚",
   "tag.item.c.foods.cooked_fishes": "焼き魚",
+  "tag.item.c.foods.cooked_meat": "焼き肉",
   "tag.item.c.foods.cooked_meats": "焼肉",
+  "tag.item.c.foods.cookie": "クッキー",
   "tag.item.c.foods.cookies": "クッキー",
   "tag.item.c.foods.edible_when_placed": "食用ブロック",
   "tag.item.c.foods.food_poisoning": "食中毒",
+  "tag.item.c.foods.fruit": "果物",
   "tag.item.c.foods.fruits": "果物",
+  "tag.item.c.foods.golden": "金の食べ物",
+  "tag.item.c.foods.raw_fish": "生魚",
   "tag.item.c.foods.raw_fishes": "生の魚",
+  "tag.item.c.foods.raw_meat": "生肉",
   "tag.item.c.foods.raw_meats": "生の肉",
+  "tag.item.c.foods.soup": "スープ",
   "tag.item.c.foods.soups": "スープ",
+  "tag.item.c.foods.vegetable": "野菜",
   "tag.item.c.foods.vegetables": "野菜",
   "tag.item.c.gems": "宝石",
   "tag.item.c.gems.amethyst": "アメジストの宝石",
@@ -172,7 +201,11 @@
   "tag.item.c.gems.prismarine": "プリズマリンの宝石",
   "tag.item.c.gems.quartz": "クォーツの宝石",
   "tag.item.c.glass_blocks": "ガラスブロック",
+  "tag.item.c.glass_blocks.cheap": "簡素なガラスブロック",
+  "tag.item.c.glass_blocks.colorless": "透明のガラスブロック",
+  "tag.item.c.glass_blocks.tinted": "遮光ガラスブロック",
   "tag.item.c.glass_panes": "ガラス板",
+  "tag.item.c.glass_panes.colorless": "透明のガラス板",
   "tag.item.c.glazed_terracotta": "彩釉テラコッタ",
   "tag.item.c.glazed_terracottas": "彩釉テラコッタ",
   "tag.item.c.hidden_from_recipe_viewers": "レシピ閲覧画面に表示しない",
@@ -184,6 +217,8 @@
   "tag.item.c.leathers": "革",
   "tag.item.c.music_discs": "レコード",
   "tag.item.c.nuggets": "塊",
+  "tag.item.c.nuggets.gold": "金塊",
+  "tag.item.c.nuggets.iron": "鉄塊",
   "tag.item.c.ores": "鉱石",
   "tag.item.c.ores.netherite_scrap": "ネザライトの欠片の鉱石",
   "tag.item.c.ores.quartz": "クォーツ鉱石",
@@ -213,6 +248,7 @@
   "tag.item.c.sandstone.uncolored_slabs": "無色の砂岩のハーフブロック",
   "tag.item.c.sandstone.uncolored_stairs": "無色の砂岩の階段",
   "tag.item.c.shulker_boxes": "シュルカーボックス",
+  "tag.item.c.slime_balls": "スライムボール",
   "tag.item.c.stones": "石",
   "tag.item.c.storage_blocks": "保管用ブロック",
   "tag.item.c.storage_blocks.bone_meal": "骨粉保管用ブロック",
@@ -241,6 +277,8 @@
   "tag.item.c.tools.crossbows": "クロスボウ",
   "tag.item.c.tools.fishing_rod": "釣竿",
   "tag.item.c.tools.fishing_rods": "釣竿",
+  "tag.item.c.tools.igniter": "着火用具",
+  "tag.item.c.tools.mace": "メイス",
   "tag.item.c.tools.melee_weapon": "近接武器",
   "tag.item.c.tools.melee_weapons": "近接武器",
   "tag.item.c.tools.mining_tool": "採掘用ツール",