From d8a9c7be4227b2243968b63ab7cc7a00098c93ad Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Thu, 26 Feb 2015 22:41:06 +0000 Subject: Update to Minecraft 1.8.3 --- nms-patches/RecipesFurnace.patch | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'nms-patches/RecipesFurnace.patch') diff --git a/nms-patches/RecipesFurnace.patch b/nms-patches/RecipesFurnace.patch index 4aaa2534..436ca355 100644 --- a/nms-patches/RecipesFurnace.patch +++ b/nms-patches/RecipesFurnace.patch @@ -1,26 +1,36 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/RecipesFurnace.java 2014-11-28 17:43:43.361707429 +0000 -+++ src/main/java/net/minecraft/server/RecipesFurnace.java 2014-11-28 17:38:20.000000000 +0000 -@@ -10,6 +10,7 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/RecipesFurnace.java 2015-02-26 22:40:23.059608134 +0000 ++++ src/main/java/net/minecraft/server/RecipesFurnace.java 2015-02-26 22:40:23.059608134 +0000 +@@ -8,14 +8,15 @@ + public class RecipesFurnace { + private static final RecipesFurnace a = new RecipesFurnace(); - public Map recipes = Maps.newHashMap(); - private Map c = Maps.newHashMap(); +- private Map recipes = Maps.newHashMap(); ++ public Map recipes = Maps.newHashMap(); // CraftBukkit - public + private Map c = Maps.newHashMap(); + public Map customRecipes = Maps.newHashMap(); // CraftBukkit - add field public static RecipesFurnace getInstance() { return RecipesFurnace.a; -@@ -52,6 +53,12 @@ - this.registerRecipe(Blocks.LAPIS_ORE, new ItemStack(Items.DYE, 1, EnumColor.BLUE.getInvColorIndex()), 0.2F); + } + +- private RecipesFurnace() { ++ public RecipesFurnace() { // CraftBukkit - public + this.registerRecipe(Blocks.IRON_ORE, new ItemStack(Items.IRON_INGOT), 0.7F); + this.registerRecipe(Blocks.GOLD_ORE, new ItemStack(Items.GOLD_INGOT), 1.0F); + this.registerRecipe(Blocks.DIAMOND_ORE, new ItemStack(Items.DIAMOND), 1.0F); +@@ -53,6 +54,12 @@ this.registerRecipe(Blocks.QUARTZ_ORE, new ItemStack(Items.QUARTZ), 0.2F); } -+ + + // CraftBukkit start - add method + public void registerRecipe(ItemStack itemstack, ItemStack itemstack1) { + this.customRecipes.put(itemstack, itemstack1); + } + // CraftBukkit end - ++ public void registerRecipe(Block block, ItemStack itemstack, float f) { this.a(Item.getItemOf(block), itemstack, f); + } @@ -67,13 +74,23 @@ } -- cgit v1.2.3