From b88a81e059a81bc53aab6061f254505aa1c14df0 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@Gmail.com>
Date: Mon, 17 Jan 2022 13:09:42 -0600
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@99cf01f Fix and deprecate ItemStack#getI18NDisplayName (#7358)
---
 gradle.properties                                             | 2 +-
 patches/api/0019-ItemStack-convenience-methods.patch          | 4 ++--
 .../0029-Fix-javadoc-warnings-missing-param-and-return.patch  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index de7f1e933..36f0be797 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
 mcVersion = 1.18.1
 packageVersion = 1_18_R1
 
-paperCommit = 5c74af2efa0e6cd7367a43c477042cf4ef145d07
+paperCommit = 99cf01f99354ea7e3496a4767006d5ae53e9b899
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0019-ItemStack-convenience-methods.patch b/patches/api/0019-ItemStack-convenience-methods.patch
index 97d31a960..2617e5edd 100644
--- a/patches/api/0019-ItemStack-convenience-methods.patch
+++ b/patches/api/0019-ItemStack-convenience-methods.patch
@@ -50,7 +50,7 @@ index 56e5ab93096801277ec5162981ddf5275d2c7669..bfcd5b17898ae97340d813bb46506234
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 56072cb4d32ca8a09023be08a5a832c2c108379a..401080c53a0f69dcdfb920dbf0c5a07e249f6338 100644
+index 7dfc84c77d8e185bb0513d9f9c603ce1b501a5e0..f5a696e5951f01fc7f5ab285561dc9777c74228f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -72,7 +72,7 @@ index 56072cb4d32ca8a09023be08a5a832c2c108379a..401080c53a0f69dcdfb920dbf0c5a07e
  
  /**
   * Represents a stack of items.
-@@ -954,4 +966,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
+@@ -957,4 +969,626 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
          return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
      }
      // Paper end
diff --git a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
index 5e5c5e548..419bb9f23 100644
--- a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -1328,7 +1328,7 @@ index c7b17eabf07b829a02afe7c1f27a5127b6bfea70..d4e2bcf8ce8fc2af851b471490147f00
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 8677e273641a46aae7107361f23f6ded59a50dc0..fc6bbe662b1da5ca7f4e98c6cc4457bf00529fd4 100644
+index 6a4c4161adabb8e131761c2af4bdf1f26b52434d..7251beaec15dcd9f4dbd6a76b85b4006f5e20490 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -148,6 +148,7 @@ public interface ItemFactory {
@@ -1339,7 +1339,7 @@ index 8677e273641a46aae7107361f23f6ded59a50dc0..fc6bbe662b1da5ca7f4e98c6cc4457bf
       * @return A hover event
       */
      @NotNull
-@@ -188,7 +189,7 @@ public interface ItemFactory {
+@@ -191,7 +192,7 @@ public interface ItemFactory {
      /**
       * Creates a {@link net.md_5.bungee.api.chat.hover.content.Content} of that ItemStack for displaying.
       *