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 Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
70 lines
2 KiB
Diff
70 lines
2 KiB
Diff
From 3fda3c194e7401c8a71415625cd66b7c9fa8dbc1 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.25.1
|
|
|