19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From e62dd23291bb93bbfa318a7fcb14265d515e77b9 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Sat, 1 Jun 2013 16:34:38 +1000
|
|
Subject: [PATCH] Recipe Deconstruction
|
|
|
|
Some non API methods contributed by Asphodan to allow recipe deconstruction.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/IRecipe.java b/src/main/java/net/minecraft/server/IRecipe.java
|
|
index d2655a0..e5b116f 100644
|
|
--- a/src/main/java/net/minecraft/server/IRecipe.java
|
|
+++ b/src/main/java/net/minecraft/server/IRecipe.java
|
|
@@ -13,4 +13,6 @@ public interface IRecipe {
|
|
ItemStack[] b(InventoryCrafting inventorycrafting);
|
|
|
|
org.bukkit.inventory.Recipe toBukkitRecipe(); // CraftBukkit
|
|
+
|
|
+ java.util.List<ItemStack> getIngredients(); // Spigot
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ShapedRecipes.java b/src/main/java/net/minecraft/server/ShapedRecipes.java
|
|
index 407cbfb..6c3de90 100644
|
|
--- a/src/main/java/net/minecraft/server/ShapedRecipes.java
|
|
+++ b/src/main/java/net/minecraft/server/ShapedRecipes.java
|
|
@@ -11,7 +11,7 @@ public class ShapedRecipes implements IRecipe {
|
|
private final int width;
|
|
private final int height;
|
|
private final ItemStack[] items;
|
|
- private final ItemStack result;
|
|
+ public ItemStack result; // Spigot
|
|
private boolean e;
|
|
|
|
public ShapedRecipes(int i, int j, ItemStack[] aitemstack, ItemStack itemstack) {
|
|
@@ -171,4 +171,11 @@ public class ShapedRecipes implements IRecipe {
|
|
this.e = true;
|
|
return this;
|
|
}
|
|
+
|
|
+ // Spigot start
|
|
+ public java.util.List<ItemStack> getIngredients()
|
|
+ {
|
|
+ return java.util.Arrays.asList( items );
|
|
+ }
|
|
+ // Spigot end
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java
|
|
index 2d243d1..b6106db 100644
|
|
--- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
|
|
+++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
|
|
@@ -12,7 +12,7 @@ import org.bukkit.craftbukkit.inventory.CraftShapelessRecipe;
|
|
|
|
public class ShapelessRecipes implements IRecipe {
|
|
|
|
- private final ItemStack result;
|
|
+ public final ItemStack result; // Spigot
|
|
private final List ingredients;
|
|
|
|
public ShapelessRecipes(ItemStack itemstack, List list) {
|
|
@@ -90,4 +90,11 @@ public class ShapelessRecipes implements IRecipe {
|
|
public int a() {
|
|
return this.ingredients.size();
|
|
}
|
|
+
|
|
+ // Spigot start
|
|
+ public java.util.List<ItemStack> getIngredients()
|
|
+ {
|
|
+ return java.util.Collections.unmodifiableList( ingredients );
|
|
+ }
|
|
+ // Spigot end
|
|
}
|
|
--
|
|
2.1.0
|
|
|