Support stack aware recipe remainders 1.19.2 #2556

AlphaMode · 2022-09-27T20:18:38Z

This PR allows modders to add stack aware recipe remainders
This is useful for mods that adds custom buckets that support different fluids

This address the long lasting issue #50

Reopened from #2464

…v1/FabricItem.java Co-authored-by: apple502j <[email protected]>

…/RecipeRemainderHandler.java Co-authored-by: Technici4n <[email protected]>

…tem/CustomDamageTest.java Co-authored-by: Salvatore Peluso <[email protected]>

…m/AbstractFurnaceBlockEntityMixin.java Co-authored-by: Salvatore Peluso <[email protected]>

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

…v1/FabricItem.java Co-authored-by: Technici4n <[email protected]>

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java

fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java

Technici4n

A few extra things I noticed while reviewing the PR, but nothing major. This is looking pretty good!

...tem-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java

...c-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/RecipeMixin.java

devpelux

For other things i've tested and it works great.

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

…v1/FabricItemStack.java Co-authored-by: Technici4n <[email protected]>

…v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]>

…maining

modmuss50

The API and changes look great just a few nit picks. Nice work 👍

However I think extra care needs to be taken with this PR to help ensure that existing behaviour is not altered. This PR has some very delicate mixins touching some very delicate parts of the game. Updating to newer MC will have a good chance at silently breaking this logic.

Unlike some other hooks that clearly can only affect the behavour when mods are being used this has a high possibility of changing vanilla behavour when only fabric API is installed.

I hope you don't mind but I have added a gametest that fully tests the furnace part of this PR. It would be great to see the same done for the brewing stand and possibly the recipe (Will need a different approach) to help ensure the stability of this when going to newer MC versions.

Thanks a lot, let me know if you have any questions.

...tem-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java

fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java

...c-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java

...tem-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

...c-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java

...ding-api-v1/src/testmod/java/net/fabricmc/fabric/test/client/keybinding/KeyBindingsTest.java

…maining

…e remainder stack instead of the original stack, refactoring.

…metest compairing stacks with themselves.

devpelux · 2022-10-14T20:54:21Z

I've added the remaining tests for brewing stand and recipe, please check them 👍

AlphaMode#2

Add automatized gametests for brewing stand and recipe mixins, fixed and tweaked something.

Use (0,1,0) position for game tests

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java

...c-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java

...tem-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecipeRemainderHandler.java

* Support stack aware recipe remainders * Fix checkstyle * Remove all overwrites * Add FabricItemStack and make RecipeRemainderHandler thread safe * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecipeRemainderHandler.java Co-authored-by: Technici4n <[email protected]> * Remove hasRecipeRemainder, Update test mod and remove unneeded mixins * Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Co-authored-by: Salvatore Peluso <[email protected]> * Avoid copying the ItemStack * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java Co-authored-by: Salvatore Peluso <[email protected]> * Sneakily change duplicate keybinding to a less used key * make everything thread safe and improve AbstractFurnaceBlockEntityMixin * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Technici4n <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java Co-authored-by: Technici4n <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]> * clear thread local and change field prefix * forgot the allow * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]> * Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Co-authored-by: Technici4n <[email protected]> * Add FurnaceGameTest * Change test keybind back to LShift * Fix brewing stand remainder and fix nitpicks * add code example to remainder javadoc * Fixed and reformatted docs, changed recipe mixin behavior to store the remainder stack instead of the original stack, refactoring. * Added gametests for brewing stand and recipe mixins, fixed furnace gametest compairing stacks with themselves. * Use (0,1,0) position for game tests * Review changes Co-authored-by: apple502j <[email protected]> Co-authored-by: Technici4n <[email protected]> Co-authored-by: Salvatore Peluso <[email protected]> Co-authored-by: modmuss50 <[email protected]> (cherry picked from commit fa140d5)

* Support stack aware recipe remainders (FabricMC#2556) * Support stack aware recipe remainders * Fix checkstyle * Remove all overwrites * Add FabricItemStack and make RecipeRemainderHandler thread safe * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecipeRemainderHandler.java Co-authored-by: Technici4n <[email protected]> * Remove hasRecipeRemainder, Update test mod and remove unneeded mixins * Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Co-authored-by: Salvatore Peluso <[email protected]> * Avoid copying the ItemStack * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java Co-authored-by: Salvatore Peluso <[email protected]> * Sneakily change duplicate keybinding to a less used key * make everything thread safe and improve AbstractFurnaceBlockEntityMixin * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Technici4n <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java Co-authored-by: Technici4n <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]> * clear thread local and change field prefix * forgot the allow * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]> * Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Co-authored-by: Technici4n <[email protected]> * Add FurnaceGameTest * Change test keybind back to LShift * Fix brewing stand remainder and fix nitpicks * add code example to remainder javadoc * Fixed and reformatted docs, changed recipe mixin behavior to store the remainder stack instead of the original stack, refactoring. * Added gametests for brewing stand and recipe mixins, fixed furnace gametest compairing stacks with themselves. * Use (0,1,0) position for game tests * Review changes Co-authored-by: apple502j <[email protected]> Co-authored-by: Technici4n <[email protected]> Co-authored-by: Salvatore Peluso <[email protected]> Co-authored-by: modmuss50 <[email protected]> (cherry picked from commit fa140d5) * Bump version * Update to Fabric API 0.67.0 * Update fabric-item-api-v1/src/testmod/resources/fabric-item-api-tests-v1.mixins.json Co-authored-by: Ennui Langeweile <[email protected]> Co-authored-by: AlphaMode <[email protected]> Co-authored-by: modmuss50 <[email protected]> Co-authored-by: Ennui Langeweile <[email protected]>

* Fix shulker boxes accepting other shulkers when using a directionless `InventoryStorage` (FabricMC#2669) * Fix shulker boxes accepting other shulkers If a mod creates a directionless InventoryStorage, it only calls Inventory.isValid and not SidedInventory.canInsert. However, shulker boxes only override the latter, allowing shulkers to be inserted into them. * Check for insertion in inventorySlotWrapper instead * Load modded translations on the server (FabricMC#2668) * Load modded translations on the server * Don't load built-in mods * Adjust nether biomes injection point (FabricMC#2666) Co-authored-by: apple502j <[email protected]> * Add access widener for `ItemModelGenerator#writer` (FabricMC#2635) Allows for the use of custom Models and TextureMaps for generating item models. * Fixed ScreenEvents Javadoc (FabricMC#2618) (cherry picked from commit 33716ae) * Split all duplicated packages (FabricMC#2617) * Move duplicated v0/v1 impl packages to v0 subpackages Fixes FabricMC#2616. The convention is adopted from the command API (v1) whose impl classes have the v1 subpackage. * Separate client code into its own packages everywhere * Fix code style * Fix code style, part 2 * Allow v0 in package names * Allow v0 in package names (fixed) * Support stack aware recipe remainders (FabricMC#2556) * Support stack aware recipe remainders * Fix checkstyle * Remove all overwrites * Add FabricItemStack and make RecipeRemainderHandler thread safe * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: apple502j <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item/RecipeRemainderHandler.java Co-authored-by: Technici4n <[email protected]> * Remove hasRecipeRemainder, Update test mod and remove unneeded mixins * Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Co-authored-by: Salvatore Peluso <[email protected]> * Avoid copying the ItemStack * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AbstractFurnaceBlockEntityMixin.java Co-authored-by: Salvatore Peluso <[email protected]> * Sneakily change duplicate keybinding to a less used key * make everything thread safe and improve AbstractFurnaceBlockEntityMixin * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Technici4n <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java Co-authored-by: Technici4n <[email protected]> * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]> * clear thread local and change field prefix * forgot the allow * Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]> * Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Co-authored-by: Technici4n <[email protected]> * Add FurnaceGameTest * Change test keybind back to LShift * Fix brewing stand remainder and fix nitpicks * add code example to remainder javadoc * Fixed and reformatted docs, changed recipe mixin behavior to store the remainder stack instead of the original stack, refactoring. * Added gametests for brewing stand and recipe mixins, fixed furnace gametest compairing stacks with themselves. * Use (0,1,0) position for game tests * Review changes Co-authored-by: apple502j <[email protected]> Co-authored-by: Technici4n <[email protected]> Co-authored-by: Salvatore Peluso <[email protected]> Co-authored-by: modmuss50 <[email protected]> * Fix FabricMC#2657: Transfer API edge case with bad isValid overrides (FabricMC#2659) Co-authored-by: modmuss50 <[email protected]> * Only load default language on the server. * Bump version * Cleanup licenses and imports * Fix mod/mixin.json's * Port recipe remainder api Co-authored-by: Jonathan Coates <[email protected]> Co-authored-by: modmuss50 <[email protected]> Co-authored-by: apple502j <[email protected]> Co-authored-by: 90 <[email protected]> Co-authored-by: Kevinthegreat <[email protected]> Co-authored-by: Juuz <[email protected]> Co-authored-by: AlphaMode <[email protected]> Co-authored-by: Technici4n <[email protected]> Co-authored-by: Salvatore Peluso <[email protected]>

haykam821 · 2023-01-31T01:29:05Z

This pull request changed vanilla mechanics by using recipe remainders in brewing stands, as documented in #2873.

AlphaMode and others added 15 commits September 27, 2022 14:49

Support stack aware recipe remainders

15addd0

Fix checkstyle

81c8a63

Remove all overwrites

b6dbc9c

Add FabricItemStack and make RecipeRemainderHandler thread safe

2641bfe

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

0681071

…v1/FabricItem.java Co-authored-by: apple502j <[email protected]>

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

b6abe08

…v1/FabricItem.java Co-authored-by: apple502j <[email protected]>

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

d5b0731

…v1/FabricItem.java Co-authored-by: apple502j <[email protected]>

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

cc5d3f3

…v1/FabricItem.java Co-authored-by: apple502j <[email protected]>

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

52b9abf

…v1/FabricItem.java Co-authored-by: apple502j <[email protected]>

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/impl/item…

895b828

…/RecipeRemainderHandler.java Co-authored-by: Technici4n <[email protected]>

Remove hasRecipeRemainder, Update test mod and remove unneeded mixins

c383f8c

Update fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/i…

84d1b18

…tem/CustomDamageTest.java Co-authored-by: Salvatore Peluso <[email protected]>

Avoid copying the ItemStack

84c6ef9

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/ite…

5ad5260

…m/AbstractFurnaceBlockEntityMixin.java Co-authored-by: Salvatore Peluso <[email protected]>

Merge branch 'FabricMC:1.19.2' into 1.19.2-remaining

4046855

AlphaMode mentioned this pull request Sep 27, 2022

Support stack aware recipe remainders #2464

Closed

AlphaMode changed the title ~~1.19.2 remaining~~ Support stack aware recipe remainders 1.19.2 Sep 27, 2022

Technici4n added the next? Likely candidate for upcoming releases label Sep 27, 2022

AlphaMode added 2 commits September 30, 2022 12:55

Sneakily change duplicate keybinding to a less used key

a40d5fa

make everything thread safe and improve AbstractFurnaceBlockEntityMixin

57643a0

Technici4n reviewed Sep 30, 2022

View reviewed changes

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Outdated Show resolved Hide resolved

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

82b63c8

…v1/FabricItem.java Co-authored-by: Technici4n <[email protected]>

Technici4n reviewed Sep 30, 2022

View reviewed changes

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItemStack.java Show resolved Hide resolved

fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/CustomDamageTest.java Show resolved Hide resolved

Technici4n suggested changes Sep 30, 2022

View reviewed changes

devpelux suggested changes Sep 30, 2022

View reviewed changes

fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/v1/FabricItem.java Outdated Show resolved Hide resolved

AlphaMode and others added 5 commits September 30, 2022 14:52

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

b8953b0

…v1/FabricItemStack.java Co-authored-by: Technici4n <[email protected]>

Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…

05436df

…v1/FabricItem.java Co-authored-by: Salvatore Peluso <[email protected]>

clear thread local and change field prefix

60737a0

Merge remote-tracking branch 'origin/1.19.2-remaining' into 1.19.2-re…

04001cc

…maining

forgot the allow

e3a0c7b

modmuss50 requested changes Oct 10, 2022

View reviewed changes

AlphaMode added 4 commits October 12, 2022 14:41

Change test keybind back to LShift

3269ebf

Merge remote-tracking branch 'origin/1.19.2-remaining' into 1.19.2-re…

7152eb9

…maining

Fix brewing stand remainder and fix nitpicks

bd69f75

add code example to remainder javadoc

38e946a

AlphaMode requested a review from modmuss50 October 13, 2022 21:50

devpelux mentioned this pull request Oct 13, 2022

Change test keybind LEFT_SHIFT to RIGHT_SHIFT #2580

Merged

devpelux added 2 commits October 14, 2022 18:27

Fixed and reformatted docs, changed recipe mixin behavior to store th…

db6a859

…e remainder stack instead of the original stack, refactoring.

Added gametests for brewing stand and recipe mixins, fixed furnace ga…

d63bcf0

…metest compairing stacks with themselves.

devpelux mentioned this pull request Oct 14, 2022

Add automatized gametests for brewing stand and recipe mixins, fixed and tweaked something. AlphaMode/fabric#2

Merged

AlphaMode and others added 3 commits October 15, 2022 19:25

Merge pull request #2 from devpelux/remainders-tests

827102b

Add automatized gametests for brewing stand and recipe mixins, fixed and tweaked something.

Use (0,1,0) position for game tests

495a67d

Merge pull request #3 from Technici4n/use-higher-pos

307f995

Use (0,1,0) position for game tests

Technici4n self-requested a review November 7, 2022 17:58

Technici4n approved these changes Nov 7, 2022

View reviewed changes

Technici4n requested a review from Juuxel November 7, 2022 17:59

modmuss50 approved these changes Nov 14, 2022

View reviewed changes

modmuss50 added enhancement New feature or request last call If you care, make yourself heard right away! labels Nov 14, 2022

Juuxel reviewed Nov 19, 2022

View reviewed changes

Review changes

bbe222a

modmuss50 added the merge me please Pull requests that are ready to merge label Nov 20, 2022

modmuss50 merged commit fa140d5 into FabricMC:1.19.2 Nov 20, 2022

Technici4n mentioned this pull request Dec 18, 2022

Recipe remainders #50

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support stack aware recipe remainders 1.19.2 #2556

Support stack aware recipe remainders 1.19.2 #2556

AlphaMode commented Sep 27, 2022

Technici4n left a comment

devpelux left a comment

modmuss50 left a comment

devpelux commented Oct 14, 2022 •

edited

Loading

haykam821 commented Jan 31, 2023

Support stack aware recipe remainders 1.19.2 #2556

Support stack aware recipe remainders 1.19.2 #2556

Conversation

AlphaMode commented Sep 27, 2022

Technici4n left a comment

Choose a reason for hiding this comment

devpelux left a comment

Choose a reason for hiding this comment

modmuss50 left a comment

Choose a reason for hiding this comment

devpelux commented Oct 14, 2022 • edited Loading

haykam821 commented Jan 31, 2023

devpelux commented Oct 14, 2022 •

edited

Loading