Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@8e04c6f Allow grindstone overstacking items

patches/api/0001-Pufferfish-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Sat, 15 Oct 2022 18:00:49 +0000
+Date: Sat, 15 Oct 2022 18:52:46 +0000
 Subject: [PATCH] Pufferfish API Changes
 
 Original by Kevin Raneri <[email protected]>

patches/api/0002-Purpur-API-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Sat, 15 Oct 2022 18:02:31 +0000
+Date: Sat, 15 Oct 2022 18:54:33 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original by PurpurMC Team

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Sat, 15 Oct 2022 18:00:49 +0000
+Date: Sat, 15 Oct 2022 18:52:46 +0000
 Subject: [PATCH] Pufferfish Server Changes
 
 Original by Kevin Raneri <[email protected]>

patches/server/0002-Purpur-Server-Changes.patch

@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: AlphaKR93 <[email protected]>
-Date: Sat, 15 Oct 2022 18:02:30 +0000
+Date: Sat, 15 Oct 2022 18:54:33 +0000
 Subject: [PATCH] Purpur Server Changes
 
 Original by PurpurMC Team
@@ -15907,7 +15907,7 @@ index f7404f41c2df202a428711e7e09a9a6eb11bf527..d0baf170d0b535b4b1a8c48944a91de3
          });
      }
 diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
-index 740b778ce14f241e509f17c3a84b9ed47cdeeebe..43d7ca6ceb89d65149314e56a846081d6c3a048a 100644
+index 740b778ce14f241e509f17c3a84b9ed47cdeeebe..1344c2bc08743088c56862469949dcb148a99a8b 100644
 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
 @@ -95,9 +95,11 @@ public class GrindstoneMenu extends AbstractContainerMenu {
@@ -15932,6 +15932,15 @@ index 740b778ce14f241e509f17c3a84b9ed47cdeeebe..43d7ca6ceb89d65149314e56a846081d
                          j += enchantment.getMinCost(integer);
                      }
                  }
+@@ -198,7 +200,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
+                 i = Math.max(item.getMaxDamage() - l, 0);
+                 itemstack2 = this.mergeEnchants(itemstack, itemstack1);
+                 if (!itemstack2.isDamageableItem()) {
+-                    if (!ItemStack.matches(itemstack, itemstack1) || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check
++                    if (!ItemStack.matches(itemstack, itemstack1) || ((org.bukkit.craftbukkit.entity.CraftPlayer)this.player).getHandle().getLevel().purpurConfig.grindstoneAllowOversizedStacking || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check // Purpur
+                         this.resultSlots.setItem(0, ItemStack.EMPTY);
+                         this.broadcastChanges();
+                         return;
 @@ -230,7 +232,7 @@ public class GrindstoneMenu extends AbstractContainerMenu {
              Entry<Enchantment, Integer> entry = (Entry) iterator.next();
              Enchantment enchantment = (Enchantment) entry.getKey();
@@ -21684,10 +21693,10 @@ index 0000000000000000000000000000000000000000..5d71e3040df116a94df7efa83e61dc17
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..33d7c132b19095598eb681da8487a072f1dccab6
+index 0000000000000000000000000000000000000000..daa437f3aaebed4d917fde65d75a8a941755a764
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -0,0 +1,3139 @@
+@@ -0,0 +1,3144 @@
 +package org.purpurmc.purpur;
 +
 +import gg.pufferfish.pufferfish.PufferfishConfig;
@@ -22595,6 +22604,11 @@ index 0000000000000000000000000000000000000000..33d7c132b19095598eb681da8487a072
 +        endPortalSafeTeleporting = getBoolean("blocks.end_portal.safe-teleporting", endPortalSafeTeleporting);
 +    }
 +
++    public boolean grindstoneAllowOversizedStacking = false;
++    private void grindstoneSettings() {
++        grindstoneAllowOversizedStacking = getBoolean("blocks.grindstone.allow-oversized-stacking", grindstoneAllowOversizedStacking);
++    }
++
 +    public boolean mobsSpawnOnPackedIce = true;
 +    public boolean mobsSpawnOnBlueIce = true;
 +    public boolean snowOnBlueIce = true;

patches/server/0004-Fix-Purpur-patches.patch

@@ -125,10 +125,10 @@ index 5dab2eea9e9c50e41c7971daefc3bbe819583207..7d310183e7715aac4f442948ef210b47
 
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 33d7c132b19095598eb681da8487a072f1dccab6..d3e14750f70d8311ebf0b910ad03681a247fdbcb 100644
+index daa437f3aaebed4d917fde65d75a8a941755a764..2d36e2bf685f1d5a3910e07be9697c663e6bcd75 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1046,12 +1046,14 @@ public class PurpurWorldConfig {
+@@ -1051,12 +1051,14 @@ public class PurpurWorldConfig {
      public boolean allayRidableInWater = false;
      public boolean allayControllable = true;
      public List<String> allayRespectNBT = new ArrayList<>();
@@ -143,7 +143,7 @@ index 33d7c132b19095598eb681da8487a072f1dccab6..d3e14750f70d8311ebf0b910ad03681a
      }
 
      public boolean axolotlRidable = false;
-@@ -1565,12 +1567,14 @@ public class PurpurWorldConfig {
+@@ -1570,12 +1572,14 @@ public class PurpurWorldConfig {
      public boolean frogControllable = true;
      public float frogRidableJumpHeight = 0.65F;
      public int frogBreedingTicks = 6000;
@@ -158,7 +158,7 @@ index 33d7c132b19095598eb681da8487a072f1dccab6..d3e14750f70d8311ebf0b910ad03681a
      }
 
      public boolean ghastRidable = false;
-@@ -2618,10 +2622,12 @@ public class PurpurWorldConfig {
+@@ -2623,10 +2627,12 @@ public class PurpurWorldConfig {
      public boolean tadpoleRidable = false;
      public boolean tadpoleRidableInWater = false;
      public boolean tadpoleControllable = true;
@@ -171,7 +171,7 @@ index 33d7c132b19095598eb681da8487a072f1dccab6..d3e14750f70d8311ebf0b910ad03681a
      }
 
      public boolean traderLlamaRidable = false;
-@@ -2832,10 +2838,12 @@ public class PurpurWorldConfig {
+@@ -2837,10 +2843,12 @@ public class PurpurWorldConfig {
      public boolean wardenRidable = false;
      public boolean wardenRidableInWater = false;
      public boolean wardenControllable = true;

upstream-data

@@ -1,2 +1,2 @@
-purpur = 50687db56514cd1def86d0edca901f6dc1c63e9e
+purpur = 8e04c6f3265f6b70c30a87ba0121bbf58d59ea07
 pufferfish = 69bd43d2afe35e28c58f72f2957c25a4d2e2f059