twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 11:45:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

31
nms-patches/RecipesBanner.patch
View File

@@ -1,32 +1,35 @@
--- a/net/minecraft/server/RecipesBanner.java
+++ b/net/minecraft/server/RecipesBanner.java
@@ -20,9 +20,13 @@
craftingmanager.a(new RecipesBanner.AddRecipe(null));
}
@@ -2,9 +2,16 @@
- static class AddRecipe implements IRecipe {
+ static class AddRecipe extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
import javax.annotation.Nullable;
- private AddRecipe() {}
-public class RecipesBanner { public static class AddRecipe extends IRecipe {
+// CraftBukkit - decompile weirdness
+public class RecipesBanner {
- public AddRecipe() {}
+ public static class AddRecipe extends ShapelessRecipes { // CraftBukkit
+
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ private AddRecipe() {
+ super(new ItemStack(Items.BANNER, 0, 0), java.util.Arrays.asList(new ItemStack(Items.BANNER)));
+ public AddRecipe() {
+ super("", new ItemStack(Items.BANNER, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BANNER)));
+ }
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
boolean flag = false;
@@ -208,9 +212,13 @@
@@ -186,9 +193,13 @@
}
}
- static class DuplicateRecipe implements IRecipe {
+ static class DuplicateRecipe extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
- public static class DuplicateRecipe extends IRecipe {
+ public static class DuplicateRecipe extends ShapelessRecipes { // CraftBukkit - added extends
- private DuplicateRecipe() {}
- public DuplicateRecipe() {}
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ private DuplicateRecipe() {
+ super(new ItemStack(Items.BANNER, 0, 0), java.util.Arrays.asList(new ItemStack(Items.DYE, 0, 5)));
+ public DuplicateRecipe() {
+ super("", new ItemStack(Items.BANNER, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.DYE)));
+ }
+ // CraftBukkit end