Brewing recipes #161

Platymemo · 2022-08-05T09:24:41Z

Allows the creation of brewing recipes in a similar fashion to other recipe types.

The three kinds of brewing recipes are quilt:potion_brewing, quilt:custom_potion_brewing, and quilt:potion_item_brewing. potion brewing and custom potion brewing are functionally similar, with the addition that custom potion brewing allows multiple status effects, much like the turtle master potion but without having to register a potion first. potion item brewing is how you transform a regular potion into a splash potion, etc.

This PR also de-hardcodes the potion slots in the brewing stand, having it check a tag, quilt:potions instead.

The base AbstractBrewingRecipe and supporting infrastructure are general enough that they should support a subclass providing recipes on arbitrary item stacks.

Additionally, this PR opens up a brewing stand fuel registry as an item content registry to allow modders and users to easily add new fuels or modify existing ones.

Patbox · 2022-08-05T09:45:04Z

This will break with vanilla clients

oliviathevampire · 2022-08-05T10:05:38Z

This will break with vanilla clients

How does this break vanilla? And is it any better ways?

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/impl/CustomPotionBrewingRecipe.java

Patbox · 2022-08-05T10:08:28Z

If a datapack (or otherwise server side mod) uses that feature, vanilla clients won't be able to join server, as recipe packet will contain recipe type it can't read. QSL and it's datapackable additions should be compatible with vanilla clients

Platymemo · 2022-08-05T20:44:03Z

As the recipe is only used serverside, if we can strip the recipes from being sent to a vanilla client this would work. But... that sounds very hacky.

I'm not familiar at all with Minecraft or Quilt's networking so I don't know if it's possible to detect vanilla clients and strip the recipes if so.

We could just strip them entirely from being sent to clients, but I wouldn't want to do that for recipe integrations in mods like EMI.

Patbox · 2022-08-06T04:40:03Z

It should be possible. Polymer library does that for example https://github.com/Patbox/polymer/blob/dev/1.19.1/polymer/src/main/java/eu/pb4/polymer/mixin/item/packet/SynchronizeRecipesS2CPacketMixin.java#L37

LambdAurora

I saw that the builders extend an impl class, that's not possible.

library/data/recipe/src/main/resources/data/quilt/tags/items/potions.json

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/AbstractBrewingRecipe.java

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/impl/RecipeImpl.java

...data/recipe/src/main/java/org/quiltmc/qsl/recipe/mixin/SynchronizeRecipesS2CPacketMixin.java

Leo40Git

LGTM so far, just some Javadoc nitpicks...

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/AbstractBrewingRecipe.java

.../data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/CustomPotionBrewingRecipe.java

Co-authored-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>

Leo40Git · 2022-08-09T10:58:44Z

312b54e is already a separate PR! (#163)
Please revert it, as it will cause conflicts when 163 is merged.
nevermind I'm dumb

OroArmor

Some package level docs, especially for the different recipe types and their differences would be nice. The rest of the API looks great.

EnnuiL

Seems good! There is just one spot that I feel like it could be improved, however, i'm not sure if it's possible, i might wanna do my own tests

...ary/data/recipe/src/main/java/org/quiltmc/qsl/recipe/mixin/BrewingStandBlockEntityMixin.java

TheGlitch76

I'm not super familiar with this part of Minecraft, so a lot of these questions come from ignorance. Sorry!

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/AbstractBrewingRecipe.java

.../data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/CustomPotionBrewingRecipe.java

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/PotionBrewingRecipe.java

# Conflicts: # library/data/recipe/build.gradle # library/data/recipe/src/main/resources/quilt_recipe.mixins.json # library/item/item_content_registry/src/main/java/org/quiltmc/qsl/item/content/registry/impl/ItemContentRegistriesClientInitializer.java # library/item/item_content_registry/src/main/java/org/quiltmc/qsl/item/content/registry/impl/ItemContentRegistriesInitializer.java # library/item/item_content_registry/src/testmod/resources/data/quilt/attachments/minecraft/item/brewing_fuel_time.json

EnnuiL · 2023-04-12T00:23:42Z

It looks like it's time for a re-reviewing of this PR

EnnuiL

oh dear, i was expecting to bikeshed the API itself a lot, but nope! i only have style complaints (with only one concern about registry stuff);
I am pretty satisfied with the API itself, so it gets an Ennui's Stamp of Approval

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/AbstractBrewingRecipe.java

.../data/recipe/src/main/java/org/quiltmc/qsl/recipe/api/brewing/CustomPotionBrewingRecipe.java

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/impl/RecipeImpl.java

...ary/data/recipe/src/main/java/org/quiltmc/qsl/recipe/mixin/BrewingStandBlockEntityMixin.java

..._registry/src/main/java/org/quiltmc/qsl/item/content/registry/api/ItemContentRegistries.java

...n/java/org/quiltmc/qsl/item/setting/mixin/recipe_remainder/BrewingStandBlockEntityMixin.java

...tem_setting/src/testmod/java/org/quiltmc/qsl/item/test/mixin/BrewingRecipeRegistryMixin.java

Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

OroArmor

We should get this into FCP soon

LambdAurora · 2023-04-21T23:11:25Z

...a/recipe/src/main/java/org/quiltmc/qsl/recipe/mixin/RecipeSynchronizationS2CPacketMixin.java

+
+import org.quiltmc.qsl.recipe.impl.RecipeImpl;
+
+// TODO Conditionally remove only for vanilla clients


This really need to be considered ASAP because of mods like EMI.

PR #298 is something to keep an eye into, since it might help with that

OroArmor · 2023-08-31T06:36:30Z

We should get this into FCP soon

4 months later...

Platymemo added 3 commits August 5, 2022 01:10

brewing fuel registry

0d973e0

quilt brewing recipes

b834560

Merge remote-tracking branch 'QuiltMC/1.19' into 1.19+brewing_recipes

8cf04c8

Leo40Git suggested changes Aug 5, 2022

View reviewed changes

library/data/recipe/src/main/java/org/quiltmc/qsl/recipe/impl/CustomPotionBrewingRecipe.java Outdated Show resolved Hide resolved

fix incompatibility with vanilla clients

a00e0fa

Platymemo added 3 commits August 5, 2022 21:34

test brewing recipe

d5789d4

brewing recipes ready for review

8b845fc

Merge remote-tracking branch 'QuiltMC/1.19' into 1.19+brewing_recipes

e55b31d

Platymemo marked this pull request as ready for review August 6, 2022 11:23

Platymemo requested a review from a team August 6, 2022 11:23

Platymemo requested a review from a team as a code owner August 6, 2022 11:23

Platymemo added 2 commits August 6, 2022 03:27

quick fix

e205201

apply licenses

40b60f5

LambdAurora requested changes Aug 6, 2022

View reviewed changes

EnnuiL added enhancement New feature or request library: item Related to the item library. library: data Related to the data library. t: new api This adds a new API. labels Aug 6, 2022

apply suggestions

c42ad20

Platymemo requested a review from LambdAurora August 6, 2022 22:52

Leo40Git approved these changes Aug 7, 2022

View reviewed changes

Platymemo and others added 3 commits August 9, 2022 01:41

Apply javadoc suggestions

3581671

Co-authored-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>

Extend max values for brewing fuel and brew time

312b54e

missed a suggestion

1b642b5

Co-authored-by: ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com>

Clear brewing ingredients on reload

36424a4

OroArmor approved these changes Sep 4, 2022

View reviewed changes

Platymemo added 3 commits September 6, 2022 23:09

dont crash with vanilla recipes

de4faf0

fix potion villager trades

fb046cb

brewing docs

f072fd3

EnnuiL added s: waiting for test This pull request is waiting to be tested, the PR cannot be put in FCP until it has been tested. and removed enhancement New feature or request labels Sep 10, 2022

EnnuiL approved these changes Sep 10, 2022

View reviewed changes

...ary/data/recipe/src/main/java/org/quiltmc/qsl/recipe/mixin/BrewingStandBlockEntityMixin.java Outdated Show resolved Hide resolved

Platymemo added 2 commits September 12, 2022 14:43

more compatible mixin

0ac3b3a

deduplicate recipe match checks

bf63a47

TheGlitch76 requested changes Sep 25, 2022

View reviewed changes

Platymemo added 2 commits March 31, 2023 15:17

update brewing recipes

984d0a5

Platymemo changed the base branch from 1.19 to 1.19.4 April 1, 2023 03:08

EnnuiL requested review from TheGlitch76 and EnnuiL April 12, 2023 00:23

Merge branch '1.19.4' into brewing-recipes

9d77336

TheGlitch76 approved these changes Apr 12, 2023

View reviewed changes

EnnuiL suggested changes Apr 12, 2023

View reviewed changes

Platymemo and others added 3 commits April 13, 2023 15:01

Apply suggestions from code review

f19b914

Co-authored-by: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com>

move recipe serializer registration to onInitialize

56260fb

move brewing recipes to the quilt namespace

80d2d31

EnnuiL approved these changes Apr 16, 2023

View reviewed changes

OroArmor approved these changes Apr 21, 2023

View reviewed changes

LambdAurora reviewed Apr 21, 2023

View reviewed changes

Merge branch '1.19.4' into brewing-recipes

ce54b86

TheGlitch76 added s: outdated This pull request is outdated. and removed s: waiting for test This pull request is waiting to be tested, the PR cannot be put in FCP until it has been tested. labels Sep 15, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Brewing recipes #161

Brewing recipes #161

Platymemo commented Aug 5, 2022 •

edited

Patbox commented Aug 5, 2022

oliviathevampire commented Aug 5, 2022

Patbox commented Aug 5, 2022

Platymemo commented Aug 5, 2022 •

edited

Patbox commented Aug 6, 2022

LambdAurora left a comment

Leo40Git left a comment

Leo40Git commented Aug 9, 2022 •

edited

OroArmor left a comment

EnnuiL left a comment

TheGlitch76 left a comment

EnnuiL commented Apr 12, 2023

EnnuiL left a comment

OroArmor left a comment

LambdAurora Apr 21, 2023

EnnuiL May 13, 2023

OroArmor commented Aug 31, 2023


		import org.quiltmc.qsl.recipe.impl.RecipeImpl;

		// TODO Conditionally remove only for vanilla clients

Brewing recipes #161

Are you sure you want to change the base?

Brewing recipes #161

Conversation

Platymemo commented Aug 5, 2022 • edited

Patbox commented Aug 5, 2022

oliviathevampire commented Aug 5, 2022

Patbox commented Aug 5, 2022

Platymemo commented Aug 5, 2022 • edited

Patbox commented Aug 6, 2022

LambdAurora left a comment

Choose a reason for hiding this comment

Leo40Git left a comment

Choose a reason for hiding this comment

Leo40Git commented Aug 9, 2022 • edited

OroArmor left a comment

Choose a reason for hiding this comment

EnnuiL left a comment

Choose a reason for hiding this comment

TheGlitch76 left a comment

Choose a reason for hiding this comment

EnnuiL commented Apr 12, 2023

EnnuiL left a comment

Choose a reason for hiding this comment

OroArmor left a comment

Choose a reason for hiding this comment

LambdAurora Apr 21, 2023

Choose a reason for hiding this comment

EnnuiL May 13, 2023

Choose a reason for hiding this comment

OroArmor commented Aug 31, 2023

Platymemo commented Aug 5, 2022 •

edited

Platymemo commented Aug 5, 2022 •

edited

Leo40Git commented Aug 9, 2022 •

edited