Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@13c80a5e [ci/skip] Fix PlayerShearBlockEvent javadoc typos (#12101)
PaperMC/Paper@db2aa180 [ci/skip] Fix incomplete example in javadocs for PreFlattenTagRegistrar (#12102)
PaperMC/Paper@cf7c6c74 [ci/skip] Fix incomplete example in javadocs for PostFlattenTagRegistrar (#12103)
PaperMC/Paper@072a8317 Add proper attached blocks API to AbstractArrow (#12099)
PaperMC/Paper@1be2e5f3 Fix vanilla map decorations sending when not dirty (#12098)
PaperMC/Paper@a06179a0 Update entity effect (#12104)
PaperMC/Paper@e616498e Add Vault block API (#12068)
PaperMC/Paper@0a04c3fe Fix some NPEs (#12105)
PaperMC/Paper@06804850 Expand TrialSpawner API (#12025)
PaperMC/Paper@46f4fdaa Add support for rotation argument handling (#12090)

gale-server/paper-patches/features/0004-Gale-configuration.patch

@@ -144,10 +144,10 @@ index 05339a176083af667c16f77d76dc1878dafce3f0..9ca55cba185b9de566f911b08d671bee
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d162c9c576686c1a2b2e6057f9800b1021c5c676..71d5313d0e57e3bc6a256d5384c3a79a8258ef24 100644
+index cf5bcb0ebc79c318d106695e39ad2883a5734aa1..9094b8e3ff1d6d07e8a39d379e40a6da7e9888ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1087,6 +1087,7 @@ public final class CraftServer implements Server {
+@@ -1088,6 +1088,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -155,7 +155,7 @@ index d162c9c576686c1a2b2e6057f9800b1021c5c676..71d5313d0e57e3bc6a256d5384c3a79a
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -3045,6 +3046,14 @@ public final class CraftServer implements Server {
+@@ -3051,6 +3052,14 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  

gale-server/paper-patches/features/0005-Gale-commands.patch

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 71d5313d0e57e3bc6a256d5384c3a79a8258ef24..cae67031e4ef7ac454373f4684b5730de8ba21a0 100644
+index 9094b8e3ff1d6d07e8a39d379e40a6da7e9888ed..32ac42ec69810470941c29f7add34d03e46b4712 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1119,6 +1119,7 @@ public final class CraftServer implements Server {
+@@ -1120,6 +1120,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper

gale-server/paper-patches/features/0008-Print-stack-trace-for-plugins-not-shutting-down-task.patch

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cae67031e4ef7ac454373f4684b5730de8ba21a0..28b9a75dcf58154bcb8d779e511a2d3219cbce68 100644
+index 32ac42ec69810470941c29f7add34d03e46b4712..ae90120eab182fcb975a13c84eed1425dc09da46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1182,6 +1182,13 @@ public final class CraftServer implements Server {
+@@ -1183,6 +1183,13 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));

gale-server/paper-patches/features/0015-CraftBukkit-UUID-to-world-map.patch

@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28b9a75dcf58154bcb8d779e511a2d3219cbce68..3030134f022a99e286dca189cbc9ba874397fa7f 100644
+index ae90120eab182fcb975a13c84eed1425dc09da46..67afa3b0cf9295690461e2be49249fb6f80d7082 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -285,6 +285,7 @@ public final class CraftServer implements Server {
+@@ -286,6 +286,7 @@ public final class CraftServer implements Server {
      protected final DedicatedServer console;
      protected final DedicatedPlayerList playerList;
      private final Map<String, World> worlds = new LinkedHashMap<String, World>();
@@ -24,7 +24,7 @@ index 28b9a75dcf58154bcb8d779e511a2d3219cbce68..3030134f022a99e286dca189cbc9ba87
      // private final Map<Class<?>, Registry<?>> registries = new HashMap<>(); // Paper - replace with RegistryAccess
      private YamlConfiguration configuration;
      private YamlConfiguration commandsConfiguration;
-@@ -1528,6 +1529,7 @@ public final class CraftServer implements Server {
+@@ -1529,6 +1530,7 @@ public final class CraftServer implements Server {
              this.getLogger().log(Level.SEVERE, null, ex);
          }
  
@@ -32,7 +32,7 @@ index 28b9a75dcf58154bcb8d779e511a2d3219cbce68..3030134f022a99e286dca189cbc9ba87
          this.worlds.remove(world.getName().toLowerCase(Locale.ROOT));
          this.console.removeLevel(handle);
          return true;
-@@ -1546,12 +1548,7 @@ public final class CraftServer implements Server {
+@@ -1547,12 +1549,7 @@ public final class CraftServer implements Server {
  
      @Override
      public World getWorld(UUID uid) {
@@ -46,7 +46,7 @@ index 28b9a75dcf58154bcb8d779e511a2d3219cbce68..3030134f022a99e286dca189cbc9ba87
      }
  
      // Paper start
-@@ -1569,6 +1566,7 @@ public final class CraftServer implements Server {
+@@ -1570,6 +1567,7 @@ public final class CraftServer implements Server {
              System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
              return;
          }

gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3030134f022a99e286dca189cbc9ba874397fa7f..6e489fa55a360475442229647b3b88d662690b01 100644
+index 67afa3b0cf9295690461e2be49249fb6f80d7082..7aa6de4844f1d9c1a7a3b24e2b497a00db860202 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3095,6 +3095,23 @@ public final class CraftServer implements Server {
+@@ -3101,6 +3101,23 @@ public final class CraftServer implements Server {
          };
      }
  

gale-server/paper-patches/features/0017-5-second-TPS-average.patch

@@ -58,10 +58,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca79
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6e489fa55a360475442229647b3b88d662690b01..e5ae9c09dfa91043cb4033aed70269d277cdd987 100644
+index 7aa6de4844f1d9c1a7a3b24e2b497a00db860202..aee9c56ed76e6af7f1ae181a18db182819a89023 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3095,7 +3095,26 @@ public final class CraftServer implements Server {
+@@ -3101,7 +3101,26 @@ public final class CraftServer implements Server {
          };
      }
  

gale-server/paper-patches/features/0018-Last-tick-time-API.patch

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e5ae9c09dfa91043cb4033aed70269d277cdd987..6f94aed7e136bd13dddaca1e2a214e55cf87403b 100644
+index aee9c56ed76e6af7f1ae181a18db182819a89023..eacb19d1cc657232e019caf28aa47c873f3f82fe 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3335,4 +3335,21 @@ public final class CraftServer implements Server {
+@@ -3341,4 +3341,21 @@ public final class CraftServer implements Server {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }
      // Paper end - API to check if the server is sleeping

gradle.properties

@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.4-R0.1-SNAPSHOT
 
 mcVersion=1.21.4
-paperRef=3bd69f2e5699230894963252bed2d168fc3b8247
+paperRef=46f4fdaae3661941ac86f2157e625d907fdd8e81
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true