SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
paper-server/nms-patches/RecipesFurnace.patch
View File

@@ -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<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;
@@ -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 @@
}