Paper/nms-patches/RecipesFurnace.patch

80 lines
2.9 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/RecipesFurnace.java
+++ b/net/minecraft/server/RecipesFurnace.java
2016-06-09 03:43:49 +02:00
@@ -9,8 +9,10 @@
public class RecipesFurnace {
2016-02-29 22:32:46 +01:00
private static final RecipesFurnace a = new RecipesFurnace();
2016-06-09 03:43:49 +02:00
- public final Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
+ public Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
private final Map<ItemStack, Float> experience = Maps.newHashMap();
+ public Map<ItemStack,ItemStack> customRecipes = Maps.newHashMap(); // CraftBukkit - add field
+ public Map<ItemStack,Float> customExperience = Maps.newHashMap(); // CraftBukkit - add field
public static RecipesFurnace getInstance() {
return RecipesFurnace.a;
2016-05-10 13:47:39 +02:00
@@ -55,6 +57,12 @@
this.registerRecipe(Blocks.QUARTZ_ORE, new ItemStack(Items.QUARTZ), 0.2F);
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - add method
2016-02-29 22:32:46 +01:00
+ public void registerRecipe(ItemStack itemstack, ItemStack itemstack1, float f) {
+ this.customRecipes.put(itemstack, itemstack1);
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
public void registerRecipe(Block block, ItemStack itemstack, float f) {
this.a(Item.getItemOf(block), itemstack, f);
2015-02-26 23:41:06 +01:00
}
2016-05-10 13:47:39 +02:00
@@ -70,13 +78,23 @@
2016-05-10 13:47:39 +02:00
@Nullable
public ItemStack getResult(ItemStack itemstack) {
- Iterator iterator = this.recipes.entrySet().iterator();
+ // CraftBukkit start - initialize to customRecipes
+ boolean vanilla = false;
+ Iterator<Entry<ItemStack, ItemStack>> iterator = this.customRecipes.entrySet().iterator();
+ // CraftBukkit end
Entry entry;
do {
if (!iterator.hasNext()) {
- return null;
+ // CraftBukkit start - fall back to vanilla recipes
2016-02-29 22:32:46 +01:00
+ if (!vanilla && !this.recipes.isEmpty()) {
+ iterator = this.recipes.entrySet().iterator();
+ vanilla = true;
+ } else {
+ return null;
+ }
+ // CraftBukkit end
}
2016-02-29 22:32:46 +01:00
entry = (Entry) iterator.next();
2016-05-10 13:47:39 +02:00
@@ -94,13 +112,23 @@
2016-02-29 22:32:46 +01:00
}
public float b(ItemStack itemstack) {
2016-06-09 03:43:49 +02:00
- Iterator iterator = this.experience.entrySet().iterator();
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start - initialize to customRecipes
+ boolean vanilla = false;
+ Iterator<Entry<ItemStack, Float>> iterator = this.customExperience.entrySet().iterator();
2016-02-29 22:32:46 +01:00
+ // CraftBukkit end
Entry entry;
do {
if (!iterator.hasNext()) {
- return 0.0F;
+ // CraftBukkit start - fall back to vanilla recipes
2016-06-09 03:43:49 +02:00
+ if (!vanilla && !this.experience.isEmpty()) {
+ iterator = this.experience.entrySet().iterator();
2016-02-29 22:32:46 +01:00
+ vanilla = true;
+ } else {
+ return 0.0F;
+ }
+ // CraftBukkit end
}
entry = (Entry) iterator.next();