Skip to content

Commit

Permalink
Changed potion verb to noun
Browse files Browse the repository at this point in the history
  • Loading branch information
TelepathicGrunt committed Oct 14, 2024
1 parent 014e046 commit 2a2e44f
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/generated/resources/assets/c/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/data/c/tags/item/potions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"values": [
"#c:potions/bottled"
"#c:potions/bottle"
]
}
4 changes: 2 additions & 2 deletions src/main/java/net/neoforged/neoforge/common/Tags.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Item> 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<Item> POTION_BOTTLED = tag("potions/bottled");
public static final TagKey<Item> POTION_BOTTLE = tag("potions/bottle");
public static final TagKey<Item> RAW_MATERIALS = tag("raw_materials");
public static final TagKey<Item> RAW_MATERIALS_COPPER = tag("raw_materials/copper");
public static final TagKey<Item> RAW_MATERIALS_GOLD = tag("raw_materials/gold");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 2a2e44f

Please sign in to comment.