diff --git a/src/generated/resources/assets/c/lang/en_us.json b/src/generated/resources/assets/c/lang/en_us.json index 43dee5f6de..85eb587f88 100644 --- a/src/generated/resources/assets/c/lang/en_us.json +++ b/src/generated/resources/assets/c/lang/en_us.json @@ -300,7 +300,7 @@ "tag.item.c.player_workstations.crafting_tables": "Crafting Tables", "tag.item.c.player_workstations.furnaces": "Furnaces", "tag.item.c.potions": "Potions", - "tag.item.c.potions.bottled": "Bottled Potions", + "tag.item.c.potions.bottle": "Bottle Potions", "tag.item.c.raw_materials": "Raw Materials", "tag.item.c.raw_materials.copper": "Copper Raw Materials", "tag.item.c.raw_materials.gold": "Gold Raw Materials", diff --git a/src/generated/resources/data/c/tags/item/potions.json b/src/generated/resources/data/c/tags/item/potions.json index 79f7396e7c..139353d5ad 100644 --- a/src/generated/resources/data/c/tags/item/potions.json +++ b/src/generated/resources/data/c/tags/item/potions.json @@ -1,5 +1,5 @@ { "values": [ - "#c:potions/bottled" + "#c:potions/bottle" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/potions/bottled.json b/src/generated/resources/data/c/tags/item/potions/bottle.json similarity index 100% rename from src/generated/resources/data/c/tags/item/potions/bottled.json rename to src/generated/resources/data/c/tags/item/potions/bottle.json diff --git a/src/main/java/net/neoforged/neoforge/common/Tags.java b/src/main/java/net/neoforged/neoforge/common/Tags.java index fded293483..f19f41486f 100644 --- a/src/main/java/net/neoforged/neoforge/common/Tags.java +++ b/src/main/java/net/neoforged/neoforge/common/Tags.java @@ -562,14 +562,14 @@ public static class Items { /** * Items that can hold various potion effects similar to how potion bottles do. * Contents of this tag may not always be a kind of bottle. Buckets of potions could go here. - * The subtags would be the verb form of the container such as `c:potions/bucketed` or `c:potions/vialed` + * The subtags would be the name of the container that is holding the potion effects such as `c:potions/bucket` or `c:potions/vial` as examples. */ public static final TagKey POTIONS = tag("potions"); /** * Variations of the potion bottle that can hold various effects. Examples are splash and lingering potions from vanilla. * If a mod adds a new variant like a seeking potion that applies effect to the closest entity at impact, that would in this tag. */ - public static final TagKey POTION_BOTTLED = tag("potions/bottled"); + public static final TagKey POTION_BOTTLE = tag("potions/bottle"); public static final TagKey RAW_MATERIALS = tag("raw_materials"); public static final TagKey RAW_MATERIALS_COPPER = tag("raw_materials/copper"); public static final TagKey RAW_MATERIALS_GOLD = tag("raw_materials/gold"); 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 c329018f3d..bc82fc8775 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 @@ -196,8 +196,8 @@ public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE); copy(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES); copy(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES); - tag(Tags.Items.POTION_BOTTLED).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); - tag(Tags.Items.POTIONS).addTags(Tags.Items.POTION_BOTTLED); + tag(Tags.Items.POTION_BOTTLE).add(Items.POTION, Items.SPLASH_POTION, Items.LINGERING_POTION); + tag(Tags.Items.POTIONS).addTags(Tags.Items.POTION_BOTTLE); tag(Tags.Items.RAW_MATERIALS).addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON); tag(Tags.Items.RAW_MATERIALS_COPPER).add(Items.RAW_COPPER); tag(Tags.Items.RAW_MATERIALS_GOLD).add(Items.RAW_GOLD); 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 eceee11233..b9c6fd5538 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 @@ -275,7 +275,7 @@ protected void addTranslations() { add(Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); add(Tags.Items.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); add(Tags.Items.POTIONS, "Potions"); - add(Tags.Items.POTION_BOTTLED, "Bottled Potions"); + add(Tags.Items.POTION_BOTTLE, "Bottle Potions"); add(Tags.Items.RAW_MATERIALS, "Raw Materials"); add(Tags.Items.RAW_MATERIALS_COPPER, "Copper Raw Materials"); add(Tags.Items.RAW_MATERIALS_GOLD, "Gold Raw Materials");