mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 23:57:43 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
69 lines
2 KiB
Diff
69 lines
2 KiB
Diff
From 7623f58212aed74956a8d56b287b1e43c7ed3bb7 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
|
|
|