fix recipe getIngredients

SpongePowered · Aug 28, 2024 · d174770 · d174770
1 parent 3de210a
commit d174770
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 8 deletions.
diff --git a/src/main/java/org/spongepowered/api/item/recipe/Recipe.java b/src/main/java/org/spongepowered/api/item/recipe/Recipe.java
@@ -34,7 +34,6 @@
 import org.spongepowered.api.item.inventory.crafting.CraftingInventory;
 import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
 import org.spongepowered.api.item.recipe.crafting.CraftingRecipe;
-import org.spongepowered.api.item.recipe.crafting.Ingredient;
 import org.spongepowered.api.item.recipe.crafting.RecipeInput;
 import org.spongepowered.api.item.recipe.crafting.RecipeResult;
 import org.spongepowered.api.item.recipe.crafting.ShapedCraftingRecipe;
@@ -124,13 +123,6 @@ default Optional<RecipeResult> result(T inventory, ServerWorld world) {
         return Optional.empty();
     }
 
-    /**
-     * Gets the ingredients for this recipe.
-     *
-     * @return An unmodifiable list of the ingredients.
-     */
-    List<Ingredient> ingredients();
-
     /**
      * Returns true if the recipe is dynamic.
      * <p>Dynamic recipes are not displayed in the recipe book.</p>

diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapedCraftingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapedCraftingRecipe.java
@@ -42,6 +42,13 @@
  */
 public interface ShapedCraftingRecipe extends CraftingRecipe {
 
+    /**
+     * Gets the ingredients for this recipe.
+     *
+     * @return An unmodifiable list of the ingredients.
+     */
+    List<Ingredient> ingredients();
+
     /**
      * Creates a new {@link ShapedCraftingRecipe.Builder} to build a {@link ShapedCraftingRecipe}.
      *

diff --git a/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapelessCraftingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/crafting/ShapelessCraftingRecipe.java
@@ -44,6 +44,13 @@
  */
 public interface ShapelessCraftingRecipe extends CraftingRecipe {
 
+    /**
+     * Gets the ingredients for this recipe.
+     *
+     * @return An unmodifiable list of the ingredients.
+     */
+    List<Ingredient> ingredients();
+
     /**
      * Creates a new {@link Builder} to build a {@link ShapelessCraftingRecipe}.
      *

diff --git a/src/main/java/org/spongepowered/api/item/recipe/single/StoneCutterRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/single/StoneCutterRecipe.java
@@ -34,10 +34,12 @@
 import org.spongepowered.api.item.recipe.Recipe;
 import org.spongepowered.api.item.recipe.RecipeRegistration;
 import org.spongepowered.api.item.recipe.RecipeType;
+import org.spongepowered.api.item.recipe.cooking.CookingRecipe;
 import org.spongepowered.api.item.recipe.crafting.Ingredient;
 import org.spongepowered.api.item.recipe.crafting.RecipeInput;
 import org.spongepowered.api.util.ResourceKeyedBuilder;
 
+import java.util.List;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -50,6 +52,13 @@ static StoneCutterRecipe.Builder builder() {
         return Sponge.game().builderProvider().provide(StoneCutterRecipe.Builder.class);
     }
 
+    /**
+     * Returns the {@link Ingredient} for this {@link StoneCutterRecipe}.
+     *
+     * @return The {@link Ingredient} for this {@link StoneCutterRecipe}.
+     */
+    Ingredient ingredient();
+
     @Override
     RecipeType<? extends StoneCutterRecipe> type();
 

diff --git a/src/main/java/org/spongepowered/api/item/recipe/smithing/SmithingRecipe.java b/src/main/java/org/spongepowered/api/item/recipe/smithing/SmithingRecipe.java
@@ -38,6 +38,7 @@
 import org.spongepowered.api.item.recipe.crafting.RecipeInput;
 import org.spongepowered.api.util.ResourceKeyedBuilder;
 
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -50,6 +51,27 @@ static SmithingRecipe.Builder builder() {
         return Sponge.game().builderProvider().provide(SmithingRecipe.Builder.class);
     }
 
+    /**
+     * Returns the smithing template {@link Ingredient} for this {@link SmithingRecipe}.
+     *
+     * @return The smithing template {@link Ingredient} for this {@link SmithingRecipe}.
+     */
+    Optional<Ingredient> templateIngredient();
+
+    /**
+     * Returns the base {@link Ingredient} for this {@link SmithingRecipe}.
+     *
+     * @return The base {@link Ingredient} for this {@link SmithingRecipe}.
+     */
+    Optional<Ingredient> baseIngredient();
+
+    /**
+     * Returns the additional {@link Ingredient} for this {@link SmithingRecipe}.
+     *
+     * @return The additional {@link Ingredient} for this {@link SmithingRecipe}.
+     */
+    Optional<Ingredient> additionalIngredient();
+
     @Override
     RecipeType<? extends SmithingRecipe> type();