From 446c7cf3d2ae6dc6fdd35238ea733d2289e7063f Mon Sep 17 00:00:00 2001 From: TheDeathlyCow Date: Fri, 17 Jan 2025 00:24:14 -1000 Subject: [PATCH 1/6] add drink convention tags --- .../resources/data/c/tags/item/drinks.json | 14 ++++++ .../data/c/tags/item/drinks/honey.json | 5 ++ .../data/c/tags/item/drinks/juice.json | 8 ++++ .../data/c/tags/item/drinks/juice/apple.json | 3 ++ .../data/c/tags/item/drinks/juice/beet.json | 3 ++ .../data/c/tags/item/drinks/juice/carrot.json | 3 ++ .../c/tags/item/drinks/juice/watermelon.json | 3 ++ .../data/c/tags/item/drinks/magic.json | 6 +++ .../c/tags/item/drinks/magic/ominous.json | 5 ++ .../data/c/tags/item/drinks/milk.json | 5 ++ .../data/c/tags/item/drinks/water.json | 5 ++ .../net/neoforged/neoforge/common/Tags.java | 47 +++++++++++++++++++ .../internal/NeoForgeItemTagsProvider.java | 17 +++++++ .../internal/NeoForgeLanguageProvider.java | 13 +++++ 14 files changed, 137 insertions(+) create mode 100644 src/generated/resources/data/c/tags/item/drinks.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/honey.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/juice.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/juice/apple.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/juice/beet.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/juice/carrot.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/juice/watermelon.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/magic.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/magic/ominous.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/milk.json create mode 100644 src/generated/resources/data/c/tags/item/drinks/water.json diff --git a/src/generated/resources/data/c/tags/item/drinks.json b/src/generated/resources/data/c/tags/item/drinks.json new file mode 100644 index 0000000000..8e24d2978c --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#c:drinks/water", + "#c:drinks/milk", + "#c:drinks/honey", + "#c:drinks/magic", + "#c:drinks/magic/ominous", + "#c:drinks/juice", + "#c:drinks/juice/apple", + "#c:drinks/juice/beet", + "#c:drinks/juice/carrot", + "#c:drinks/juice/watermelon" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/honey.json b/src/generated/resources/data/c/tags/item/drinks/honey.json new file mode 100644 index 0000000000..6049f1a5d4 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/honey.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:honey_bottle" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice.json b/src/generated/resources/data/c/tags/item/drinks/juice.json new file mode 100644 index 0000000000..a19f906cf3 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/juice.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#c:drinks/juice/apple", + "#c:drinks/juice/beet", + "#c:drinks/juice/carrot", + "#c:drinks/juice/watermelon" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice/apple.json b/src/generated/resources/data/c/tags/item/drinks/juice/apple.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/juice/apple.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice/beet.json b/src/generated/resources/data/c/tags/item/drinks/juice/beet.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/juice/beet.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice/carrot.json b/src/generated/resources/data/c/tags/item/drinks/juice/carrot.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/juice/carrot.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice/watermelon.json b/src/generated/resources/data/c/tags/item/drinks/juice/watermelon.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/juice/watermelon.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/magic.json b/src/generated/resources/data/c/tags/item/drinks/magic.json new file mode 100644 index 0000000000..1de113ab8e --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/magic.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:potion", + "#c:drinks/magic/ominous" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/magic/ominous.json b/src/generated/resources/data/c/tags/item/drinks/magic/ominous.json new file mode 100644 index 0000000000..0f2f793e75 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/magic/ominous.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ominous_bottle" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/milk.json b/src/generated/resources/data/c/tags/item/drinks/milk.json new file mode 100644 index 0000000000..899451cb24 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/milk.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:milk_bucket" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/water.json b/src/generated/resources/data/c/tags/item/drinks/water.json new file mode 100644 index 0000000000..c7307d8407 --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/water.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:potion" + ] +} \ No newline at end of file diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index b73ea90053..3e14a4c354 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -386,6 +386,53 @@ public static class Items { public static final TagKey CROPS_PUMPKIN = tag("crops/pumpkin"); public static final TagKey CROPS_SUGAR_CANE = tag("crops/sugar_cane"); public static final TagKey CROPS_WHEAT = tag("crops/wheat"); + + /** + * Drinks are defined as (1) consumable items that (2) use the + * {@linkplain net.minecraft.world.item.ItemUseAnimation#DRINK drink item use animation}, (3) can be consumed regardless the + * player's current hunger, and (4, optional) do not (generally) have a + * {@linkplain net.minecraft.world.food.FoodProperties food component}. + * + *

Categories of drinks, such as Coffee, Tea, or Alcoholic drinks should be placed in a sub-tag, such as + * {@code #c:drinks/coffee}, {@code #c:drinks/tea}, and {@code #c:drinks/alcohol}. + * + *

Specific types of drinks, such as Lattes, Green Tea, and Beer should go in sub-sub-tags using their regular name, + * such as {@code #c:drinks/coffee/latte}, {@code #c:drinks/tea/green_tea}, and {@code #c:drinks/alcohol/beer}. + */ + public static final TagKey DRINKS = tag("drinks"); + /** + * For consumable drinks that are water, or water based (such as potions). + */ + public static final TagKey DRINKS_WATER = tag("drinks/water"); + public static final TagKey DRINKS_MILK = tag("drinks/milk"); + public static final TagKey DRINKS_HONEY = tag("drinks/honey"); + /** + * For consumable drinks that are magic in nature and usually grant at least one + * {@link net.minecraft.world.effect.MobEffect} when consumed. + */ + public static final TagKey DRINKS_MAGIC = tag("drinks/magic"); + /** + * For drinks that always grant the {@linkplain net.minecraft.world.effect.MobEffects#BAD_OMEN Bad Omen} effect. + */ + public static final TagKey DRINKS_MAGIC_OMINOUS = tag("drinks/magic/ominous"); + /** + * Plant based fruit and vegetable juices belong in this tag, for example apple juice and carrot juice. + */ + public static final TagKey DRINKS_JUICE = tag("drinks/juice"); + public static final TagKey DRINKS_JUICE_APPLE = tag("drinks/juice/apple"); + public static final TagKey DRINKS_JUICE_BEET = tag("drinks/juice/beet"); + public static final TagKey DRINKS_JUICE_CARROT = tag("drinks/juice/carrot"); + public static final TagKey DRINKS_JUICE_WATERMELON = tag("drinks/juice/watermelon"); + + /** + * For non-empty bottles that are {@linkplain #DRINKS drinkable}. + */ + public static final TagKey DRINK_CONTAINING_BOTTLE = tag("drink_containing/bottle"); + /** + * For non-empty buckets that are {@linkplain #DRINKS drinkable}. + */ + public static final TagKey DRINK_CONTAINING_BUCKET = tag("drink_containing/bucket"); + public static final TagKey DUSTS = tag("dusts"); public static final TagKey DUSTS_REDSTONE = tag("dusts/redstone"); public static final TagKey DUSTS_GLOWSTONE = tag("dusts/glowstone"); diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index f58c4ce504..52fca4ea30 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java @@ -83,6 +83,23 @@ public void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Items.CROPS_PUMPKIN).add(Items.PUMPKIN); tag(Tags.Items.CROPS_SUGAR_CANE).add(Items.SUGAR_CANE); tag(Tags.Items.CROPS_WHEAT).add(Items.WHEAT); + tag(Tags.Items.DRINKS).addTags( + Tags.Items.DRINKS_WATER, Tags.Items.DRINKS_MILK, Tags.Items.DRINKS_HONEY, + Tags.Items.DRINKS_MAGIC, Tags.Items.DRINKS_MAGIC_OMINOUS, Tags.Items.DRINKS_JUICE, + Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEET, Tags.Items.DRINKS_JUICE_CARROT, + Tags.Items.DRINKS_JUICE_WATERMELON); + tag(Tags.Items.DRINKS_WATER).add(Items.POTION); + tag(Tags.Items.DRINKS_MILK).add(Items.MILK_BUCKET); + tag(Tags.Items.DRINKS_HONEY).add(Items.HONEY_BOTTLE); + tag(Tags.Items.DRINKS_MAGIC).add(Items.POTION).addTags(Tags.Items.DRINKS_MAGIC_OMINOUS); + tag(Tags.Items.DRINKS_MAGIC_OMINOUS).add(Items.OMINOUS_BOTTLE); + tag(Tags.Items.DRINKS_JUICE).addTags( + Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEET, Tags.Items.DRINKS_JUICE_CARROT, + Tags.Items.DRINKS_JUICE_WATERMELON); + tag(Tags.Items.DRINKS_JUICE_APPLE); + tag(Tags.Items.DRINKS_JUICE_BEET); + tag(Tags.Items.DRINKS_JUICE_CARROT); + tag(Tags.Items.DRINKS_JUICE_WATERMELON); addColored(Tags.Items.DYED, "{color}_banner"); addColored(Tags.Items.DYED, "{color}_bed"); addColored(Tags.Items.DYED, "{color}_candle"); diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java index 0b59636061..511fa3d76b 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java @@ -178,6 +178,19 @@ protected void addTranslations() { add(Tags.Items.CROPS_PUMPKIN, "Pumpkin Crops"); add(Tags.Items.CROPS_SUGAR_CANE, "Sugar Cane Crops"); add(Tags.Items.CROPS_WHEAT, "Wheat Crops"); + add(Tags.Items.DRINKS, "Drinks"); + add(Tags.Items.DRINKS_WATER, "Water"); + add(Tags.Items.DRINKS_MILK, "Milk"); + add(Tags.Items.DRINKS_HONEY, "Honey"); + add(Tags.Items.DRINKS_MAGIC, "Magical Drinks"); + add(Tags.Items.DRINKS_MAGIC_OMINOUS, "Ominous Drinks"); + add(Tags.Items.DRINKS_JUICE, "Juice"); + add(Tags.Items.DRINKS_JUICE_APPLE, "Apple Juice"); + add(Tags.Items.DRINKS_JUICE_BEET, "Beet Juice"); + add(Tags.Items.DRINKS_JUICE_CARROT, "Carrot Juice"); + add(Tags.Items.DRINKS_JUICE_WATERMELON, "Watermelon Juice"); + add(Tags.Items.DRINK_CONTAINING_BUCKET, "Drink Containing Buckets"); + add(Tags.Items.DRINK_CONTAINING_BOTTLE, "Drink Containing Bottles"); add(Tags.Items.DUSTS, "Dusts"); add(Tags.Items.DUSTS_GLOWSTONE, "Glowstone Dusts"); add(Tags.Items.DUSTS_REDSTONE, "Redstone Dusts"); From 9f6a704f634f0f9c5eef9779d710757eb945d20f Mon Sep 17 00:00:00 2001 From: TheDeathlyCow Date: Fri, 17 Jan 2025 00:33:00 -1000 Subject: [PATCH 2/6] generate translations --- src/generated/resources/assets/c/lang/en_us.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 2ebb88ffd7..00e95d55b6 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -190,6 +190,19 @@ "tag.item.c.crops.pumpkin": "Pumpkin Crops", "tag.item.c.crops.sugar_cane": "Sugar Cane Crops", "tag.item.c.crops.wheat": "Wheat Crops", + "tag.item.c.drink_containing.bottle": "Drink Containing Bottles", + "tag.item.c.drink_containing.bucket": "Drink Containing Buckets", + "tag.item.c.drinks": "Drinks", + "tag.item.c.drinks.honey": "Honey", + "tag.item.c.drinks.juice": "Juice", + "tag.item.c.drinks.juice.apple": "Apple Juice", + "tag.item.c.drinks.juice.beet": "Beet Juice", + "tag.item.c.drinks.juice.carrot": "Carrot Juice", + "tag.item.c.drinks.juice.watermelon": "Watermelon Juice", + "tag.item.c.drinks.magic": "Magical Drinks", + "tag.item.c.drinks.magic.ominous": "Ominous Drinks", + "tag.item.c.drinks.milk": "Milk", + "tag.item.c.drinks.water": "Water", "tag.item.c.dusts": "Dusts", "tag.item.c.dusts.glowstone": "Glowstone Dusts", "tag.item.c.dusts.redstone": "Redstone Dusts", From 54f3da32d2ab972744a2dda10d2381cb80e3c76a Mon Sep 17 00:00:00 2001 From: TheDeathlyCow Date: Fri, 17 Jan 2025 01:34:59 -1000 Subject: [PATCH 3/6] watery tag; clarify rule 4 of drink definition --- src/generated/resources/assets/c/lang/en_us.json | 1 + src/generated/resources/data/c/tags/item/drinks.json | 1 + .../resources/data/c/tags/item/drinks/water.json | 4 +--- .../resources/data/c/tags/item/drinks/watery.json | 6 ++++++ src/main/java/net/neoforged/neoforge/common/Tags.java | 9 ++++++--- .../data/internal/NeoForgeItemTagsProvider.java | 11 ++++++----- .../data/internal/NeoForgeLanguageProvider.java | 1 + 7 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 src/generated/resources/data/c/tags/item/drinks/watery.json diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 00e95d55b6..5b6ad4fbbd 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -203,6 +203,7 @@ "tag.item.c.drinks.magic.ominous": "Ominous Drinks", "tag.item.c.drinks.milk": "Milk", "tag.item.c.drinks.water": "Water", + "tag.item.c.drinks.watery": "Watery Drinks", "tag.item.c.dusts": "Dusts", "tag.item.c.dusts.glowstone": "Glowstone Dusts", "tag.item.c.dusts.redstone": "Redstone Dusts", diff --git a/src/generated/resources/data/c/tags/item/drinks.json b/src/generated/resources/data/c/tags/item/drinks.json index 8e24d2978c..df8d85c3c1 100644 --- a/src/generated/resources/data/c/tags/item/drinks.json +++ b/src/generated/resources/data/c/tags/item/drinks.json @@ -1,6 +1,7 @@ { "values": [ "#c:drinks/water", + "#c:drinks/watery", "#c:drinks/milk", "#c:drinks/honey", "#c:drinks/magic", diff --git a/src/generated/resources/data/c/tags/item/drinks/water.json b/src/generated/resources/data/c/tags/item/drinks/water.json index c7307d8407..f72d209df7 100644 --- a/src/generated/resources/data/c/tags/item/drinks/water.json +++ b/src/generated/resources/data/c/tags/item/drinks/water.json @@ -1,5 +1,3 @@ { - "values": [ - "minecraft:potion" - ] + "values": [] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/watery.json b/src/generated/resources/data/c/tags/item/drinks/watery.json new file mode 100644 index 0000000000..84b7ac6e1b --- /dev/null +++ b/src/generated/resources/data/c/tags/item/drinks/watery.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:potion", + "#c:drinks/water" + ] +} \ No newline at end of file diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index 3e14a4c354..fda992cd8a 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -390,8 +390,7 @@ public static class Items { /** * Drinks are defined as (1) consumable items that (2) use the * {@linkplain net.minecraft.world.item.ItemUseAnimation#DRINK drink item use animation}, (3) can be consumed regardless the - * player's current hunger, and (4, optional) do not (generally) have a - * {@linkplain net.minecraft.world.food.FoodProperties food component}. + * player's current hunger, and (4, optional) do not (generally) provide nutrition or saturation. * *

Categories of drinks, such as Coffee, Tea, or Alcoholic drinks should be placed in a sub-tag, such as * {@code #c:drinks/coffee}, {@code #c:drinks/tea}, and {@code #c:drinks/alcohol}. @@ -401,9 +400,13 @@ public static class Items { */ public static final TagKey DRINKS = tag("drinks"); /** - * For consumable drinks that are water, or water based (such as potions). + * For consumable drinks that contain only water. */ public static final TagKey DRINKS_WATER = tag("drinks/water"); + /** + * For consumable drinks that are generally watery (such as potions). + */ + public static final TagKey DRINKS_WATERY = tag("drinks/watery"); public static final TagKey DRINKS_MILK = tag("drinks/milk"); public static final TagKey DRINKS_HONEY = tag("drinks/honey"); /** diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 52fca4ea30..6b70587969 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java @@ -84,11 +84,12 @@ public void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Items.CROPS_SUGAR_CANE).add(Items.SUGAR_CANE); tag(Tags.Items.CROPS_WHEAT).add(Items.WHEAT); tag(Tags.Items.DRINKS).addTags( - Tags.Items.DRINKS_WATER, Tags.Items.DRINKS_MILK, Tags.Items.DRINKS_HONEY, - Tags.Items.DRINKS_MAGIC, Tags.Items.DRINKS_MAGIC_OMINOUS, Tags.Items.DRINKS_JUICE, - Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEET, Tags.Items.DRINKS_JUICE_CARROT, - Tags.Items.DRINKS_JUICE_WATERMELON); - tag(Tags.Items.DRINKS_WATER).add(Items.POTION); + Tags.Items.DRINKS_WATER, Tags.Items.DRINKS_WATERY, Tags.Items.DRINKS_MILK, + Tags.Items.DRINKS_HONEY, Tags.Items.DRINKS_MAGIC, Tags.Items.DRINKS_MAGIC_OMINOUS, + Tags.Items.DRINKS_JUICE, Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEET, + Tags.Items.DRINKS_JUICE_CARROT, Tags.Items.DRINKS_JUICE_WATERMELON); + tag(Tags.Items.DRINKS_WATER); + tag(Tags.Items.DRINKS_WATERY).add(Items.POTION).addTags(Tags.Items.DRINKS_WATER); tag(Tags.Items.DRINKS_MILK).add(Items.MILK_BUCKET); tag(Tags.Items.DRINKS_HONEY).add(Items.HONEY_BOTTLE); tag(Tags.Items.DRINKS_MAGIC).add(Items.POTION).addTags(Tags.Items.DRINKS_MAGIC_OMINOUS); diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java index 511fa3d76b..551f86e418 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java @@ -180,6 +180,7 @@ protected void addTranslations() { add(Tags.Items.CROPS_WHEAT, "Wheat Crops"); add(Tags.Items.DRINKS, "Drinks"); add(Tags.Items.DRINKS_WATER, "Water"); + add(Tags.Items.DRINKS_WATERY, "Watery Drinks"); add(Tags.Items.DRINKS_MILK, "Milk"); add(Tags.Items.DRINKS_HONEY, "Honey"); add(Tags.Items.DRINKS_MAGIC, "Magical Drinks"); From 1af85ef0b1543fe0dd28832b36d76171e4deeb86 Mon Sep 17 00:00:00 2001 From: TheDeathlyCow Date: Fri, 17 Jan 2025 01:46:09 -1000 Subject: [PATCH 4/6] remove rule 4 of the drinks tag --- src/main/java/net/neoforged/neoforge/common/Tags.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index fda992cd8a..c4736b3d31 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -390,7 +390,9 @@ public static class Items { /** * Drinks are defined as (1) consumable items that (2) use the * {@linkplain net.minecraft.world.item.ItemUseAnimation#DRINK drink item use animation}, (3) can be consumed regardless the - * player's current hunger, and (4, optional) do not (generally) provide nutrition or saturation. + * player's current hunger. + * + *

Drinks may provide nutrition and saturation, but are not required to do so. * *

Categories of drinks, such as Coffee, Tea, or Alcoholic drinks should be placed in a sub-tag, such as * {@code #c:drinks/coffee}, {@code #c:drinks/tea}, and {@code #c:drinks/alcohol}. From d1d02aad5c21bb232a41c27e9eb34e50559c7567 Mon Sep 17 00:00:00 2001 From: TheDeathlyCow Date: Fri, 17 Jan 2025 01:50:15 -1000 Subject: [PATCH 5/6] fix javadoc typo --- src/main/java/net/neoforged/neoforge/common/Tags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index c4736b3d31..dc640bb005 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -389,7 +389,7 @@ public static class Items { /** * Drinks are defined as (1) consumable items that (2) use the - * {@linkplain net.minecraft.world.item.ItemUseAnimation#DRINK drink item use animation}, (3) can be consumed regardless the + * {@linkplain net.minecraft.world.item.ItemUseAnimation#DRINK drink item use animation}, (3) can be consumed regardless of the * player's current hunger. * *

Drinks may provide nutrition and saturation, but are not required to do so. From 70bfb537cfa0e2f79ea3cbc42a8fac5a4fde1479 Mon Sep 17 00:00:00 2001 From: TheDeathlyCow Date: Sun, 19 Jan 2025 04:20:52 -1000 Subject: [PATCH 6/6] rename juice tag to match vanilla item ids --- src/generated/resources/assets/c/lang/en_us.json | 4 ++-- src/generated/resources/data/c/tags/item/drinks.json | 4 ++-- .../resources/data/c/tags/item/drinks/juice.json | 4 ++-- .../item/drinks/juice/{beet.json => beetroot.json} | 0 .../drinks/juice/{watermelon.json => melon.json} | 0 .../java/net/neoforged/neoforge/common/Tags.java | 4 ++-- .../data/internal/NeoForgeItemTagsProvider.java | 12 ++++++------ .../data/internal/NeoForgeLanguageProvider.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) rename src/generated/resources/data/c/tags/item/drinks/juice/{beet.json => beetroot.json} (100%) rename src/generated/resources/data/c/tags/item/drinks/juice/{watermelon.json => melon.json} (100%) diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 5b6ad4fbbd..1a8148374f 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -196,9 +196,9 @@ "tag.item.c.drinks.honey": "Honey", "tag.item.c.drinks.juice": "Juice", "tag.item.c.drinks.juice.apple": "Apple Juice", - "tag.item.c.drinks.juice.beet": "Beet Juice", + "tag.item.c.drinks.juice.beetroot": "Beet Juice", "tag.item.c.drinks.juice.carrot": "Carrot Juice", - "tag.item.c.drinks.juice.watermelon": "Watermelon Juice", + "tag.item.c.drinks.juice.melon": "Melon Juice", "tag.item.c.drinks.magic": "Magical Drinks", "tag.item.c.drinks.magic.ominous": "Ominous Drinks", "tag.item.c.drinks.milk": "Milk", diff --git a/src/generated/resources/data/c/tags/item/drinks.json b/src/generated/resources/data/c/tags/item/drinks.json index df8d85c3c1..4769dff0d0 100644 --- a/src/generated/resources/data/c/tags/item/drinks.json +++ b/src/generated/resources/data/c/tags/item/drinks.json @@ -8,8 +8,8 @@ "#c:drinks/magic/ominous", "#c:drinks/juice", "#c:drinks/juice/apple", - "#c:drinks/juice/beet", + "#c:drinks/juice/beetroot", "#c:drinks/juice/carrot", - "#c:drinks/juice/watermelon" + "#c:drinks/juice/melon" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice.json b/src/generated/resources/data/c/tags/item/drinks/juice.json index a19f906cf3..748f2bd311 100644 --- a/src/generated/resources/data/c/tags/item/drinks/juice.json +++ b/src/generated/resources/data/c/tags/item/drinks/juice.json @@ -1,8 +1,8 @@ { "values": [ "#c:drinks/juice/apple", - "#c:drinks/juice/beet", + "#c:drinks/juice/beetroot", "#c:drinks/juice/carrot", - "#c:drinks/juice/watermelon" + "#c:drinks/juice/melon" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/drinks/juice/beet.json b/src/generated/resources/data/c/tags/item/drinks/juice/beetroot.json similarity index 100% rename from src/generated/resources/data/c/tags/item/drinks/juice/beet.json rename to src/generated/resources/data/c/tags/item/drinks/juice/beetroot.json diff --git a/src/generated/resources/data/c/tags/item/drinks/juice/watermelon.json b/src/generated/resources/data/c/tags/item/drinks/juice/melon.json similarity index 100% rename from src/generated/resources/data/c/tags/item/drinks/juice/watermelon.json rename to src/generated/resources/data/c/tags/item/drinks/juice/melon.json diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index dc640bb005..81ae72f3a8 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -425,9 +425,9 @@ public static class Items { */ public static final TagKey DRINKS_JUICE = tag("drinks/juice"); public static final TagKey DRINKS_JUICE_APPLE = tag("drinks/juice/apple"); - public static final TagKey DRINKS_JUICE_BEET = tag("drinks/juice/beet"); + public static final TagKey DRINKS_JUICE_BEETROOT = tag("drinks/juice/beetroot"); public static final TagKey DRINKS_JUICE_CARROT = tag("drinks/juice/carrot"); - public static final TagKey DRINKS_JUICE_WATERMELON = tag("drinks/juice/watermelon"); + public static final TagKey DRINKS_JUICE_MELON = tag("drinks/juice/melon"); /** * For non-empty bottles that are {@linkplain #DRINKS drinkable}. diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java index 6b70587969..819a71204b 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeItemTagsProvider.java @@ -86,8 +86,8 @@ public void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Items.DRINKS).addTags( Tags.Items.DRINKS_WATER, Tags.Items.DRINKS_WATERY, Tags.Items.DRINKS_MILK, Tags.Items.DRINKS_HONEY, Tags.Items.DRINKS_MAGIC, Tags.Items.DRINKS_MAGIC_OMINOUS, - Tags.Items.DRINKS_JUICE, Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEET, - Tags.Items.DRINKS_JUICE_CARROT, Tags.Items.DRINKS_JUICE_WATERMELON); + Tags.Items.DRINKS_JUICE, Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEETROOT, + Tags.Items.DRINKS_JUICE_CARROT, Tags.Items.DRINKS_JUICE_MELON); tag(Tags.Items.DRINKS_WATER); tag(Tags.Items.DRINKS_WATERY).add(Items.POTION).addTags(Tags.Items.DRINKS_WATER); tag(Tags.Items.DRINKS_MILK).add(Items.MILK_BUCKET); @@ -95,12 +95,12 @@ public void addTags(HolderLookup.Provider lookupProvider) { tag(Tags.Items.DRINKS_MAGIC).add(Items.POTION).addTags(Tags.Items.DRINKS_MAGIC_OMINOUS); tag(Tags.Items.DRINKS_MAGIC_OMINOUS).add(Items.OMINOUS_BOTTLE); tag(Tags.Items.DRINKS_JUICE).addTags( - Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEET, Tags.Items.DRINKS_JUICE_CARROT, - Tags.Items.DRINKS_JUICE_WATERMELON); + Tags.Items.DRINKS_JUICE_APPLE, Tags.Items.DRINKS_JUICE_BEETROOT, Tags.Items.DRINKS_JUICE_CARROT, + Tags.Items.DRINKS_JUICE_MELON); tag(Tags.Items.DRINKS_JUICE_APPLE); - tag(Tags.Items.DRINKS_JUICE_BEET); + tag(Tags.Items.DRINKS_JUICE_BEETROOT); tag(Tags.Items.DRINKS_JUICE_CARROT); - tag(Tags.Items.DRINKS_JUICE_WATERMELON); + tag(Tags.Items.DRINKS_JUICE_MELON); addColored(Tags.Items.DYED, "{color}_banner"); addColored(Tags.Items.DYED, "{color}_bed"); addColored(Tags.Items.DYED, "{color}_candle"); diff --git a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java index 551f86e418..7fad726bab 100644 --- a/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java +++ b/src/main/java/net/neoforged/neoforge/common/data/internal/NeoForgeLanguageProvider.java @@ -187,9 +187,9 @@ protected void addTranslations() { add(Tags.Items.DRINKS_MAGIC_OMINOUS, "Ominous Drinks"); add(Tags.Items.DRINKS_JUICE, "Juice"); add(Tags.Items.DRINKS_JUICE_APPLE, "Apple Juice"); - add(Tags.Items.DRINKS_JUICE_BEET, "Beet Juice"); + add(Tags.Items.DRINKS_JUICE_BEETROOT, "Beet Juice"); add(Tags.Items.DRINKS_JUICE_CARROT, "Carrot Juice"); - add(Tags.Items.DRINKS_JUICE_WATERMELON, "Watermelon Juice"); + add(Tags.Items.DRINKS_JUICE_MELON, "Melon Juice"); add(Tags.Items.DRINK_CONTAINING_BUCKET, "Drink Containing Buckets"); add(Tags.Items.DRINK_CONTAINING_BOTTLE, "Drink Containing Bottles"); add(Tags.Items.DUSTS, "Dusts");