Update to Minecraft 1.12-pre2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-05-14 12:00:00 +10:00
parent b8446f770b
commit 40c8954e17
210 changed files with 2280 additions and 1974 deletions

View File

@@ -12,8 +12,8 @@
public static RecipesFurnace getInstance() {
return RecipesFurnace.a;
@@ -78,6 +80,13 @@
this.a(Items.GOLDEN_HORSE_ARMOR, new ItemStack(Items.GOLD_NUGGET), 0.1F);
@@ -94,6 +96,13 @@
this.a(new ItemStack(Blocks.STAINED_HARDENED_CLAY, 1, EnumColor.BLACK.getColorIndex()), new ItemStack(Blocks.dQ), 0.1F);
}
+ // CraftBukkit start - add method
@@ -26,7 +26,7 @@
public void registerRecipe(Block block, ItemStack itemstack, float f) {
this.a(Item.getItemOf(block), itemstack, f);
}
@@ -92,13 +101,23 @@
@@ -108,13 +117,23 @@
}
public ItemStack getResult(ItemStack itemstack) {
@@ -52,7 +52,7 @@
}
entry = (Entry) iterator.next();
@@ -116,13 +135,23 @@
@@ -132,13 +151,23 @@
}
public float b(ItemStack itemstack) {