[ci skip] Updated Upstream (Paper/Purpur)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@39203a65 [ci/skip] Publish PR API and dev bundles (#12672)
PaperMC/Paper@a1b30587 Provide env environment variable and copy spigots sys prop for overriding default repository

Purpur Changes:
PurpurMC/Purpur@b1d412fb Updated Upstream (Paper)
PurpurMC/Purpur@293e28a0 use empty registryaccess where context is not needed, closes #1676
PurpurMC/Purpur@452bb319 port PaperMC/Paper#12654, closes #1665
PurpurMC/Purpur@849bc79c register test subcommands used for debugging, closes #1675
PurpurMC/Purpur@61d7f559 Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group=cn.dreeam.leaf
 mcVersion=1.21.5
 version=1.21.5-R0.1-SNAPSHOT
 
-paperCommit=ba7fb23ddd2376079951d1e22f9204d1ed691585
+paperCommit=a1b30587d9d5a5d9bf1530f7d1e289f2e29991b6
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

leaf-api/build.gradle.kts.patch

@@ -145,11 +145,13 @@
          "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
          "https://javadoc.io/doc/org.joml/joml/1.10.8/",
          "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
-@@ -185,7 +_,7 @@
+@@ -184,8 +_,8 @@
+         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
          "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
          "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
-         "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
+-        // "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/", // TODO: Broken
 -        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
++        "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
 +        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // Leaf - Bump Dependencies
      )
      options.tags("apiNote:a:API Note:")

leaf-api/paper-patches/features/0007-Do-not-log-plugin-library-loads.patch

@@ -55,10 +55,10 @@ index 163e9a0e179dc88be93614ff66ee2be3eccc694f..539786355ac89b5eb8ad876e65662e84
       * 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 3200a3c9af5fa2ecbbc2b07be3ec31a2681180a8..cfe41c0a67c8d729b6bd23b0cfa32db3c9db9f74 100644
+index 7e4e702845f61703f0741add59f7cfc0afea1543..23e3fcc8c2d6e0555448295199eee186de619042 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-@@ -63,6 +63,7 @@ public class LibraryLoader {
+@@ -77,6 +77,7 @@ public class LibraryLoader {
          session.setTransferListener(new AbstractTransferListener() {
              @Override
              public void transferStarted(@NotNull TransferEvent event) {
@@ -66,7 +66,7 @@ index 3200a3c9af5fa2ecbbc2b07be3ec31a2681180a8..cfe41c0a67c8d729b6bd23b0cfa32db3
                  logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
              }
          });
-@@ -88,6 +89,7 @@ public class LibraryLoader {
+@@ -102,6 +103,7 @@ public class LibraryLoader {
              // Paper end - plugin loader api
              return null;
          }
@@ -74,7 +74,7 @@ index 3200a3c9af5fa2ecbbc2b07be3ec31a2681180a8..cfe41c0a67c8d729b6bd23b0cfa32db3
          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
-@@ -140,6 +142,7 @@ public class LibraryLoader {
+@@ -154,6 +156,7 @@ public class LibraryLoader {
              }
  
              jarFiles.add(url);

leaf-api/paper-patches/features/0013-Purpur-API-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: aa289e2c6ff801551fb2f585269ccffed3a154fa
+Commit: 61d7f5590e79909caba55e9f00cefdd51006d015
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "co/aikar/timings/TimedEventExecutor.java.patch"

leaf-api/paper-patches/features/0017-Configurable-LibraryLoader-maven-repos.patch

@@ -22,14 +22,14 @@ index 107705db2d82b7c191e5e625ec888e0bc3b03831..77a58fc7c173b1724d44b0eeaf23b4a1
  
      /**
 diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-index cfe41c0a67c8d729b6bd23b0cfa32db3c9db9f74..9f167a9cb4a93a79b8ed709b61214ce0138a875d 100644
+index 23e3fcc8c2d6e0555448295199eee186de619042..502c51b3ae0a05569540c09b4c51dad1438da36e 100644
 --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
-@@ -74,7 +74,19 @@ public class LibraryLoader {
+@@ -88,7 +88,19 @@ public class LibraryLoader {
          session.setSystemProperties(System.getProperties());
          session.setReadOnly();
  
--        this.repositories = repository.newResolutionRepositories(session, Arrays.asList(new RemoteRepository.Builder("central", "default", "https://repo.maven.apache.org/maven2").build()));
+-        this.repositories = repository.newResolutionRepositories(session, getRepositories());
 +        // Leaf start - Configurable LibraryLoader maven repos
 +        this.repositories = repository.newResolutionRepositories(
 +                session,

leaf-server/minecraft-patches/features/0098-Purpur-Server-Minecraft-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Minecraft Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: aa289e2c6ff801551fb2f585269ccffed3a154fa
+Commit: 61d7f5590e79909caba55e9f00cefdd51006d015
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "net/minecraft/CrashReport.java.patch"
@@ -38,6 +38,8 @@ Patches listed below are removed in this patch, They exists in Gale or Leaf:
     - MC-238526 - Fix spawner not spawning water animals correctly
 * "net/minecraft/world/entity/projectile/AbstractArrow.java.patch"
     - Arrows should not reset despawn counter
+* "net/minecraft/world/inventory/AbstractContainerMenu.java.patch"
+    - PaperPR#12654
 * "net/minecraft/world/level/chunk/storage/RegionFileStorage.java.patch"
     - Rebrand
 
@@ -264,6 +266,19 @@ index fafbc8a9229432c4fb290a54cf453cd0c0c7b3b6..b0a86aac9603e72062f59dbe67c88ed8
              @Override
              public boolean isClientAuthoritative() {
                  return false;
+diff --git a/net/minecraft/gametest/framework/TestCommand.java b/net/minecraft/gametest/framework/TestCommand.java
+index 1709f81a3d5fba97ca0e0a5ce9774bf151d7cb7d..5c2b36b316c5c1ec2332551ac134b9ab67f2f223 100644
+--- a/net/minecraft/gametest/framework/TestCommand.java
++++ b/net/minecraft/gametest/framework/TestCommand.java
+@@ -455,7 +455,7 @@ public class TestCommand {
+                             )
+                     )
+             );
+-        if (SharedConstants.IS_RUNNING_IN_IDE) {
++        if (org.purpurmc.purpur.PurpurConfig.registerMinecraftDebugCommands || SharedConstants.IS_RUNNING_IN_IDE) { // Purpur - register minecraft debug commands
+             literalArgumentBuilder = literalArgumentBuilder.then(
+                     Commands.literal("export")
+                         .then(
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
 index 4ed9611994c5c8da01fede690197527c5b3a5731..00a82873d226f113278632a53c0faca420dd67d4 100644
 --- a/net/minecraft/network/Connection.java
@@ -21810,14 +21825,15 @@ index 0000000000000000000000000000000000000000..922e48799c43ca322a8f550c98a26e1e
 +}
 diff --git a/org/purpurmc/purpur/entity/PurpurStoredBee.java b/org/purpurmc/purpur/entity/PurpurStoredBee.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1cd79edbe87d9109bc132e64f6840981aaaab110
+index 0000000000000000000000000000000000000000..800cc8b2204c0ef885ff65005f6850749aaf445b
 --- /dev/null
 +++ b/org/purpurmc/purpur/entity/PurpurStoredBee.java
-@@ -0,0 +1,104 @@
+@@ -0,0 +1,105 @@
 +package org.purpurmc.purpur.entity;
 +
 +import io.papermc.paper.adventure.PaperAdventure;
 +import net.kyori.adventure.text.Component;
++import net.minecraft.core.RegistryAccess;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.world.level.block.entity.BeehiveBlockEntity;
 +import net.minecraft.world.level.block.entity.BlockEntity;
@@ -21847,7 +21863,7 @@ index 0000000000000000000000000000000000000000..1cd79edbe87d9109bc132e64f6840981
 +        this.blockStorage = blockStorage;
 +
 +        CompoundTag customData = handle.occupant.entityData().copyTag();
-+        net.minecraft.network.chat.Component customNameMinecraft = BlockEntity.parseCustomNameSafe(customData.get("CustomName"), ((CraftWorld) blockStorage.getWorld()).getHandle().registryAccess());
++        net.minecraft.network.chat.Component customNameMinecraft = BlockEntity.parseCustomNameSafe(customData.get("CustomName"), RegistryAccess.EMPTY);
 +        this.customName = customNameMinecraft == null ? null : PaperAdventure.asAdventure(customNameMinecraft);
 +
 +        if (customData.get("BukkitValues") instanceof CompoundTag compoundTag) {
@@ -21914,7 +21930,7 @@ index 0000000000000000000000000000000000000000..1cd79edbe87d9109bc132e64f6840981
 +        if(customName == null) {
 +            handle.occupant.entityData().copyTag().remove("CustomName");
 +        } else {
-+            handle.occupant.entityData().copyTag().putString("CustomName", net.minecraft.network.chat.Component.Serializer.toJson(PaperAdventure.asVanilla(customName), ((CraftWorld) blockStorage.getWorld()).getHandle().registryAccess()));
++            handle.occupant.entityData().copyTag().putString("CustomName", net.minecraft.network.chat.Component.Serializer.toJson(PaperAdventure.asVanilla(customName), RegistryAccess.EMPTY));
 +        }
 +    }
 +}

leaf-server/minecraft-patches/features/0278-do-not-log-invalid-flatten-text-component-parse.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] do not log invalid flatten text component parse
 
 
 diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
-index 4197a5e89aec77f2893f0f118a927b96d5377ec1..de99a05bbe3e8dac2d6307eb53d954d77904a0c4 100644
+index d5dfa9a64e2d3f9a37a5bdde60b92ed93bd89aed..83155bf0befab0207a4b756b19527d071037a870 100644
 --- a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
 +++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
-@@ -191,7 +191,7 @@ public final class V4290 {
+@@ -254,7 +254,7 @@ public final class V4290 {
                          return ret;
                      }
                  } catch (final JsonParseException ex) {

leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur Server Paper Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: aa289e2c6ff801551fb2f585269ccffed3a154fa
+Commit: 61d7f5590e79909caba55e9f00cefdd51006d015
 
 Patches listed below are removed in this patch, They exists in Gale or Leaf:
 * "Rebrand.patch"

scripts/upstreamCommit.sh

@@ -53,7 +53,7 @@ logsuffix=""
 # Paper updates
 if [ -n "$paperHash" ]; then
     newHash=$(git diff gradle.properties | awk '/^+paperCommit =/{print $NF}')
-    paper=$(getCommits "PaperMC/Paper" "$paperHash" $(echo $newHash | grep . -q && echo $newHash || echo "HEAD"))
+    paper=$(getCommits "PaperMC/Paper" "$paperHash" $(echo $newHash | grep . -q && echo $newHash || echo "ver/1.21.5")) # Update this on every version update
 
     # Updates found
     if [ -n "$paper" ]; then
@@ -64,7 +64,7 @@ fi
 
 # Purpur updates
 if [ -n "$purpurHash" ]; then
-    purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash" "HEAD")
+    purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash" "ver/1.21.5") # Update this on every version update
 
     # Updates found
     if [ -n "$purpur" ]; then