Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions

View File

@@ -1,20 +1,17 @@
--- a/net/minecraft/server/RecipiesShield.java
+++ b/net/minecraft/server/RecipiesShield.java
@@ -1,8 +1,15 @@
@@ -1,10 +1,12 @@
package net.minecraft.server;
-public class RecipiesShield { public static class Decoration implements IRecipe {
+// CraftBukkit - decompile weirdness
+public class RecipiesShield {
-public class RecipiesShield extends IRecipeComplex {
+public class RecipiesShield extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
- public Decoration() {}
+ public static class Decoration extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
+
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ public Decoration() {
+ super("", new ItemStack(Items.SHIELD, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BANNER)));
+ }
+ // CraftBukkit end
+ // CraftBukkit start - Delegate to new parent class with bogus info
public RecipiesShield(MinecraftKey minecraftkey) {
- super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.SHIELD, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WHITE_BANNER)));
}
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
ItemStack itemstack = ItemStack.a;
public boolean a(IInventory iinventory, World world) {
if (!(iinventory instanceof InventoryCrafting)) {