Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@1db35b2 Updated Upstream (Paper)
PurpurMC/Purpur@f109b7d fix "sponge.absorbs-lava" option not working correctly
PurpurMC/Purpur@76146ec add option for sponges to absorb water from mud
PurpurMC/Purpur@5f858fb add configurable shovel flattenables
PurpurMC/Purpur@cf3dca9 add an option for piglins to ignore gold-trimmed armor
PurpurMC/Purpur@1846bae [ci-skip] clean up stray imports
PurpurMC/Purpur@aeecb71 Updated Upstream (Paper)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.graphitemc.graphite
 version = 1.20.1-R0.1-SNAPSHOT
 
-purpurCommit = e5a5f228f324d3983d5a8596311faee98f792ad3
+purpurCommit = aeecb71060e0ef279209ac7e14620cab6189c452
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0004-Player-Skin-API.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Player Skin API
 Ability to change a player's skin easily through new API
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fb99e05b4769af604f41d81f036cee3b8a6ec197..00bcc9b4e6142ae647d91dd346a05ae65772f341 100644
+index 2e41fad4c033de003f89ab4ab549d2bf47ad7d4f..7800659b3f0caf64ddcff22dff512d94be7770a7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1084,8 +1084,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -29,7 +29,7 @@ index fb99e05b4769af604f41d81f036cee3b8a6ec197..00bcc9b4e6142ae647d91dd346a05ae6
      /**
       * Gets the no-ticking view distance for this player.
       * <p>
-@@ -3380,4 +3380,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3384,4 +3384,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          sendDeathScreen(message);
      }
      // Purpur end

patches/server/0002-Graphite-Configuration.patch

@@ -98,10 +98,10 @@ index a0aa1f1a7adf986d500a2135aa42e138aa3c4f08..b9fe1410a91231daf5c0e66a8628f69e
 +    // Graphite end
  }
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..12558edda8f66bca67b71508da02f238ca312247 100644
+index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc98115056e 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -134,7 +134,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -135,7 +135,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              SpigotConfig.readConfig(SpigotWorldConfig.class, this);
          }
      });
@@ -110,7 +110,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..12558edda8f66bca67b71508da02f238
 
 
      public PaperConfigurations(final Path globalFolder) {
-@@ -298,7 +298,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -300,7 +300,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          }
      }
 
@@ -119,15 +119,15 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..12558edda8f66bca67b71508da02f238
          return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig);
      }
 
-@@ -399,6 +399,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -401,6 +401,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
      }
 
 +    /* // Graphite start
      @Deprecated
      public YamlConfiguration createLegacyObject(final MinecraftServer server) {
          YamlConfiguration global = YamlConfiguration.loadConfiguration(this.globalFolder.resolve(this.globalConfigFileName).toFile());
-@@ -408,7 +409,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -410,7 +411,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              worlds.set(level.getWorld().getName(), YamlConfiguration.loadConfiguration(getWorldConfigFile(level).toFile()));
          }
          return global;
@@ -136,7 +136,7 @@ index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..12558edda8f66bca67b71508da02f238
 
      @Deprecated
      public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
-@@ -432,9 +433,15 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -434,9 +435,15 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
      }
 
      // Symlinks are not correctly checked in createDirectories
@@ -290,7 +290,7 @@ index 8f770b6d252f2ef6e8dc63c0093012978de565dc..b1a32fbfc51e4daa1ea36a4482c42ceb
 +    // Graphite end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d2bff98d1e2b137db9891f32703086c6d47b0fb7..a5bd34d71a2097cd1541917d45ab34a70d09b4ca 100644
+index 34d38a8b80da3a8ab12df6d5051c4da653bba777..0a89b28f05fc8e99add630ea56eff8955bf40bfd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -24,7 +24,6 @@ import java.io.FileNotFoundException;

patches/server/0008-Player-Skin-API.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Player Skin API
 Ability to change a player's skin easily through new API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cdbbdb3f5a8b43811c564d1444a2b102add3ba72..4008ecb0ff7f454cf6a737e593d535e13e81f7e8 100644
+index 8f7d6be9634f115159a216f818f12060244e70e2..5847504db7eb50b0d42a4b23b06f99011503b548 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3329,4 +3329,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3339,4 +3339,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message)));
      }
      // Purpur end