blob: d91e17c727bfc34f551fecc1ec889e584399637a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- a/net/minecraft/server/ShapelessRecipes.java
+++ b/net/minecraft/server/ShapelessRecipes.java
@@ -6,12 +6,24 @@
import com.google.gson.JsonParseException;
import java.util.ArrayList;
import java.util.Iterator;
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe;
+// CraftBukkit end
public class ShapelessRecipes implements IRecipe {
private final ItemStack result;
private final NonNullList<RecipeItemStack> ingredients;
private final String c;
+ // CraftBukkit start
+ public MinecraftKey key;
+
+ @Override
+ public void setKey(MinecraftKey key) {
+ this.key = key;
+ }
+ // CraftBukkit end
public ShapelessRecipes(String s, ItemStack itemstack, NonNullList<RecipeItemStack> nonnulllist) {
this.c = s;
@@ -19,6 +31,21 @@
this.ingredients = nonnulllist;
}
+ // CraftBukkit start
+ @SuppressWarnings("unchecked")
+ public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe() {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
+ CraftShapelessRecipe recipe = new CraftShapelessRecipe(result, this);
+ for (RecipeItemStack list : this.ingredients) {
+ if (list != null) {
+ net.minecraft.server.ItemStack stack = list.choices[0];
+ recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.choices.length) > 1 ? 32767 : stack.getData());
+ }
+ }
+ return recipe;
+ }
+ // CraftBukkit end
+
public ItemStack b() {
return this.result;
}
|