diff options
| author | md_5 <git@md-5.net> | 2018-08-17 20:40:54 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-17 20:40:54 +1000 |
| commit | bfb9131494176498e2444f7ac69bdc924192ee2e (patch) | |
| tree | 97a5657129e10eb41930d722ca84834e456bc020 /nms-patches | |
| parent | 06112946da2e82ed8cbdd5f210f2a3373800181e (diff) | |
| download | craftbukkit-bfb9131494176498e2444f7ac69bdc924192ee2e.tar craftbukkit-bfb9131494176498e2444f7ac69bdc924192ee2e.tar.gz craftbukkit-bfb9131494176498e2444f7ac69bdc924192ee2e.tar.lz craftbukkit-bfb9131494176498e2444f7ac69bdc924192ee2e.tar.xz craftbukkit-bfb9131494176498e2444f7ac69bdc924192ee2e.zip | |
SPIGOT-4283: Allow setting recipe groups
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/FurnaceRecipe.patch | 9 | ||||
| -rw-r--r-- | nms-patches/ShapedRecipes.patch | 6 | ||||
| -rw-r--r-- | nms-patches/ShapelessRecipes.patch | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/nms-patches/FurnaceRecipe.patch b/nms-patches/FurnaceRecipe.patch index 30eb77a1..4d150e73 100644 --- a/nms-patches/FurnaceRecipe.patch +++ b/nms-patches/FurnaceRecipe.patch @@ -11,7 +11,7 @@ public class FurnaceRecipe implements IRecipe { -@@ -56,6 +60,16 @@ +@@ -56,6 +60,19 @@ return this.key; } @@ -22,13 +22,16 @@ + list.buildChoices(); + net.minecraft.server.ItemStack stack = list.choices[0]; + -+ return new CraftFurnaceRecipe(CraftNamespacedKey.fromMinecraft(this.key), result, CraftItemStack.asCraftMirror(stack), this.experience, this.cookingTime); ++ CraftFurnaceRecipe recipe = new CraftFurnaceRecipe(CraftNamespacedKey.fromMinecraft(this.key), result, CraftItemStack.asCraftMirror(stack), this.experience, this.cookingTime); ++ recipe.setGroup(this.group); ++ ++ return recipe; + } + public static class a implements RecipeSerializer<FurnaceRecipe> { public a() {} -@@ -106,11 +120,11 @@ +@@ -106,11 +123,11 @@ return "smelting"; } diff --git a/nms-patches/ShapedRecipes.patch b/nms-patches/ShapedRecipes.patch index b68788a1..d38a490e 100644 --- a/nms-patches/ShapedRecipes.patch +++ b/nms-patches/ShapedRecipes.patch @@ -11,7 +11,7 @@ public class ShapedRecipes implements IRecipe { -@@ -32,6 +36,64 @@ +@@ -32,6 +36,66 @@ this.result = itemstack; } @@ -19,6 +19,8 @@ + public org.bukkit.inventory.ShapedRecipe toBukkitRecipe() { + CraftItemStack result = CraftItemStack.asCraftMirror(this.result); + CraftShapedRecipe recipe = new CraftShapedRecipe(result, this); ++ recipe.setGroup(this.f); ++ + switch (this.height) { + case 1: + switch (this.width) { @@ -76,7 +78,7 @@ public MinecraftKey getKey() { return this.e; } -@@ -302,11 +364,11 @@ +@@ -302,11 +366,11 @@ packetdataserializer.a(shapedrecipes.result); } diff --git a/nms-patches/ShapelessRecipes.patch b/nms-patches/ShapelessRecipes.patch index 9f214f4c..1b5c2636 100644 --- a/nms-patches/ShapelessRecipes.patch +++ b/nms-patches/ShapelessRecipes.patch @@ -11,7 +11,7 @@ public class ShapelessRecipes implements IRecipe { -@@ -20,6 +24,20 @@ +@@ -20,6 +24,22 @@ this.ingredients = nonnulllist; } @@ -20,6 +20,8 @@ + public org.bukkit.inventory.ShapelessRecipe toBukkitRecipe() { + CraftItemStack result = CraftItemStack.asCraftMirror(this.result); + CraftShapelessRecipe recipe = new CraftShapelessRecipe(result, this); ++ recipe.setGroup(this.b); ++ + for (RecipeItemStack list : this.ingredients) { + list.buildChoices(); + net.minecraft.server.ItemStack stack = list.choices[0]; @@ -32,7 +34,7 @@ public MinecraftKey getKey() { return this.a; } -@@ -127,11 +145,11 @@ +@@ -127,11 +147,11 @@ packetdataserializer.a(shapelessrecipes.result); } |