mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
8657cd91d7
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 63c208dd Remove no longer used import 70be76c7 PR-958: Further clarify deprecation of TAG_CONTAINER_ARRAY ae21f4ac PR-955: Add methods to place structures with block/entity transformers e3d960f2 SPIGOT-7547: Remark that Damageable#setAbsorptionAmount() is capped to a specific value b125516c Fix typo in RecipeChoice.ExactChoice docs 309497c1 Add EntityMountEvent and EntityDismount Event 2fd45ae3 Improve ItemFactory#enchantItem consistency 2b198268 PR-933: Define native persistent data types for lists CraftBukkit Changes: 771182f70 PR-1327: Add methods to place structures with block/entity transformers e41ad4c82 SPIGOT-7567: SpawnReason for SNOWMAN is reported as BUILD_IRONGOLEM 76931e8bd Add EntityMountEvent and EntityDismount Event 9b29b21c7 PR-1183: Better handle lambda expression and renaming of classes in Commodore 1462ebe85 Reformat Commodore.java 9fde4c037 PR-1324: Improve ItemFactory#enchantItem consistency 4e419c774 PR-1295: Define native persistent data types for lists dd8cca388 SPIGOT-7562: Fix Score#getScore and Score#isScoreSet 690278200 Only fetch an online UUID in online mode 1da8d9a53 Fire PreLogin events even in offline mode 2e88514ad PR-1325: Use CraftBlockType and CraftItemType instead of CraftMagicNumbers to convert between minecraft and bukkit block / item representation Spigot Changes: 864e4acc Restore accidentally removed package-info.java f91a10d5 Remove obsolete EntityMountEvent and EntityDismountEvent 828f0593 SPIGOT-7558: Deprecate silenceable lightning API as sound is now client-side and cannot be removed cdc4e035 Remove obsolete patch fetching correct mode UUIDs 49e36b8e Merge related BungeeCord patches 6e87b9ab Remove obsolete firing of PreLogin events in offline mode 5c76b183 Remove redundant patch dealing with exceptions in the crash reporter 3a2219d1 Remove redundant patch logging cause of unexpected exception
105 lines
4.1 KiB
Diff
105 lines
4.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 28 Jan 2014 19:13:57 -0500
|
|
Subject: [PATCH] Add ItemStack Recipe API helper methods
|
|
|
|
Allows using ExactChoice Recipes with easier methods
|
|
|
|
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/RecipeChoice.java b/src/main/java/org/bukkit/inventory/RecipeChoice.java
|
|
index 6734bc9d7a6eee8ee40419ae3fe245b67eabaca6..db8bcc66bdc4bedfffb4705db6338eda4c0ad29a 100644
|
|
--- a/src/main/java/org/bukkit/inventory/RecipeChoice.java
|
|
+++ b/src/main/java/org/bukkit/inventory/RecipeChoice.java
|
|
@@ -146,8 +146,6 @@ public interface RecipeChoice extends Predicate<ItemStack>, Cloneable {
|
|
/**
|
|
* Represents a choice that will be valid only if one of the stacks is
|
|
* exactly matched (aside from stack size).
|
|
- * <br>
|
|
- * <b>Only valid for shaped recipes</b>
|
|
*/
|
|
public static class ExactChoice implements RecipeChoice {
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
|
index 71e494177473c62449aafda1699b26a0c4c81a68..97d5d9c6347bc401e3f4ab7c0ba1391ad5b0449a 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
|
|
@@ -168,6 +168,13 @@ public class ShapedRecipe extends CraftingRecipe {
|
|
return this;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @NotNull
|
|
+ public ShapedRecipe setIngredient(char key, @NotNull ItemStack item) {
|
|
+ return setIngredient(key, new RecipeChoice.ExactChoice(item));
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* 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 d6e38c7ccfe3b6e85eafb611da20b1a29fb74d97..b8ac602cd2718d615ec243ce648951a1a46c26ec 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
|
|
@@ -131,6 +131,40 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
return this;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @NotNull
|
|
+ public ShapelessRecipe addIngredient(@NotNull ItemStack item) {
|
|
+ return addIngredient(item.getAmount(), item);
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public ShapelessRecipe addIngredient(int count, @NotNull ItemStack item) {
|
|
+ Preconditions.checkArgument(ingredients.size() + count <= 9, "Shapeless recipes cannot have more than 9 ingredients");
|
|
+ while (count-- > 0) {
|
|
+ ingredients.add(new RecipeChoice.ExactChoice(item));
|
|
+ }
|
|
+ return this;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public ShapelessRecipe removeIngredient(@NotNull ItemStack item) {
|
|
+ return removeIngredient(1, item);
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public ShapelessRecipe removeIngredient(int count, @NotNull ItemStack item) {
|
|
+ Iterator<RecipeChoice> iterator = ingredients.iterator();
|
|
+ while (count > 0 && iterator.hasNext()) {
|
|
+ RecipeChoice choice = iterator.next();
|
|
+ if (choice.test(item)) {
|
|
+ iterator.remove();
|
|
+ count--;
|
|
+ }
|
|
+ }
|
|
+ return this;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Removes an ingredient from the list.
|
|
*
|
|
@@ -154,7 +188,7 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
*/
|
|
@NotNull
|
|
public ShapelessRecipe removeIngredient(@NotNull Material ingredient) {
|
|
- return removeIngredient(ingredient, 0);
|
|
+ return removeIngredient(new ItemStack(ingredient)); // Paper - avoid using deprecated methods (magic values; RecipeChoice#getItemStack)
|
|
}
|
|
|
|
/**
|
|
@@ -181,7 +215,7 @@ public class ShapelessRecipe extends CraftingRecipe {
|
|
*/
|
|
@NotNull
|
|
public ShapelessRecipe removeIngredient(int count, @NotNull Material ingredient) {
|
|
- return removeIngredient(count, ingredient, 0);
|
|
+ return removeIngredient(count, new ItemStack(ingredient)); // Paper - avoid using deprecated methods (magic values; RecipeChoice#getItemStack)
|
|
}
|
|
|
|
/**
|