Paper/Spigot-API-Patches/0149-Add-ItemStackRecipeChoice-Draft-API.patch
Shane Freeder 0976d52bbd Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Please note that this build includes changes to meet upstreams
requirements for nullability annotations. While we aim for a level of
accuracy, these might not be 100% correct, if there are any issues,
please speak to us on discord, or open an issue on the tracker to
discuss.

Bukkit Changes:
9a6a1de3 Remove nullability annotations from enum constructors
3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API

CraftBukkit Changes:
8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep
8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals
39a287b7 Don't ignore newlines in PlayerListHeader/Footer

Spigot Changes:
cf694d87 Add nullability annotations
2019-03-20 00:31:18 +00:00

70 Zeilen
2.0 KiB
Diff

From 28da2c2e4131200abea38d1655801de42bff18ed Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 13 Sep 2018 21:39:26 -0400
Subject: [PATCH] Add ItemStackRecipeChoice Draft API
This is based on Spigots Draft API. This is subject to change
Allows creating recipes that must match isSimilar to full item stack.
diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
new file mode 100644
index 000000000..43e6576b1
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
@@ -0,0 +1,51 @@
+package com.destroystokyo.paper.inventory;
+
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.RecipeChoice;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Allows crafting Items that require full matching itemstacks to complete the recipe for custom items
+ * @deprecated Draft API
+ */
+@Deprecated
+public class ItemStackRecipeChoice implements RecipeChoice {
+
+ protected final List<ItemStack> choices = new ArrayList<>();
+
+ public ItemStackRecipeChoice(ItemStack choices) {
+ this.choices.add(choices);
+ }
+
+ public ItemStackRecipeChoice(List<ItemStack> choices) {
+ this.choices.addAll(choices);
+ }
+
+ @Override
+ public ItemStack getItemStack() {
+ return choices.isEmpty() ? null : choices.get(0);
+ }
+
+ @Override
+ public RecipeChoice clone() {
+ try {
+ ItemStackRecipeChoice clone = (ItemStackRecipeChoice) super.clone();
+ clone.choices.addAll(this.choices);
+ return clone;
+ } catch (CloneNotSupportedException ex) {
+ throw new AssertionError(ex);
+ }
+ }
+
+ @Override
+ public boolean test(ItemStack itemStack) {
+ for (ItemStack stack : choices) {
+ if (stack.isSimilar(itemStack)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
--
2.21.0