diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index 976f9f80ab..b7c8262f91 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -254,6 +254,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.BERRY_FOODS, "Berries"); translationBuilder.add(ConventionalItemTags.BREAD_FOODS, "Breads"); translationBuilder.add(ConventionalItemTags.COOKIE_FOODS, "Cookies"); + translationBuilder.add(ConventionalItemTags.DOUGH_FOODS, "Doughs"); translationBuilder.add(ConventionalItemTags.RAW_MEAT_FOODS, "Raw Meats"); translationBuilder.add(ConventionalItemTags.COOKED_MEAT_FOODS, "Cooked Meats"); translationBuilder.add(ConventionalItemTags.RAW_FISH_FOODS, "Raw Fishes"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 0573795abd..1bf589e8ae 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -274,6 +274,8 @@ private void generateFoodTags() { .add(Items.COOKIE) .addOptionalTag(ConventionalItemTags.COOKIES_FOODS); + getOrCreateTagBuilder(ConventionalItemTags.DOUGH_FOODS); + getOrCreateTagBuilder(ConventionalItemTags.RAW_MEAT_FOODS) .add(Items.BEEF) .add(Items.PORKCHOP) @@ -367,6 +369,7 @@ private void generateFoodTags() { .addOptionalTag(ConventionalItemTags.BERRY_FOODS) .addOptionalTag(ConventionalItemTags.BREAD_FOODS) .addOptionalTag(ConventionalItemTags.COOKIE_FOODS) + .addOptionalTag(ConventionalItemTags.DOUGH_FOODS) .addOptionalTag(ConventionalItemTags.RAW_MEAT_FOODS) .addOptionalTag(ConventionalItemTags.RAW_FISH_FOODS) .addOptionalTag(ConventionalItemTags.COOKED_MEAT_FOODS) diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json index 2dc4ef6aa7..d3c85208d2 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json @@ -256,6 +256,7 @@ "tag.item.c.foods.cooked_meats": "Cooked Meats", "tag.item.c.foods.cookie": "Cookies", "tag.item.c.foods.cookies": "Cookies", + "tag.item.c.foods.dough": "Doughs", "tag.item.c.foods.edible_when_placed": "Edible When Placed", "tag.item.c.foods.food_poisoning": "Food Poisoning", "tag.item.c.foods.fruit": "Fruits", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods.json index 11a1cb7534..8e134fcc49 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods.json @@ -25,6 +25,10 @@ "id": "#c:foods/cookie", "required": false }, + { + "id": "#c:foods/dough", + "required": false + }, { "id": "#c:foods/raw_meat", "required": false diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/dough.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/dough.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/dough.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 74e24836ae..9328269ccb 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -188,6 +188,20 @@ private ConventionalItemTags() { public static final TagKey BERRY_FOODS = register("foods/berry"); public static final TagKey BREAD_FOODS = register("foods/bread"); public static final TagKey COOKIE_FOODS = register("foods/cookie"); + /** + * For all doughs regardless of type, specific types of dough should fall under their respective sub-tag.
+ * For example:
+ * - Wheat dough (which generally results in bread) would go in "#c:foods/dough/wheat"
+ * - Rye dough (which has rye as it's main ingredient) would go in "#c:foods/dough/rye"
+ * - Sub-tags should also be added to this tag, for example: "#c:foods/dough/wheat" should be added to "#c:foods/dough"
+ *
+ * There are some important assumptions that should be kept in mind.
+ * - It is assumed that "1 dough = result", which in the case of wheat dough would be "1 dough = 1 bread"
+ * - It is assumed that this dough can be baked into another item
+ * - It is *not* assumed that all doughs result in bread, there can be doughs in this tag that result in things like pizza, etc. + * This means that this tag should *not* be used for furnace recipes, mods should add their own dough to result recipes for their respective items. + */ + public static final TagKey DOUGH_FOODS = register("foods/dough"); public static final TagKey RAW_MEAT_FOODS = register("foods/raw_meat"); public static final TagKey COOKED_MEAT_FOODS = register("foods/cooked_meat"); public static final TagKey RAW_FISH_FOODS = register("foods/raw_fish");