From 1bbb0334799623b7d50beb920f35bd5f591471d1 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Thu, 23 May 2024 15:12:39 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a9201d4 [ci skip] Move logic in our patches to ItemType/BlockType (#10772)
PaperMC/Paper@3de408e Fix equipment slot and group API (#10767)
PaperMC/Paper@d408381 Print CommandRegisteredEvent deprecation warnings again (#10756)
PaperMC/Paper@6de7a1f Improve default item attributes API (#10765)
PaperMC/Paper@2a90732 Remove incorrect logic for Fireball#setVelocity (#10764)
PaperMC/Paper@5e7b65a Allow using PluginLoader classpath API from Bukkit plugins (#10758)
---
 gradle.properties                                           | 2 +-
 patches/api/0015-ItemStack-convenience-methods.patch        | 4 ++--
 .../api/0041-Add-log-suppression-for-LibraryLoader.patch    | 6 +++---
 patches/server/0001-Rebrand.patch                           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5cb0a883f..4452a0f11 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = b14958485d88cdf2ba5e1ea4a7bc3171ba9a7de3
+paperCommit = 5e7b65a9a9c0c9f51679933447bfad543fc1e11d
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0015-ItemStack-convenience-methods.patch b/patches/api/0015-ItemStack-convenience-methods.patch
index 410afb4bd..5d52b2610 100644
--- a/patches/api/0015-ItemStack-convenience-methods.patch
+++ b/patches/api/0015-ItemStack-convenience-methods.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 81f9ad99699a78b97e4accaaf1a98eacf29493ce..e3e996d932db689ba62a43f7f01d6f003f8337d3 100644
+index 4f7f91b5e2903ce3b180c637cb463e01a860271e..5b14cea8d246f31c51b09baa731e673f305aea6e 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -5701,4 +5701,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -5733,4 +5733,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
          }
          return Registry.BLOCK.get(material.key);
      }
diff --git a/patches/api/0041-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0041-Add-log-suppression-for-LibraryLoader.patch
index d1a85cb9d..89e515574 100644
--- a/patches/api/0041-Add-log-suppression-for-LibraryLoader.patch
+++ b/patches/api/0041-Add-log-suppression-for-LibraryLoader.patch
@@ -17,7 +17,7 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d
      /**
       * This class was not meant to be constructed explicitly
 diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-index 8e1b6be2462aaa692efa1f72986921a6dc357196..b6e18b12fd4d61ce92203582906d24b4d14e6cc5 100644
+index c66252802c51174bc26f266cb5cdecdd856ff220..97f580fccd06a8db5f592a53c8b95a7a6159adac 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 @@ -68,6 +68,7 @@ public class LibraryLoader
@@ -28,7 +28,7 @@ index 8e1b6be2462aaa692efa1f72986921a6dc357196..b6e18b12fd4d61ce92203582906d24b4
                  logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
              }
          } );
-@@ -88,6 +89,7 @@ public class LibraryLoader
+@@ -94,6 +95,7 @@ public class LibraryLoader
          {
              return null;
          }
@@ -36,7 +36,7 @@ index 8e1b6be2462aaa692efa1f72986921a6dc357196..b6e18b12fd4d61ce92203582906d24b4
          logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
          {
              java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
-@@ -135,6 +137,7 @@ public class LibraryLoader
+@@ -144,6 +146,7 @@ public class LibraryLoader
              }
  
              jarFiles.add( url );
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 423e26f1f..e3f4e5b53 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -252,10 +252,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 5a382907285a288f2a223189e690d3dbdf45594c..3daf674f1e0de3fdd89db5536cc1e34140a5abb8 100644
+index e46714f38df931350d81c30907560c381c8d2725..777f1d11d9fb5af29ec895383902daf348eb528e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -511,7 +511,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -502,7 +502,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {