Skip to content

fix(craft): handle empty shaped recipe slots and use ItemTypeChoice #653

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

Merged
Siroshun09 merged 2 commits into from
Oct 29, 2026
Merged

fix(craft): handle empty shaped recipe slots and use ItemTypeChoice #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f15ae
fix(craft): skip empty shaped recipe slots
Siroshun09 Oct 29, 2026
b69157d
refactor(craft): use ItemTypeChoice for recipe ingredients
Siroshun09 Oct 29, 2026
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
11 changes: 8 additions & 3 deletions features/craft/src/main/java/net/okocraft/box/feature/craft/loader/Processor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,12 @@ private void processShapedRecipe(@NotNull ShapedRecipe recipe, @NotNull BoxItem
continue;
}

IngredientHolder ingredient = this.convertChoice(row * 3 + column, choices.get(symbol));
RecipeChoice choice = choices.get(symbol);
if (choice == null || choice == RecipeChoice.empty()) {
continue;
}

IngredientHolder ingredient = this.convertChoice(row * 3 + column, choice);
if (ingredient == null || ingredient.patterns().isEmpty()) {
return;
}
Expand Down Expand Up @@ -167,8 +172,8 @@ private void processCustomRecipe(@Nullable BoxItem @NotNull [] ingredients, @Not
}

private @Nullable IngredientHolder convertChoice(int slot, @Nullable RecipeChoice choice) {
if (choice instanceof RecipeChoice.MaterialChoice materialChoice) {
return IngredientHolder.fromMaterialChoice(slot, materialChoice);
if (choice instanceof RecipeChoice.ItemTypeChoice itemTypeChoice) {
return IngredientHolder.fromItemTypeChoice(slot, itemTypeChoice);
}
if (choice instanceof RecipeChoice.ExactChoice exactChoice) {
return IngredientHolder.fromExactChoice(slot, exactChoice);
Expand Down
17 changes: 13 additions & 4 deletions features/craft/src/main/java/net/okocraft/box/feature/craft/model/IngredientHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package net.okocraft.box.feature.craft.model;

import io.papermc.paper.registry.TypedKey;

import org.bukkit.Registry;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.ItemType;
import org.bukkit.inventory.RecipeChoice;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Unmodifiable;

import java.util.ArrayList;
import java.util.List;

/**
Expand Down Expand Up @@ -37,14 +42,18 @@ public static void disableCache() {
}

/**
* Creates a {@link IngredientHolder} from {@link org.bukkit.inventory.RecipeChoice.MaterialChoice}.
* Creates a {@link IngredientHolder} from {@link RecipeChoice.ItemTypeChoice}.
*
* @param slot the position in the crafting table (0-8)
* @param choice the {@link org.bukkit.inventory.RecipeChoice.MaterialChoice} instance to create {@link IngredientHolder}
* @param choice the {@link RecipeChoice.ItemTypeChoice} instance to create {@link IngredientHolder}
* @return a {@link IngredientHolder}
*/
public static @NotNull IngredientHolder fromMaterialChoice(int slot, @NotNull RecipeChoice.MaterialChoice choice) {
return ModelCache.getIngredientHolder(slot, choice.getChoices().stream().map(ItemStack::new).toList());
public static @NotNull IngredientHolder fromItemTypeChoice(int slot, @NotNull RecipeChoice.ItemTypeChoice choice) {
List<ItemStack> itemStacks = new ArrayList<>();
for (TypedKey<ItemType> type : choice.itemTypes()) {
itemStacks.add(Registry.ITEM.getOrThrow(type).createItemStack());
}
return ModelCache.getIngredientHolder(slot, itemStacks);
}

/**
Expand Down
Loading