summaryrefslogtreecommitdiffstats
path: root/nms-patches/RecipesFurnace.patch
blob: 4aaa2534391d8c87f1365502674b435ad78d122e (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
--- ../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 @@
     private static final RecipesFurnace a = new RecipesFurnace();
     public Map recipes = Maps.newHashMap();
     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);
         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 @@
     }
 
     public ItemStack getResult(ItemStack itemstack) {
-        Iterator iterator = this.recipes.entrySet().iterator();
+        // CraftBukkit start - initialize to customRecipes
+        boolean vanilla = false;
+        Iterator iterator = this.customRecipes.entrySet().iterator();
+        // CraftBukkit end
 
         Entry entry;
 
         do {
             if (!iterator.hasNext()) {
-                return null;
+                // CraftBukkit start - fall back to vanilla recipes
+                if (!vanilla && !recipes.isEmpty()) {
+                    iterator = this.recipes.entrySet().iterator();
+                    vanilla = true;
+                } else {
+                    return null;
+                }
+                // CraftBukkit end
             }
 
             entry = (Entry) iterator.next();