mirror of
https://github.com/FabricMC/fabric.git
synced 2025-04-08 21:14:41 -04:00
Add more c
fluid tags (#4134)
* Add more `c` fluid tags * fixed a javadoc * Cleaned up javadoc * checkstyle * removed space * Adjust experience rate to more reasonable amount * explain perfect extractions * fixed javadoc
This commit is contained in:
parent
487ccc21c8
commit
dde8f6bb9c
12 changed files with 91 additions and 0 deletions
fabric-convention-tags-v2/src
datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators
generated/resources
assets/fabric-convention-tags-v2/lang
data/c/tags/fluid
main/java/net/fabricmc/fabric/api/tag/convention/v2
fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/api/transfer/v1/fluid
|
@ -346,6 +346,13 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
|
|||
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
|
||||
|
|
|
@ -38,6 +38,13 @@ public final class FluidTagGenerator extends FabricTagProvider.FluidTagProvider
|
|||
.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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"values": []
|
||||
}
|
|
@ -27,15 +27,63 @@ import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration;
|
|||
* <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 lava 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.
|
||||
*/
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue