Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,9 +1,8 @@
--- a/net/minecraft/server/FurnaceRecipe.java
+++ b/net/minecraft/server/FurnaceRecipe.java
@@ -2,6 +2,16 @@
@@ -1,5 +1,16 @@
package net.minecraft.server;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
+// CraftBukkit start
+import java.util.ArrayList;
+import java.util.List;
@@ -14,13 +13,15 @@
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.inventory.Recipe;
+// CraftBukkit end
+
public class FurnaceRecipe extends RecipeCooking {
public class FurnaceRecipe implements IRecipe {
@@ -56,6 +66,16 @@
return this.key;
public FurnaceRecipe(MinecraftKey minecraftkey, String s, RecipeItemStack recipeitemstack, ItemStack itemstack, float f, int i) {
@@ -10,4 +21,14 @@
public RecipeSerializer<?> getRecipeSerializer() {
return RecipeSerializer.o;
}
+
+ @Override
+ public Recipe toBukkitRecipe() {
+ CraftItemStack result = CraftItemStack.asCraftMirror(this.result);
@@ -30,7 +31,4 @@
+
+ return recipe;
+ }
+
public static class a implements RecipeSerializer<FurnaceRecipe> {
public a() {}
}