Y2K_ / Bukkit2 / 2ec53f498e3

Commits

Doc authored and md_5 committed 2ec53f498e3 31 Jul 2024

#1050: Fix empty result check for Complex Recipes

Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>

src/main/java/org/bukkit/inventory/CraftingRecipe.java

Modified

-1
+package org.bukkit.inventory;
-2
-3
+import com.google.common.base.Preconditions;
-4
+import org.bukkit.Keyed;
-5
+import org.bukkit.Material;
-6
+import org.bukkit.NamespacedKey;
-7
+import org.bukkit.inventory.recipe.CraftingBookCategory;
-+
+import org.jetbrains.annotations.ApiStatus;
-9
+import org.jetbrains.annotations.NotNull;
-10
-11
+/**
-12
+ * Represents a shaped or shapeless crafting recipe.
-13
+ */
-14
+public abstract class CraftingRecipe implements Recipe, Keyed {
-15
+    private final NamespacedKey key;
-16
+    private final ItemStack output;
-17
+    private String group = "";
-18
+    private CraftingBookCategory category = CraftingBookCategory.MISC;
-19
-20
+    protected CraftingRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result) {
-21
+        Preconditions.checkArgument(key != null, "key cannot be null");
--
+        Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
-22
+        this.key = key;
-23
+        this.output = new ItemStack(result);
-24
+    }
-25
-26
+    @NotNull
-27
+    @Override
-28
+    public NamespacedKey getKey() {
-29
+        return key;
-30
+    }
-31
-58
+     * @param group recipe group. An empty string denotes no group. May not be
-59
+     * null.
-60
+     */
-61
+    public void setGroup(@NotNull String group) {
-62
+        Preconditions.checkArgument(group != null, "group cannot be null");
-63
+        this.group = group;
-64
+    }
-65
-66
+    /**
-67
+     * Gets the category which this recipe will appear in the recipe book under.
--
+     *
-+
+     * <br>
-69
+     * Defaults to {@link CraftingBookCategory#MISC} if not set.
-70
+     *
-71
+     * @return recipe book category
-72
+     */
-73
+    @NotNull
-74
+    public CraftingBookCategory getCategory() {
-75
+        return category;
-76
+    }
-77
-78
+    /**
-79
+     * Sets the category which this recipe will appear in the recipe book under.
--
+     *
-+
+     * <br>
-81
+     * Defaults to {@link CraftingBookCategory#MISC} if not set.
-82
+     *
-83
+     * @param category recipe book category
-84
+     */
-85
+    public void setCategory(@NotNull CraftingBookCategory category) {
-86
+        Preconditions.checkArgument(category != null, "category cannot be null");
-87
+        this.category = category;
-88
+    }
-+
-+
+    /**
-+
+     * Checks an ItemStack to be used in constructors related to CraftingRecipe
-+
+     * is not empty.
-+
+     *
-+
+     * @param result an ItemStack
-+
+     * @return the same result ItemStack
-+
+     * @throws IllegalArgumentException if the {@code result} is an empty item
-+
+     * (AIR)
-+
+     */
-+
+    @ApiStatus.Internal
-+
+    @NotNull
-+
+    protected static ItemStack checkResult(@NotNull ItemStack result) {
-+
+        Preconditions.checkArgument(result.getType() != Material.AIR, "Recipe must have non-AIR result.");
-+
+        return result;
-+
+    }
-105
+}

Bukkit2

Commits

Jira Issues

Add shortcut