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.

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 more c fluid tags #4134

Open
wants to merge 7 commits into
base: 1.21.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,13 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalFluidTags.WATER, "Water");
translationBuilder.add(ConventionalFluidTags.MILK, "Milk");
translationBuilder.add(ConventionalFluidTags.HONEY, "Honey");
translationBuilder.add(ConventionalFluidTags.GASEOUS, "Gaseous");
translationBuilder.add(ConventionalFluidTags.EXPERIENCE, "Experience");
translationBuilder.add(ConventionalFluidTags.POTION, "Potion");
translationBuilder.add(ConventionalFluidTags.SUSPICIOUS_STEW, "Suspicious Stew");
translationBuilder.add(ConventionalFluidTags.MUSHROOM_STEW, "Mushroom Stew");
translationBuilder.add(ConventionalFluidTags.RABBIT_STEW, "Rabbit Stew");
translationBuilder.add(ConventionalFluidTags.BEETROOT_SOUP, "Beetroot Soup");
translationBuilder.add(ConventionalFluidTags.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers");

// Structures
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {
.addOptionalTag(FluidTags.LAVA);
getOrCreateTagBuilder(ConventionalFluidTags.MILK);
getOrCreateTagBuilder(ConventionalFluidTags.HONEY);
getOrCreateTagBuilder(ConventionalFluidTags.GASEOUS);
getOrCreateTagBuilder(ConventionalFluidTags.EXPERIENCE);
getOrCreateTagBuilder(ConventionalFluidTags.POTION);
getOrCreateTagBuilder(ConventionalFluidTags.SUSPICIOUS_STEW);
getOrCreateTagBuilder(ConventionalFluidTags.MUSHROOM_STEW);
getOrCreateTagBuilder(ConventionalFluidTags.RABBIT_STEW);
getOrCreateTagBuilder(ConventionalFluidTags.BEETROOT_SOUP);
getOrCreateTagBuilder(ConventionalFluidTags.HIDDEN_FROM_RECIPE_VIEWERS);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,17 @@
"tag.entity_type.c.capturing_not_supported": "Capturing Not Supported",
"tag.entity_type.c.minecarts": "Minecarts",
"tag.entity_type.c.teleporting_not_supported": "Teleporting Not Supported",
"tag.fluid.c.beetroot_soup": "Beetroot Soup",
"tag.fluid.c.experience": "Experience",
"tag.fluid.c.gaseous": "Gaseous",
"tag.fluid.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
"tag.fluid.c.honey": "Honey",
"tag.fluid.c.lava": "Lava",
"tag.fluid.c.milk": "Milk",
"tag.fluid.c.mushroom_stew": "Mushroom Stew",
"tag.fluid.c.potion": "Potion",
"tag.fluid.c.rabbit_stew": "Rabbit Stew",
"tag.fluid.c.suspicious_stew": "Suspicious Stew",
"tag.fluid.c.water": "Water",
"tag.item.c.animal_foods": "Animal Foods",
"tag.item.c.armors": "Armors",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"values": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,63 @@
* <p></p>
* Note, fluid tags should not be plural to match the vanilla standard.
* This is the only tag category exempted from many-different-types plural rule.
*
* <p>(See {@link net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants} for the correct droplet rates for containers)
*/
public final class ConventionalFluidTags {
private ConventionalFluidTags() {
}

/**
* Holds all fluids related to water without the behaviors attached to the vanilla lava fluid tag.
*/
public static final TagKey<Fluid> LAVA = register("lava");
/**
* Holds all fluids related to water without the behaviors attached to the vanilla water fluid tag.
*/
public static final TagKey<Fluid> WATER = register("water");
/**
* Holds all fluids related to milk.
*/
public static final TagKey<Fluid> MILK = register("milk");
/**
* Holds all fluids related to honey.
*/
public static final TagKey<Fluid> HONEY = register("honey");
/**
* Holds all fluids that are gaseous at room temperature.
*/
public static final TagKey<Fluid> GASEOUS = register("gaseous");
/**
* Holds all fluids related to experience.
*
* <p>(Standard unit for experience is 810 droplet per 1 experience. However, extraction from Bottle o' Enchanting should yield 27000 droplets while smashing yields less)
*/
public static final TagKey<Fluid> EXPERIENCE = register("experience");
/**
* Holds all fluids related to potions. The effects of the potion fluid should be read from Data Components.
* The effects and color of the potion fluid should be read from {@link net.minecraft.component.DataComponentTypes#POTION_CONTENTS}
* component that people should be attaching to the FluidVariant of this fluid.
*/
public static final TagKey<Fluid> POTION = register("potion");
/**
* Holds all fluids related to Suspicious Stew.
* The effects of the suspicious stew fluid should be read from {@link net.minecraft.component.DataComponentTypes#SUSPICIOUS_STEW_EFFECTS}
* component that people should be attaching to the FluidVariant of this fluid.
*/
public static final TagKey<Fluid> SUSPICIOUS_STEW = register("suspicious_stew");
/**
* Holds all fluids related to Mushroom Stew.
*/
public static final TagKey<Fluid> MUSHROOM_STEW = register("mushroom_stew");
/**
* Holds all fluids related to Rabbit Stew.
*/
public static final TagKey<Fluid> RABBIT_STEW = register("rabbit_stew");
/**
* Holds all fluids related to Beetroot Soup.
*/
public static final TagKey<Fluid> BEETROOT_SOUP = register("beetroot_soup");
/**
* Tag that holds all fluids that recipe viewers should not show to users.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public final class FluidConstants {
///////////////////////////
public static final long BUCKET = 81000;
public static final long BOTTLE = 27000;
public static final long BOWL = 27000;
public static final long BLOCK = 81000;
public static final long INGOT = 9000;
public static final long NUGGET = 1000;
Expand Down
Loading