Updated Upstream (Paper/Gale)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102)
PaperMC/Paper@3c8a7fe Re-add missing chunk event calls (#11104)
PaperMC/Paper@a8db527 Even more cleanup of mcutil patch
PaperMC/Paper@d08e8d1 Add total time to done message (#11109)
PaperMC/Paper@2a39276 Add CrafterCraftEvent (#11082)
PaperMC/Paper@75af62b Split rewriting flag into `paper.disableOldApiSupport` and `paper.disablePluginRemapping` (#11108)
PaperMC/Paper@7ea4039 Fixup startup time log message
PaperMC/Paper@e71c1df Call PlayerChunkUnloadEvent
PaperMC/Paper@968bdeb Make CraftComplexRecipe extend CraftingRecipe (#11114)
PaperMC/Paper@f1f01a1 Adjust done message again (#11118)

Gale Changes:
Dreeam-qwq/Gale@0096a24 Update Add xor-shift random
Dreeam-qwq/Gale@4ce6439 Updated Upstream (Paper)
Dreeam-qwq/Gale@d4f0ad7 Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21
 version = 1.21-R0.1-SNAPSHOT
 
-galeCommit = d95dc9d8a01fabe3851dd697ca379526049605f6
+galeCommit = d4f0ad7103aeccf39a67153ff4a3df2a6b3693a0
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -1108,10 +1108,10 @@ index 7fbfdb07585c7b28acea1f0c1f58ada0cc744441..21fcca092e2e31baa5ece0de9e44e3fa
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 48c8af31b2bdc849b5269784ff3829ba31fb3f47..431a62092380d30f27476eadbfa11833060e4a33 100644
+index 444744ea6f5921b0ae229995f8b15ea9d980c402..508bb3493e74a42ce8abf57bba05c08a715849dc 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -328,4 +328,14 @@ public interface Villager extends AbstractVillager {
+@@ -375,4 +375,14 @@ public interface Villager extends AbstractVillager {
       */
      public void clearReputations();
      // Paper end

patches/server/0001-Rebrand.patch

@@ -176,10 +176,10 @@ index 11cf6a20550e252501a92be5bdffafcff007cbf9..54f7aa95cfbcf39bb86ad1b4eb0f9ff2
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 79192e3a0f27d48f35c0378b58e587212ed2c305..006adb2adb27c497ede69f87e78bc3e34499cbf8 100644
+index bdfb969f88e68d89a5cad4b145bbc1441a110bac..fba0558f46516f65c678635359f305f865336d3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-@@ -503,7 +503,7 @@ public class CraftScheduler implements BukkitScheduler {
+@@ -492,7 +492,7 @@ public class CraftScheduler implements BukkitScheduler {
                  this.parsePending();
              } else {
                  // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper

patches/server/0003-Leaf-Config.patch

@@ -41,18 +41,19 @@ index f76ca394169d844a263a53c31c30e57de4381e0d..d2ea951c7e5899d0e2edb52064e35c23
              DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b981f41c96944b3ddcb7455a74c332bd12a99e88..29c35af2dd3bbcc2527542d594316b9756c7c2a2 100644
+index 9fa8d9af5ff8c2f204793ce014375e7b2f220083..7b28d758afbefbd18b7cc914f52339aa400bbb36 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1216,6 +1216,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
-             // Paper end
-
+@@ -1217,6 +1217,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             org.spigotmc.WatchdogThread.tick();
+             // Paper end - Improved Watchdog Support
+             org.spigotmc.WatchdogThread.hasStarted = true; // Paper
++
 +            org.dreeam.leaf.config.LeafConfig.regSparkExtraConfig(); // Leaf - Leaf Config
 +
-             org.spigotmc.WatchdogThread.tick(); // Paper
-             org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( this.recentTps, 20 );
+             // Paper start - further improve server tick loop
+             long tickSection = Util.getNanos();
 diff --git a/src/main/java/org/dreeam/leaf/config/ConfigModules.java b/src/main/java/org/dreeam/leaf/config/ConfigModules.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..f05e1ee109a36c39857f75c296f2ff21800aba8e

patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch

@@ -44,7 +44,7 @@ index 7e94dcbf3adb8954800a6d577b39616638d673e8..4c95cb6a53004157faac55540225da3e
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ea0e44fa359f5fecbf1c3fc7fc5da62611e5565d..611cf8f85d479798858477dc5f657a567e32e04d 100644
+index 29f12201886905a6d73c52d1b59c53341841d878..a6d8986e455fe7c273990bf22ebf50cdcf592798 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -431,6 +431,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -69,7 +69,7 @@ index cb61462d4691a055a4b25f7b953609d8a154fdfe..b2d8a858d8767bd6ca52e0b8db847579
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index b5a41f189afdf9a11ff20fc4c503423b611a0327..73a763e1752e455f019324330563e2baeb923ce6 100644
+index 6e6095e8bfab28d8c1ac8bf65bb9a0c8ee19088e..96e7e9ef8bf9ab6902638ac4ba270a1f98a36cdf 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -237,10 +237,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -85,7 +85,7 @@ index b5a41f189afdf9a11ff20fc4c503423b611a0327..73a763e1752e455f019324330563e2ba
              this.targetSelector.tick();
          }
      }
-@@ -918,10 +918,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -916,10 +916,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          int i = this.tickCount + this.getId();
 
          if (i % 2 != 0 && this.tickCount > 1) {