mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 20:46:59 +01:00
7b0c576798
Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
72 lines
2.5 KiB
Diff
72 lines
2.5 KiB
Diff
From 3465b07e449161d85abe8cd042340288785ebde9 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 bb28c12..c0836e4 100644
|
|
--- a/src/main/java/net/minecraft/server/IRecipe.java
|
|
+++ b/src/main/java/net/minecraft/server/IRecipe.java
|
|
@@ -11,4 +11,6 @@ public interface IRecipe {
|
|
ItemStack b();
|
|
|
|
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 cc444db..867dd07 100644
|
|
--- a/src/main/java/net/minecraft/server/ShapedRecipes.java
|
|
+++ b/src/main/java/net/minecraft/server/ShapedRecipes.java
|
|
@@ -10,7 +10,7 @@ public class ShapedRecipes implements IRecipe {
|
|
private int width;
|
|
private int height;
|
|
private ItemStack[] items;
|
|
- private ItemStack result;
|
|
+ public ItemStack result; // Spigot
|
|
private boolean e;
|
|
|
|
public ShapedRecipes(int i, int j, ItemStack[] aitemstack, ItemStack itemstack) {
|
|
@@ -156,4 +156,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 0fab83c..21181fb 100644
|
|
--- a/src/main/java/net/minecraft/server/ShapelessRecipes.java
|
|
+++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java
|
|
@@ -11,7 +11,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) {
|
|
@@ -75,4 +75,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
|
|
}
|
|
--
|
|
1.9.1
|
|
|