Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
28 Zeilen
1.3 KiB
Diff
28 Zeilen
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Bjarne Koll <lynxplay101@gmail.com>
|
|
Date: Fri, 19 Jul 2024 19:09:21 +0200
|
|
Subject: [PATCH] Move CraftComplexRecipe to extend CraftingRecipe
|
|
|
|
A craft complex recipe wraps a CustomRecipe, which itself is a
|
|
CraftingRecipe.
|
|
As such, this complex recipe should also be a crafting recipe.
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/CraftingRecipe.java b/src/main/java/org/bukkit/inventory/CraftingRecipe.java
|
|
index 37024b4736dd3897490ca51d08cf07901b01d59f..afa3de9ab78d01c448d450d8afbc7b1e7e62754c 100644
|
|
--- a/src/main/java/org/bukkit/inventory/CraftingRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/CraftingRecipe.java
|
|
@@ -11,8 +11,11 @@ import org.jetbrains.annotations.NotNull;
|
|
* Represents a shaped or shapeless crafting recipe.
|
|
*/
|
|
public abstract class CraftingRecipe implements Recipe, Keyed {
|
|
- private final NamespacedKey key;
|
|
- private final ItemStack output;
|
|
+ // Paper - make CraftComplexRecipe extend CraftingRecipe - start
|
|
+ protected NamespacedKey key;
|
|
+ protected ItemStack output;
|
|
+ protected CraftingRecipe() {}
|
|
+ // Paper - make CraftComplexRecipe extend CraftingRecipe - end
|
|
private String group = "";
|
|
private CraftingBookCategory category = CraftingBookCategory.MISC;
|
|
|