Skip to content

Make recipe placing from recipe book working with custom ingredients #4241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrHell228 wants to merge 23 commits into
base: api-14
Choose a base branch
from
Open

Make recipe placing from recipe book working with custom ingredients #4241

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9a819eb
make placing recipe from recipe book working with custom ingredients
MrHell228 Oct 7, 2025
0f14cb9
remove adjusted ServerPlaceRecipe#moveItemToGrid copy
MrHell228 Oct 25, 2025
25562d6
move RecipeBridge logic to PlacementInfoBridge
MrHell228 Oct 25, 2025
7bede09
reduce the amount of injections
MrHell228 Oct 26, 2025
ab60d1c
move some things
MrHell228 Oct 26, 2025
f08fc22
follow the review
MrHell228 Oct 26, 2025
1d935e2
fail finding slot when exemplary and craft input stacks can't stack
MrHell228 Oct 26, 2025
17ae6d8
add RecipePlaceTest
MrHell228 Oct 30, 2025
0733598
follow the review
MrHell228 Oct 30, 2025
1a94490
make tests more flexible
MrHell228 Oct 31, 2025
3b01885
Revert "make tests more flexible"
MrHell228 Oct 31, 2025
6fb1659
test option for creative mode, tests for full inventory
MrHell228 Oct 31, 2025
a0bb7ae
move bad layout tests to its own populator
MrHell228 Nov 2, 2025
46cd7a3
Update RecipePlaceTest.java
MrHell228 Nov 2, 2025
e8556bf
Merge branch 'api-14' into api-14-fix/recipe-book-placer
MrHell228 Nov 27, 2025
9130a71
Update SpongeAPI
MrHell228 Nov 27, 2025
6c684fb
Update SpongeAPI
MrHell228 Nov 27, 2025
4d6d606
Merge branch 'api-14-fix/recipe-book-placer' of https://github.com/Mr…
MrHell228 Nov 27, 2025
5f40fb9
Update SpongeAPI
MrHell228 Nov 27, 2025
0cf4640
enable custom shapelss recipe tests
MrHell228 Nov 27, 2025
bf8b5f7
enable custom shapelss recipe tests
MrHell228 Nov 27, 2025
eeb5dee
Merge branch 'api-14-fix/recipe-book-placer' of https://github.com/Mr…
MrHell228 Nov 27, 2025
2b0f447
Update SpongeAPI
MrHell228 Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
266 changes: 158 additions & 108 deletions src/test/java/org/spongepowered/common/recipe/RecipePlaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,88 +130,104 @@ private static Stream<TestContext> streamCraftingRecipes() {
&& stack.maxStackQuantity() == bigPearl.maxStackQuantity(),
pearl);

return Stream.<TestPopulator>of(
new DefaultedTestPopulator(new TestContext("regular_shaped_crafting", CraftingRecipe.shapedBuilder()
return Stream.of(
Stream.of(new TestContext("regular_shaped_crafting", CraftingRecipe.shapedBuilder()
.aisle("S S", " P ")
.where('S', stoneIngredient)
.where('P', anyPearlIngredient)
.result(result)))

.expectCrafts(8, 16)
.expectInput(List.of(
stone, empty, stone,
empty, bigPearl, empty,
empty, empty, empty))

.partialInventory(List.of(stone64, bigPearl8, bigPearl8))
.partialInput(List.of(
stone64, empty, empty,
empty, bigPearl4, empty,
empty, empty, empty))

.badInventory(Collections.nCopies(9, bedrock))
.badInput(Collections.nCopies(9, bedrock)),

new DefaultedTestPopulator(new TestContext("custom_shaped_crafting", CraftingRecipe.shapedBuilder()
.flatMap(test -> Stream.of(
new DefaultedTestPopulator(test)
.expectCrafts(8, 16)
.expectInput(List.of(
stone, empty, stone,
empty, bigPearl, empty,
empty, empty, empty))

.partialInventory(List.of(stone64, bigPearl8, bigPearl8))
.partialInput(List.of(
stone64, empty, empty,
empty, bigPearl4, empty,
empty, empty, empty))
.badInput(Collections.nCopies(9, bedrock)),
new BadLayoutTestPopulator(test)
.badInventory(Collections.nCopies(9, bedrock))
.badInput(Collections.nCopies(9, bedrock))
)).flatMap(TestPopulator::populate),

Stream.of(new TestContext("custom_shaped_crafting", CraftingRecipe.shapedBuilder()
.aisle("SSS", "BBB", "SSS")
.where('S', smallPearlIngredient)
.where('B', bigPearlIngredient)
.result(result)))
.flatMap(test -> Stream.of(
new DefaultedTestPopulator(test)
.expectCrafts(4, 4)
.expectInput(List.of(
smallPearl, smallPearl, smallPearl,
bigPearl, bigPearl, bigPearl,
smallPearl, smallPearl, smallPearl))

.partialInventory(List.of(smallPearl32, bigPearl, bigPearl, bigPearl, bigPearl, smallPearl32))
.partialInput(List.of(
smallPearl4, empty, smallPearl4,
bigPearl4, empty, bigPearl4,
smallPearl, empty, empty))
.badInput(Collections.nCopies(9, pearl)),
new BadLayoutTestPopulator(test)
.badInventory(List.of(pearl16))
.badInput(Collections.nCopies(9, pearl))
))
.flatMap(TestPopulator::populate),

.expectCrafts(4, 4)
.expectInput(List.of(
smallPearl, smallPearl, smallPearl,
bigPearl, bigPearl, bigPearl,
smallPearl, smallPearl, smallPearl))

.partialInventory(List.of(smallPearl32, bigPearl, bigPearl, bigPearl, bigPearl, smallPearl32))
.partialInput(List.of(
smallPearl4, empty, smallPearl4,
bigPearl4, empty, bigPearl4,
smallPearl, empty, empty))

.badInventory(List.of(pearl16))
.badInput(Collections.nCopies(9, pearl)),

new DefaultedTestPopulator(new TestContext("regular_shapeless_crafting", CraftingRecipe.shapelessBuilder()
.addIngredients(anyPearlIngredient, stoneIngredient, anyPearlIngredient)))

.expectCrafts(16, 16)
.expectInput(List.of(
smallPearl, stone, smallPearl,
empty, empty, empty,
empty, empty, empty))

.partialInventory(List.of(smallPearl32))
.partialInput(List.of(
smallPearl4, stone64, empty,
empty, empty, empty,
empty, empty, empty))

.badInventory(Collections.nCopies(10, bedrock))
.badInput(Collections.nCopies(3, bedrock))/*,
Stream.of(new TestContext("regular_shapeless_crafting", CraftingRecipe.shapelessBuilder()
.addIngredients(
anyPearlIngredient, stoneIngredient, anyPearlIngredient)))
.flatMap(test -> Stream.of(
new DefaultedTestPopulator(test)
.expectCrafts(16, 16)
.expectInput(List.of(
smallPearl, stone, smallPearl,
empty, empty, empty,
empty, empty, empty))

.partialInventory(List.of(smallPearl32))
.partialInput(List.of(
smallPearl4, stone64, empty,
empty, empty, empty,
empty, empty, empty))
.badInput(Collections.nCopies(3, bedrock)),
new BadLayoutTestPopulator(test)
.badInventory(Collections.nCopies(10, bedrock))
.badInput(Collections.nCopies(3, bedrock))
))
.flatMap(TestPopulator::populate)/*,

//TODO uncomment after shapeless recipe fix
new DefaultedTestPopulator(new TestContext("custom_shapeless_crafting", CraftingRecipe.shapelessBuilder()
Stream.of(new TestContext("custom_shapeless_crafting", CraftingRecipe.shapelessBuilder()
.addIngredients(
smallPearlIngredient, smallPearlIngredient, smallPearlIngredient,
bigPearlIngredient, bigPearlIngredient, bigPearlIngredient)))

.expectCrafts(8, 16)
.expectInput(List.of(
smallPearl, smallPearl, smallPearl,
bigPearl, bigPearl, bigPearl,
empty, empty, empty))

.partialInventory(Collections.nCopies(5, bigPearl8))
.partialInput(List.of(
smallPearl32, smallPearl32, smallPearl,
bigPearl4, bigPearl4, empty,
empty, empty, empty))

.badInventory(List.of(pearl16))
.badInput(Collections.nCopies(6, pearl))*/
).flatMap(TestPopulator::populate);
.flatMap(test -> Stream.of(
new DefaultedTestPopulator(test)
.expectCrafts(8, 16)
.expectInput(List.of(
smallPearl, smallPearl, smallPearl,
bigPearl, bigPearl, bigPearl,
empty, empty, empty))

.partialInventory(Collections.nCopies(5, bigPearl8))
.partialInput(List.of(
smallPearl32, smallPearl32, smallPearl,
bigPearl4, bigPearl4, empty,
empty, empty, empty))
.badInput(Collections.nCopies(6, pearl)),
new BadLayoutTestPopulator(test)
.badInventory(List.of(pearl16))
.badInput(Collections.nCopies(6, pearl))
))
.flatMap(TestPopulator::populate)*/
).flatMap(Function.identity());
}

private static Stream<TestContext> streamSmeltingRecipes() {
Expand All @@ -222,34 +238,43 @@ private static Stream<TestContext> streamSmeltingRecipes() {
bigSnowball.offer(Keys.MAX_STACK_SIZE, 4);
final ItemStack result = ItemStack.of(ItemTypes.BARRIER);

return Stream.<TestPopulator>of(
new DefaultedTestPopulator(new TestContext("regular_smelting", CookingRecipe.builder()
return Stream.of(
Stream.of(new TestContext("regular_smelting", CookingRecipe.builder()
.type(RecipeTypes.SMELTING)
.ingredient(Ingredient.of(snowball.type()))
.result(result)))
.flatMap(test -> Stream.of(
new DefaultedTestPopulator(test)
.expectCrafts(4, 8)
.expectInput(List.of(bigSnowball))

.partialInventory(Collections.nCopies(8, bigSnowball))
.badInput(List.of(bedrock)),
new BadLayoutTestPopulator(test)
.badInventory(List.of(bedrock))
.badInput(List.of(bedrock))
))
.flatMap(TestPopulator::populate),

.expectCrafts(4, 8)
.expectInput(List.of(bigSnowball))

.partialInventory(Collections.nCopies(8, bigSnowball))
.badInventory(List.of(bedrock))
.badInput(List.of(bedrock)),

new DefaultedTestPopulator(new TestContext("custom_smelting", CookingRecipe.builder()
Stream.of(new TestContext("custom_smelting", CookingRecipe.builder()
.type(RecipeTypes.SMELTING)
.ingredient(Ingredient.of(ResourceKey.sponge("big_snowball"),
stack -> stack.type() == bigSnowball.type()
&& stack.maxStackQuantity() == bigSnowball.maxStackQuantity(),
snowball))
.result(result)))

.expectCrafts(4, 8)
.expectInput(List.of(bigSnowball))

.partialInventory(Collections.nCopies(8, bigSnowball))
.badInventory(List.of(snowball4))
.badInput(List.of(snowball4))
).flatMap(TestPopulator::populate);
.flatMap(test -> Stream.of(
new DefaultedTestPopulator(test)
.expectCrafts(4, 8)
.expectInput(List.of(bigSnowball))
.partialInventory(Collections.nCopies(8, bigSnowball))
.badInput(List.of(snowball4)),
new BadLayoutTestPopulator(test)
.badInventory(List.of(snowball4))
.badInput(List.of(snowball4))
))
.flatMap(TestPopulator::populate)
).flatMap(Function.identity());
}

@TestFactory
Expand All @@ -265,6 +290,10 @@ public Stream<DynamicTest> generateTests() {
@FunctionalInterface
private interface TestPopulator {

static TestPopulator composite(final Stream<TestPopulator> populators) {
return () -> populators.flatMap(TestPopulator::populate);
}

Stream<TestContext> populate();
}

Expand Down Expand Up @@ -308,8 +337,6 @@ private static final class DefaultedTestPopulator implements TestPopulator {
// All of them should be considered for expected crafts
private List<ItemStack> partialInventory = List.of();
private List<ItemStack> partialInput = List.of();
// "Bad" items exist to ensure placer clears input and doesn't pull wrong items if there is no other choice
private List<ItemStack> badInventory = List.of();
private List<ItemStack> badInput = List.of();

public DefaultedTestPopulator(final TestContext base) {
Expand Down Expand Up @@ -337,11 +364,6 @@ public DefaultedTestPopulator partialInput(final List<ItemStack> items) {
return this;
}

public DefaultedTestPopulator badInventory(final List<ItemStack> items) {
this.badInventory = items;
return this;
}

public DefaultedTestPopulator badInput(final List<ItemStack> items) {
this.badInput = items;
return this;
Expand All @@ -351,22 +373,12 @@ public DefaultedTestPopulator badInput(final List<ItemStack> items) {
public Stream<TestContext> populate() {
final List<ItemStack> totalInitialInventory = Stream.concat(this.partialInventory.stream(), this.partialInput.stream()).toList();
final List<ItemStack> expectedShiftInput = RecipePlaceTest.createExpectedInput(this.expectedInput, this.expectedShiftCrafts);
final List<TestContext> baseInputs = List.of(
this.base.name("Empty input").input(List.of()),
this.base.name("Bad input").input(this.badInput)
);

final Stream<TestContext> testBadLayouts = baseInputs.stream()
final Stream<TestContext> testSingleClick = Stream.of(this.base)
.flatMap(context -> Stream.of(
context.name("Empty inventory").inventory(List.of()),
context.name("Bad inventory").inventory(this.badInventory)
context.name("Empty input").input(List.of()),
context.name("Bad input").input(this.badInput)
))
.flatMap(context -> Stream.of(context, context.shift()))
.flatMap(context -> Stream.of(context, context.creative()))
// 2 clicks is enough to ensure we always get empty input
.map(context -> context.expectInputs(List.of(List.of(), List.of())));

final Stream<TestContext> testSingleClick = baseInputs.stream()
.map(context -> context.name("Total inventory").inventory(totalInitialInventory))
.flatMap(context -> Stream.of(context, context.creative()))
.flatMap(context -> Stream.of(
Expand Down Expand Up @@ -400,11 +412,49 @@ public Stream<TestContext> populate() {
context.creative().expectInput(List.of())
));

return Stream.of(testBadLayouts, testSingleClick, testMultipleClicks, testFullInventory)
return Stream.of(testSingleClick, testMultipleClicks, testFullInventory)
.flatMap(Function.identity());
}
}

private static final class BadLayoutTestPopulator implements TestPopulator {

private final TestContext base;
private List<ItemStack> badInventory = List.of();
private List<ItemStack> badInput = List.of();

public BadLayoutTestPopulator(final TestContext base) {
this.base = base;
}

public BadLayoutTestPopulator badInventory(final List<ItemStack> items) {
this.badInventory = items;
return this;
}

public BadLayoutTestPopulator badInput(final List<ItemStack> items) {
this.badInput = items;
return this;
}

@Override
public Stream<TestContext> populate() {
return Stream.of(this.base)
.flatMap(context -> Stream.of(
context.name("Empty input").input(List.of()),
Copy link
Copy Markdown
Member

@aromaa aromaa Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be directly asked for by generating the tests with the the appropriate badInventory and badInput.

context.name("Bad input").input(this.badInput)
))
.flatMap(context -> Stream.of(
context.name("Empty inventory").inventory(List.of()),
context.name("Bad inventory").inventory(this.badInventory)
))
.flatMap(context -> Stream.of(context, context.shift()))
.flatMap(context -> Stream.of(context, context.creative()))
// 2 clicks is enough to ensure we always get empty input
.map(context -> context.expectInputs(List.of(List.of(), List.of())));
}
}

private record TestContext(
RecipeHolder<?> recipe, String testName,
boolean shiftClick, boolean creativeMode,
Expand Down Expand Up @@ -466,7 +516,7 @@ public void testCrafting() {
}

public void testSmelting() {
this.test(MenuType.FURNACE, menu -> ((Inventory) ((AbstractFurnaceMenuAccessor) menu).accessor$container()).slot(0).get());
this.test(MenuType.FURNACE, menu -> ((Inventory) ((AbstractFurnaceMenuAccessor) menu).accessor$container()).slot(0).orElseThrow());
}

public void test(
Expand Down