add recipes to empty teapots (hot or cold) #58

jshipley · 2024-10-15T22:54:49Z

Added two new items:

Cup of Hot Water -> consumable like tea, but doesn't have any benefit
Cup of Frothed Milk -> not as filling as hot cocoa, and will remove one status effect like milk (regardless of cocoa configuration)

Also added several new recipes:

Crafting unheated water or milk teapot with an empty bucket will transfer the milk/water to the bucket
Crafting hot water or frothed milk teapot with teacup will give cup of hot water or cup of frothed milk
Tea / cocoa recipes can be crafted with cup of hot water / frothed milk as well as with heated teapots.

Closes #47

Happy Modtober 2024!

close KnightMiner#47

KnightMiner · 2024-10-16T02:59:00Z

src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java

+											 .requires(teapot_water)
+											 .requires(Items.BUCKET)
+											 .unlockedBy("has_item", has(teapot_water))
+											 .save(consumer, "water_bucket_from_teapot");


Recipes should never go under minecraft. they should be under simplytea. If there is no resource location parameter set the namespace as a string, simplytea:water_bucket_from_teapot

All recipes are going into the simplytea namespace now.

KnightMiner · 2024-10-16T03:00:53Z

src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java

@@ -155,7 +172,7 @@ private static void addTea(Consumer<FinishedRecipe> consumer, ItemLike filledCup
 			builder.requires(ingredient);
 		}
 		builder.unlockedBy("has_bag", has(ingredients[0]));
-		builder.save(consumer);
+		builder.save(consumer, filledCup.toString() + "_" + ingredients[ingredients.length-1].toString());


Don't use toString, that is very unreliable and I don't believe it includes the namespace. Get the registry ID, see suffix above. We probably don't need the namespace for the "from" part, just need to make sure the recipes are actually under simplytea. That, or just simply the logic by passing in a String suffix parameter. e.g.:

builder.save(consumer, suffix(filledCup, + "_from_" + suffix).toString())

and pass in "cup" or "teapot" as needed.

Using "_from_cup" or "_from_tea" suffix now.

KnightMiner · 2024-10-16T03:01:21Z

src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java


 		// advanced tea
 		addTea(consumer, cup_cocoa, Items.COCOA_BEANS, Items.COCOA_BEANS, teapot_frothed);
+		addTea(consumer, cup_cocoa, Items.COCOA_BEANS, cup_frothed);


Why is this just 1 cocoa beans instead of 2? 1 cup milk + 2 cocoa = 1 cup cocoa.

Added second cocoa bean to cocoa from cup recipe.

KnightMiner · 2024-10-16T03:08:01Z

src/main/java/knightminer/simplytea/item/CocoaItem.java

@@ -29,16 +30,17 @@ public CocoaItem(Properties props) {

 	@Override
 	public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity living) {
+		boolean isMilk = stack.is(Registration.cup_frothed);


I don't like having to special case this. Lets instead make the CocoaItem constructor take in a CocoaDrink parameter, then use that field instead of a static reference through config. Will let you pass in the proper drink for each of cocoa and milk

Since the CocoaDrink config was already being passed in as FoodProperties, I used that in CocoaItem instead (similar to how it was already used in TeaCupItem).

KnightMiner · 2024-10-16T03:10:10Z

src/main/java/knightminer/simplytea/data/gen/RecipeGenerator.java


 		// advanced tea
 		addTea(consumer, cup_cocoa, Items.COCOA_BEANS, Items.COCOA_BEANS, teapot_frothed);
+		addTea(consumer, cup_cocoa, Items.COCOA_BEANS, cup_frothed);
 		addHoney(consumer, RecipeCategory.FOOD, cup_cocoa, tea_stick, CocoaItem.CINNAMON_TAG);
 		addTea(consumer, cup_tea_chai, teabag_black, tea_stick, teapot_frothed);


Iced tea and chai both are not added using the helper above, so they need their hot water cup recipes here like you did with cocoa.

It looks like iced tea doesn't even need a teapot at all. The recipe is just a cup, teabag, apple, and ice cubes.

Huh, that doesn't seem right. I need to remember my reasoning for that. It might just be a bug as I could not use the helper with the tag.

I'll consider whether it should have a pot in the recipe after this PR is finished.

I added the cup recipe for chai.

Another recipe that you could consider is frothed milk with cinnamon. I wasn't sure whether it made sense or not as hot water and frothed milk are supposed to be much less useful than the actual teas or cocoa, but it would be useful for frothed milk to also have the option to clear all status effects instead of just one.

Frothed milk with cinnamon seems like something someone would drink. So sure, why not.

KnightMiner · 2024-10-16T03:12:19Z

src/main/java/knightminer/simplytea/core/Registration.java

      cup_cocoa = register(r, new CocoaItem(props.food(Config.SERVER.cocoa)), "cup_cocoa");
+      cup_frothed = register(r, new CocoaItem(props.food(Config.SERVER.cocoa)), "cup_frothed");


this should be frothed_milk, not cocoa. Also, like I suggested in CocoaItem, lets pass in Config.SERVER.cocoa/Config.SERVER.frothed_milk to the constructor parameter so we have cure effect properties.

I thought I had already caught and changed that. Maybe I didn't push in the change. It's fixed now.

KnightMiner · 2024-10-16T03:21:13Z

Overall a great start. Most of the comments are some namespacing issues with the recipes, and a couple of recipes you missed adding.

Cup of Frothed Milk -> not as filling as hot cocoa, and will remove one status effect like milk (regardless of cocoa configuration).

I left some comments, but it should definitely have its own config, just a different default.

Lets default cocoa to "clear a random positive effect" and default milk to "clear a random effect, positive or negative".

Should also have low food values, since there is no milking delay so milk is a nearly free food source; its the cocoa beans that make hot cocoa restore most of its hunger.

Crafting unheated water or milk teapot with an empty bucket will transfer the milk/water to the bucket

I'm not sure I like this recipe. I think I'd rather just treat the filled pots as "fluid handler items" and support emptying them into tanks, so it be the domain of #46.

You could also let the player just dump out a filled but not hot teapot by right clicking a block with it. No need to place a fluid, but play a nice sound like dumping a bucket (and if you want to be very fancy, throw in some water/milk particles). Should require the player to be sneaking to do so. At that point, sneak+right click could dump a hot teapot too. Note there is a good chance this feature would conflict with #57 as both require adding a class for filled not-hot teapots.

Tea / cocoa recipes can be crafted with cup of hot water / frothed milk as well as with heated teapots.

I like this idea, just make sure all the recipes are the same (you were missing a couple, and cooca had too few beans, I don't want a discount because you used a cup or used a pot).

…cipes

jshipley · 2024-10-18T17:53:04Z

This will need #57 to completely work, so I'm going to convert it into a draft until that's complete and merged in.

The recipe are cleaned up, frothed milk is set up with a config, and teapots can be dumped. I even added new splash particles for the milk.

jshipley · 2024-11-01T01:55:10Z

1.20 branch merged in (including #57), and frothed milk with cinnamon recipe added

add recipes to empty teapots (hot or cold)

95c44f4

close KnightMiner#47

KnightMiner reviewed Oct 16, 2024

View reviewed changes

jshipley mentioned this pull request Oct 17, 2024

Allow teapots to be filled from fluid containers, and allow milk pickup #57

Merged

jshipley added 3 commits October 17, 2024 01:15

Fixed recipe namespaces, added missing recipes, and dropped bucket re…

2a46caa

…cipes

Improve frothed milk config

8128e60

Add new config for frothed milk, and allow unheated teapots to be dumped

f9f37b5

jshipley marked this pull request as draft October 18, 2024 17:49

jshipley added 3 commits October 18, 2024 14:14

Add new simple class for cold teapots that supports dumping contents.

cffd959

Merge branch '1.20' into empty_teapots

41a095b

add frothed milk with cinnamon recipe

522616d

jshipley marked this pull request as ready for review November 1, 2024 01:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add recipes to empty teapots (hot or cold) #58

add recipes to empty teapots (hot or cold) #58

jshipley commented Oct 15, 2024

KnightMiner Oct 16, 2024

jshipley Oct 18, 2024

KnightMiner Oct 16, 2024 •

edited

Loading

jshipley Oct 18, 2024

KnightMiner Oct 16, 2024

jshipley Oct 18, 2024

KnightMiner Oct 16, 2024 •

edited

Loading

jshipley Oct 18, 2024

KnightMiner Oct 16, 2024

jshipley Oct 17, 2024

KnightMiner Oct 17, 2024

jshipley Oct 18, 2024

KnightMiner Oct 18, 2024

KnightMiner Oct 16, 2024

jshipley Oct 18, 2024

KnightMiner commented Oct 16, 2024 •

edited

Loading

jshipley commented Oct 18, 2024

jshipley commented Nov 1, 2024

		cup_cocoa = register(r, new CocoaItem(props.food(Config.SERVER.cocoa)), "cup_cocoa");
		cup_frothed = register(r, new CocoaItem(props.food(Config.SERVER.cocoa)), "cup_frothed");

add recipes to empty teapots (hot or cold) #58

Are you sure you want to change the base?

add recipes to empty teapots (hot or cold) #58

Conversation

jshipley commented Oct 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KnightMiner Oct 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KnightMiner Oct 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

KnightMiner commented Oct 16, 2024 • edited Loading

jshipley commented Oct 18, 2024

jshipley commented Nov 1, 2024

KnightMiner Oct 16, 2024 •

edited

Loading

KnightMiner Oct 16, 2024 •

edited

Loading

KnightMiner commented Oct 16, 2024 •

edited

Loading