Update to Minecraft 1.8.3

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

View File

@@ -1,22 +1,20 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ShapedRecipes.java 2014-11-28 17:43:43.373707429 +0000
+++ src/main/java/net/minecraft/server/ShapedRecipes.java 2014-11-28 17:38:18.000000000 +0000
@@ -1,5 +1,11 @@
--- /home/matt/mc-dev-private//net/minecraft/server/ShapedRecipes.java 2015-02-26 22:40:23.079608134 +0000
+++ src/main/java/net/minecraft/server/ShapedRecipes.java 2015-02-26 22:40:23.079608134 +0000
@@ -1,5 +1,10 @@
package net.minecraft.server;
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.inventory.CraftShapedRecipe;
+// CraftBukkit end
+
+
public class ShapedRecipes implements IRecipe {
private final int width;
@@ -14,6 +20,62 @@
this.items = aitemstack;
@@ -15,6 +20,62 @@
this.result = itemstack;
}
+
+ // CraftBukkit start
+ public org.bukkit.inventory.ShapedRecipe toBukkitRecipe() {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
@@ -72,6 +70,7 @@
+ return recipe;
+ }
+ // CraftBukkit end
+
public ItemStack b() {
return this.result;
}