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
50
51
52
53
54
55
56
57
58
59
|
--- a/net/minecraft/server/RecipesFurnace.java
+++ b/net/minecraft/server/RecipesFurnace.java
@@ -8,14 +8,15 @@
public class RecipesFurnace {
private static final RecipesFurnace a = new RecipesFurnace();
- private Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
+ public Map<ItemStack, ItemStack> recipes = Maps.newHashMap(); // CraftBukkit - public
private Map<ItemStack, Float> c = Maps.newHashMap();
+ public Map customRecipes = Maps.newHashMap(); // CraftBukkit - add field
public static RecipesFurnace getInstance() {
return RecipesFurnace.a;
}
- 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 @@
}
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();
|
