Update to Minecraft 1.12-pre2

This commit is contained in:
md_5
2017-05-14 12:00:00 +10:00
parent 6e3cec8bc7
commit 5195487ec6
210 changed files with 2280 additions and 1974 deletions

View File

@@ -1,16 +1,18 @@
--- a/net/minecraft/server/RecipeShulkerBox.java
+++ b/net/minecraft/server/RecipeShulkerBox.java
@@ -9,9 +9,13 @@
craftingmanager.a(new RecipeShulkerBox.Dye(null));
}
@@ -1,8 +1,15 @@
package net.minecraft.server;
- static class Dye implements IRecipe {
+ static class Dye extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
-public class RecipeShulkerBox { public static class Dye extends IRecipe {
+// CraftBukkit - decompile weirdness
+public class RecipeShulkerBox {
- private Dye() {}
- public Dye() {}
+ public static class Dye extends ShapelessRecipes { // CraftBukkit
+
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ public Dye() {
+ super(new ItemStack(Blocks.WHITE_SHULKER_BOX, 0, 0), java.util.Arrays.asList(new ItemStack(Items.DYE, 0, 5)));
+ super("", new ItemStack(Blocks.WHITE_SHULKER_BOX, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.DYE)));
+ }
+ // CraftBukkit end