mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ci skip] Correct upstream/paper javadoc (#8286)

Browse source
This commit is contained in:
Lulu13022002 2023-03-31 06:09:13 +02:00 • committed by GitHub
parent bf92f3e4db
commit 06fdc02537
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 840 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch
View file

@ -9,10 +9,10 @@ Redirects some of upstream's APIs to these new methods to avoid
usage of magic values and the deprecated RecipeChoice#getItemStack
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
index 7be830ea0a3b24c5cdfb8e6ab62cb2ee506a4026..baba8485587baab945add8bc91e91a1bfa27c84b 100644
index beaccd383df0d1fa1b1c88953d72198c2237a6a6..7a73a8dc30c5c3acfe8c686a0328728c17bd8e66 100644
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -146,6 +146,13 @@ public class ShapedRecipe implements Recipe, Keyed {
@@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed {
return this;
}
@ -27,10 +27,10 @@ index 7be830ea0a3b24c5cdfb8e6ab62cb2ee506a4026..baba8485587baab945add8bc91e91a1b
* Get a copy of the ingredients map.
*
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
index 62675962d1b7882b953d2618aed1f363c046e97d..61b3a1b1d03fe6cdacb82b07e6c7197f56b4a1b3 100644
index 05ef88225415cd30de36f4517b6fb40d826ce996..8bf26da12dcb03f22f842a57798948d5513c227d 100644
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -144,6 +144,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -141,6 +141,40 @@ public class ShapelessRecipe implements Recipe, Keyed {
return this;
}
@ -71,7 +71,7 @@ index 62675962d1b7882b953d2618aed1f363c046e97d..61b3a1b1d03fe6cdacb82b07e6c7197f
/**
* Removes an ingredient from the list.
*
@@ -167,7 +201,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -164,7 +198,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
*/
@NotNull
public ShapelessRecipe removeIngredient(@NotNull Material ingredient) {
@ -80,7 +80,7 @@ index 62675962d1b7882b953d2618aed1f363c046e97d..61b3a1b1d03fe6cdacb82b07e6c7197f
}
/**
@@ -194,7 +228,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@@ -191,7 +225,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
*/
@NotNull
public ShapelessRecipe removeIngredient(int count, @NotNull Material ingredient) {