From 29fb4996e51b0aa00fa05f8d520a20d59ca9070c Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Sat, 23 Nov 2024 20:55:34 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8dc42fa Add API to check if the server is sleeping (#11605)
PaperMC/Paper@817550c Add API to allow/disallow tick sleeping (#11611)
PaperMC/Paper@915637d Run 'freeze' listeners before tag events (#11606)
PaperMC/Paper@751e9bd Fix jukebox component (#11642)
PaperMC/Paper@f241260 Make TypedKey an actual Key (#11641)
PaperMC/Paper@860d948 Support tags for more SimpleRegistry (#11607)
PaperMC/Paper@aee6f7a Correctly mirror vanilla non-exact ingredients (#11651)
---
 gradle.properties                                         | 2 +-
 patches/server/0003-Sakura-Configuration-Files.patch      | 6 +++---
 .../server/0004-Local-Config-and-Value-Storage-API.patch  | 4 ++--
 patches/server/0005-Client-Visibility-Settings.patch      | 4 ++--
 patches/server/0008-Track-Tick-Information.patch          | 8 ++++----
 patches/server/0016-Merge-Cannon-Entities.patch           | 4 ++--
 patches/server/0017-Replace-explosion-density-cache.patch | 4 ++--
 .../0076-Tick-entity-schedulers-only-when-necessary.patch | 4 ++--
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a2066a3..04d349d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.3-R0.1-SNAPSHOT
 mcVersion=1.21.3
 
-paperRef=f8e2a671eb46eb9acaa6b563a9813cb2d235088a
+paperRef=aee6f7abe161976fb6cb0558aeda5aef49845787
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false
diff --git a/patches/server/0003-Sakura-Configuration-Files.patch b/patches/server/0003-Sakura-Configuration-Files.patch
index 56d4fa7..5afc95e 100644
--- a/patches/server/0003-Sakura-Configuration-Files.patch
+++ b/patches/server/0003-Sakura-Configuration-Files.patch
@@ -1183,7 +1183,7 @@ index 0000000000000000000000000000000000000000..4024f9738e039ffffd560a07a2210f75
 +public record DurableMaterial(int durability, float resistance) {
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64b56abf8900d0424100da460fc68ac964394793..b771196ac2aa905312d7e106cae710d68e4733d3 100644
+index 663b4ecd520e82aa108d44f2d5c2a20cfc7bc01f..07ea2e6013318f97bfebd0d912dfe01d259a7c0b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -327,6 +327,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1194,7 +1194,7 @@ index 64b56abf8900d0424100da460fc68ac964394793..b771196ac2aa905312d7e106cae710d6
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
      public volatile Thread shutdownThread; // Paper
-@@ -510,6 +511,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -511,6 +512,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
@@ -1269,7 +1269,7 @@ index 2cc264f577fdd81d02783e0d6146bea9728789c7..bcaeaf99919be2dba2ba6e5fac76b257
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 806e56cb60235a99f468d36a059fdbd54c2d46e3..90d9f1c87f9731ca78ba4eb1fd4522ab2273a036 100644
+index cac8592e3a2f438fe9ca167a4fdcd65152bbb2de..5af78df61db348dcef76fbc5d776fda6c92334f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1074,6 +1074,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0004-Local-Config-and-Value-Storage-API.patch b/patches/server/0004-Local-Config-and-Value-Storage-API.patch
index b5252da..4aaec3f 100644
--- a/patches/server/0004-Local-Config-and-Value-Storage-API.patch
+++ b/patches/server/0004-Local-Config-and-Value-Storage-API.patch
@@ -227,10 +227,10 @@ index 0000000000000000000000000000000000000000..5b3e2cca7ee16bc6ecfa0f29438fa658
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b771196ac2aa905312d7e106cae710d68e4733d3..281a821c6a53013f8fe798781755ab7be2a359bd 100644
+index 07ea2e6013318f97bfebd0d912dfe01d259a7c0b..28a7bcb1199f33e15945dbb5fc8ff796f38bc495 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1886,6 +1886,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1888,6 +1888,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              gameprofilerfiller.pop();
              gameprofilerfiller.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
diff --git a/patches/server/0005-Client-Visibility-Settings.patch b/patches/server/0005-Client-Visibility-Settings.patch
index e3a810e..d85e614 100644
--- a/patches/server/0005-Client-Visibility-Settings.patch
+++ b/patches/server/0005-Client-Visibility-Settings.patch
@@ -650,10 +650,10 @@ index 1a37654aff9a9c86c9f7af10a1cf721371f0c5ec..82644b34a77dc5e5af38260b7b07b3ec
      public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, ShortSet positions, LevelChunkSection section) {
          this.sectionPos = sectionPos;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 281a821c6a53013f8fe798781755ab7be2a359bd..9f34a0c6f4f8157d77ed3cb36a546ec8c1b9b1bd 100644
+index 28a7bcb1199f33e15945dbb5fc8ff796f38bc495..f8a9ef307dbe7fd70577b3ef4fa2e4fc99fb1fb1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1887,6 +1887,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1889,6 +1889,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              gameprofilerfiller.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
              worldserver.localConfig().expire(currentTick); // Sakura - add local config
diff --git a/patches/server/0008-Track-Tick-Information.patch b/patches/server/0008-Track-Tick-Information.patch
index d898753..06f4f8e 100644
--- a/patches/server/0008-Track-Tick-Information.patch
+++ b/patches/server/0008-Track-Tick-Information.patch
@@ -574,10 +574,10 @@ index 0000000000000000000000000000000000000000..27b6b071ad38589d37e35ea7fdf1d459
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9f34a0c6f4f8157d77ed3cb36a546ec8c1b9b1bd..567293a46e28e49096ddc1823473a6f7ada1c355 100644
+index f8a9ef307dbe7fd70577b3ef4fa2e4fc99fb1fb1..decea6322f5ea42ff476fbd00d11f0f7230eb711 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -425,6 +425,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -426,6 +426,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
      // Paper end - rewrite chunk system
@@ -595,7 +595,7 @@ index 9f34a0c6f4f8157d77ed3cb36a546ec8c1b9b1bd..567293a46e28e49096ddc1823473a6f7
  
      public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
          super("Server");
-@@ -1298,6 +1309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1299,6 +1310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
                      final long diff = currentTime - tickSection;
                      final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -603,7 +603,7 @@ index 9f34a0c6f4f8157d77ed3cb36a546ec8c1b9b1bd..567293a46e28e49096ddc1823473a6f7
                      tps1.add(currentTps, diff);
                      tps5.add(currentTps, diff);
                      tps15.add(currentTps, diff);
-@@ -1340,6 +1352,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1341,6 +1353,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                              throw new RuntimeException("Chunk system crash propagated to tick()", crash);
                          }
                          // Paper end - rewrite chunk system
diff --git a/patches/server/0016-Merge-Cannon-Entities.patch b/patches/server/0016-Merge-Cannon-Entities.patch
index 15a3434..636ca67 100644
--- a/patches/server/0016-Merge-Cannon-Entities.patch
+++ b/patches/server/0016-Merge-Cannon-Entities.patch
@@ -398,10 +398,10 @@ index 0000000000000000000000000000000000000000..2c2a26fdb3081ced574070e5e6f3a1b4
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 567293a46e28e49096ddc1823473a6f7ada1c355..300579b17dfa21cda7100d232ed275d9fdae220d 100644
+index decea6322f5ea42ff476fbd00d11f0f7230eb711..70d2ca47db058ff02e0d779dd38fbae74cf6c24e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1901,6 +1901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1903,6 +1903,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
              worldserver.localConfig().expire(currentTick); // Sakura - add local config
              worldserver.explosionPositions.clear(); // Sakura - client visibility settings
diff --git a/patches/server/0017-Replace-explosion-density-cache.patch b/patches/server/0017-Replace-explosion-density-cache.patch
index 7cf0f46..b48e097 100644
--- a/patches/server/0017-Replace-explosion-density-cache.patch
+++ b/patches/server/0017-Replace-explosion-density-cache.patch
@@ -126,10 +126,10 @@ index 0000000000000000000000000000000000000000..d7e24638f07f243502004970ab4ce646
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 300579b17dfa21cda7100d232ed275d9fdae220d..c47cd2c01a81a220e8d4f13178fbe92b40a3c76d 100644
+index 70d2ca47db058ff02e0d779dd38fbae74cf6c24e..9712571293547da2edb613065a8b105728dcb4ee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1902,6 +1902,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1904,6 +1904,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.localConfig().expire(currentTick); // Sakura - add local config
              worldserver.explosionPositions.clear(); // Sakura - client visibility settings
              worldserver.mergeHandler.expire(currentTick); // Sakura - merge cannon entities
diff --git a/patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch b/patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch
index 03b35f8..72f408f 100644
--- a/patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch
+++ b/patches/server/0076-Tick-entity-schedulers-only-when-necessary.patch
@@ -83,10 +83,10 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..32ac34e6ca4a7443e894369fee349911
          return true;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c47cd2c01a81a220e8d4f13178fbe92b40a3c76d..58306ac588c1eab6a5dc2be0b6bb7ad4cc45e3e2 100644
+index 9712571293547da2edb613065a8b105728dcb4ee..f55fdb9ef64648871a5908412c3ae32a4eebdc17 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1820,7 +1820,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1822,7 +1822,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {