Updated Upstream (Gale/Purpur/Dependencies)

gradle.properties

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.20.6
 version = 1.20.6-R0.1-SNAPSHOT
 
-galeCommit = 2a97bf832e63e6905be5f08621b20180fb39914d
+galeCommit = cefcdf45a8532f12fb4afb54cbcf0593601537f1
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 72192634b0629433aa531dedaf8c918755f82fbe
+Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch

patches/api/0006-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index eccc64e2baa4c8d511b968f49ff23261f1c78f16..52b4fa28dacf35c0c5309f0ab4513b126cb44f66 100644
+index eccc64e2baa4c8d511b968f49ff23261f1c78f16..26627f8173be78d0efa21b41cf5f60d92ec90e90 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,8 +12,10 @@ java {
@@ -27,7 +27,7 @@ index eccc64e2baa4c8d511b968f49ff23261f1c78f16..52b4fa28dacf35c0c5309f0ab4513b12
      // api dependencies are listed transitively to API consumers
 -    api("com.google.guava:guava:32.1.2-jre")
 -    api("com.google.code.gson:gson:2.10.1")
-+    api("com.google.guava:guava:33.2.0-jre") // Leaf - Bump Dependencies
++    api("com.google.guava:guava:33.2.1-jre") // Leaf - Bump Dependencies
 +    api("com.google.code.gson:gson:2.11.0") // Leaf - Bump Dependencies
      // Paper start - adventure
      api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
@@ -46,15 +46,16 @@ index eccc64e2baa4c8d511b968f49ff23261f1c78f16..52b4fa28dacf35c0c5309f0ab4513b12
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
 -    api("io.sentry:sentry:5.4.0") // Pufferfish
-+    api("io.sentry:sentry:7.9.0") // Pufferfish // Leaf - Bump Dependencies
++    api("io.sentry:sentry:7.10.0") // Pufferfish // Leaf - Bump Dependencies
 
      implementation("org.ow2.asm:asm:9.7")
      implementation("org.ow2.asm:asm-commons:9.7")
      // Paper end
 
-     api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
+-    api("org.apache.maven:maven-resolver-provider:3.9.6") // Paper - make API dependency for Paper Plugins
 -    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 -    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
++    api("org.apache.maven:maven-resolver-provider:3.9.7") // Paper - make API dependency for Paper Plugins
 +    // Leaf start - Bump Dependencies
 +    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.20")
 +    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20")
@@ -66,7 +67,7 @@ index eccc64e2baa4c8d511b968f49ff23261f1c78f16..52b4fa28dacf35c0c5309f0ab4513b12
 
      // Paper start - add checker
 -    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
-+    val checkerQual = "org.checkerframework:checker-qual:3.43.0" // Leaf - Bump Dependencies
++    val checkerQual = "org.checkerframework:checker-qual:3.44.0" // Leaf - Bump Dependencies
      compileOnlyApi(checkerQual)
      testCompileOnly(checkerQual)
      // Paper end

patches/generated-api/0001-Purpur-generated-api-Changes.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 72192634b0629433aa531dedaf8c918755f82fbe
+Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 43f4deacef349502cbb207aafc4f9cb7a75177c5..6b692c24a62e2172116a6b9c371b1c0e2411c27e 100644

patches/server/0011-Purpur-Server-Changes.patch

@@ -8,7 +8,7 @@ TODO - Dreeam: Check TODOs in ServerGamePacketListenerImpl & Fix-pufferfish-issu
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: 72192634b0629433aa531dedaf8c918755f82fbe
+Commit: f1c87e4fee9a8e7d513f9e284d402a21fd73ec3a
 
 Patches below are removed in this patch:
 Metrics changes in Purpur-config-files.patch
@@ -6680,21 +6680,43 @@ index 34c1df5bd7655bfbcba3ae872a8eec621ace5835..3755ed3c550f9553f147fd442a01958e
          AllayAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-index 6a3b119bdcac4de1b39216b23ba8dceae062d278..063dde771ade593a29481f14b8f44a0f72f15953 100644
+index 6a3b119bdcac4de1b39216b23ba8dceae062d278..2dcabb97ad84d1622619f2f08595a52ec9819ca5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
-@@ -465,4 +465,11 @@ public class Armadillo extends Animal {
-             return this.animationDuration;
-         }
+@@ -77,6 +77,33 @@ public class Armadillo extends Animal {
+         return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 12.0D).add(Attributes.MOVEMENT_SPEED, 0.14D);
      }
-+
+ 
 +    // Purpur start
 +    @Override
++    public boolean isRidable() {
++        return level().purpurConfig.armadilloRidable;
++    }
++
++    @Override
++    public boolean dismountsUnderwater() {
++        return level().purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level().purpurConfig.armadilloRidableInWater;
++    }
++
++    @Override
++    public boolean isControllable() {
++        return level().purpurConfig.armadilloControllable;
++    }
++
++    @Override
++    public void initAttributes() {
++        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.armadilloMaxHealth);
++    }
++
++    @Override
 +    public int getPurpurBreedTime() {
-+        return 6000;
++        return this.level().purpurConfig.armadilloBreedingTicks;
 +    }
 +    // Purpur end
- }
++
+     @Override
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 index d339e9c0b81a50d20048375bd8b4141618fc1d2a..3409b0eaf9f09a92846359ca58ecda7deb17c099 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -8605,10 +8627,39 @@ index aee2fa184bc5723dfd3d54f460a173982d874c8b..27db17e19dd95e99f7bd67747eba3c30
          if (this.nextHeightOffsetChangeTick <= 0) {
              this.nextHeightOffsetChangeTick = 100;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Bogged.java b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-index e9f9b041ae7195e9d23bd446454b1d8c47a1ace1..03b1023e182744a84d324bdad082cc1b9e574e30 100644
+index e9f9b041ae7195e9d23bd446454b1d8c47a1ace1..fed6e686c29ad0117731a80294e6725f41d8bf77 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Bogged.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Bogged.java
-@@ -159,7 +159,7 @@ public class Bogged extends AbstractSkeleton implements Shearable {
+@@ -45,6 +45,28 @@ public class Bogged extends AbstractSkeleton implements Shearable {
+         super(type, world);
+     }
+
++    // Purpur start
++    @Override
++    public boolean isRidable() {
++        return level().purpurConfig.boggedRidable;
++    }
++
++    @Override
++    public boolean dismountsUnderwater() {
++        return level().purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level().purpurConfig.boggedRidableInWater;
++    }
++
++    @Override
++    public boolean isControllable() {
++        return level().purpurConfig.boggedControllable;
++    }
++
++    @Override
++    public void initAttributes() {
++        this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level().purpurConfig.boggedMaxHealth);
++    }
++    // Purpur end
++
+     @Override
+     protected void defineSynchedData(SynchedEntityData.Builder builder) {
+         super.defineSynchedData(builder);
+@@ -159,7 +181,7 @@ public class Bogged extends AbstractSkeleton implements Shearable {
 
      // Paper start - shear drops API
      @Override
@@ -17783,6 +17834,43 @@ index c76c78bb7757d407102271463e14716a1b012deb..458b91582a22fb1e6deb1551c38d2a10
              // Paper start - support "empty" choices
          } else if (bukkit == RecipeChoice.empty()) {
              stack = Ingredient.EMPTY;
+diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
+index 9c004e7cb46841d874ab997bf2e3b63ae763aec7..36003e5c7c61d964f11e81fa56845a52a8785468 100644
+--- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
++++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java
+@@ -678,4 +678,32 @@ public class MaterialRerouting {
+         return itemStack.withType(material);
+     }
+     // Paper end - register paper API specific material consumers in rerouting
++    // Purpur start
++    // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570)
++    public static void addFuel(Server server, Material material, int burnTime) {
++        server.addFuel(material, burnTime);
++    }
++
++    // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570)
++    public static void removeFuel(Server server, Material material) {
++        server.removeFuel(material);
++    }
++
++    // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570)
++    @RerouteStatic("org/bukkit/Bukkit")
++    public static void addFuel(Material material, int burnTime) {
++        Bukkit.addFuel(material, burnTime);
++    }
++
++    // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/pull/570)
++    @RerouteStatic("org/bukkit/Bukkit")
++    public static void removeFuel(Material material) {
++        Bukkit.removeFuel(material);
++    }
++
++    // Method added post 1.13, no-op (https://github.com/PurpurMC/Purpur/commit/607d909efba516893072b782c0393c53d048210e)
++    public static BlockData getBlockData(ItemStack itemStack, Material material) {
++        return itemStack.getBlockData(MaterialRerouting.transformToBlockType(material));
++    }
++    // Purpur end
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
 index 0cbbd915631904fe8c6effefb92895422b33eff6..aef19cfbecb4ddfc8dc71c4f3b2a011364c12dc2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
@@ -18413,10 +18501,10 @@ index 0000000000000000000000000000000000000000..d3a8f712b48b66f8452332668819967c
 +}
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..2c5d79dfddcab0410a6d1556658992f027a9a401
+index 0000000000000000000000000000000000000000..c7f19ef62554bf1ccbec0444305ccb233916602c
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -0,0 +1,3291 @@
+@@ -0,0 +1,3315 @@
 +package org.purpurmc.purpur;
 +
 +import net.minecraft.core.registries.BuiltInRegistries;
@@ -19595,6 +19683,19 @@ index 0000000000000000000000000000000000000000..2c5d79dfddcab0410a6d1556658992f0
 +        allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
 +    }
 +
++    public boolean armadilloRidable = false;
++    public boolean armadilloRidableInWater = true;
++    public boolean armadilloControllable = true;
++    public double armadilloMaxHealth = 12.0D;
++    public int armadilloBreedingTicks = 6000;
++    private void armadilloSettings() {
++        armadilloRidable = getBoolean("mobs.armadillo.ridable", armadilloRidable);
++        armadilloRidableInWater = getBoolean("mobs.armadillo.ridable-in-water", armadilloRidableInWater);
++        armadilloControllable = getBoolean("mobs.armadillo.controllable", armadilloControllable);
++        armadilloMaxHealth = getDouble("mobs.armadillo.attributes.max_health", armadilloMaxHealth);
++        armadilloBreedingTicks = getInt("mobs.armadillo.breeding-delay-ticks", armadilloBreedingTicks);
++    }
++
 +    public boolean axolotlRidable = false;
 +    public boolean axolotlControllable = true;
 +    public double axolotlMaxHealth = 14.0D;
@@ -19698,6 +19799,17 @@ index 0000000000000000000000000000000000000000..2c5d79dfddcab0410a6d1556658992f0
 +        blazeAlwaysDropExp = getBoolean("mobs.blaze.always-drop-exp", blazeAlwaysDropExp);
 +    }
 +
++    public boolean boggedRidable = false;
++    public boolean boggedRidableInWater = true;
++    public boolean boggedControllable = true;
++    public double boggedMaxHealth = 16.0D;
++    private void boggedSettings() {
++        boggedRidable = getBoolean("mobs.bogged.ridable", boggedRidable);
++        boggedRidableInWater = getBoolean("mobs.bogged.ridable-in-water", boggedRidableInWater);
++        boggedControllable = getBoolean("mobs.bogged.controllable", boggedControllable);
++        boggedMaxHealth = getDouble("mobs.bogged.attributes.max_health", boggedMaxHealth);
++    }
++
 +    public boolean camelRidableInWater = false;
 +    public double camelMaxHealthMin = 32.0D;
 +    public double camelMaxHealthMax = 32.0D;
@@ -21085,7 +21197,7 @@ index 0000000000000000000000000000000000000000..2c5d79dfddcab0410a6d1556658992f0
 +        snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
 +        snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
 +        snifferMaxHealth = getDouble("mobs.sniffer.attributes.max_health", snifferMaxHealth);
-+        snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", chickenBreedingTicks);
++        snifferBreedingTicks = getInt("mobs.sniffer.breeding-delay-ticks", snifferBreedingTicks);
 +    }
 +
 +    public boolean squidRidable = false;

patches/server/0016-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 59b84e4c4566e0185c6f7b002374e51c8415cad9..cd3d9b098b13c01f1ac6e7b27043e391531bd42e 100644
+index 59b84e4c4566e0185c6f7b002374e51c8415cad9..1d520295a7da79c6952ed950765647e2caf4315b 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ dependencies {
@@ -29,7 +29,7 @@ index 59b84e4c4566e0185c6f7b002374e51c8415cad9..cd3d9b098b13c01f1ac6e7b27043e391
      runtimeOnly(log4jPlugins.output)
      alsoShade(log4jPlugins.output)
 -    implementation("io.netty:netty-codec-haproxy:4.1.97.Final") // Paper - Add support for proxy protocol
-+    implementation("io.netty:netty-codec-haproxy:4.1.109.Final") // Paper - Add support for proxy protocol
++    implementation("io.netty:netty-codec-haproxy:4.1.111.Final") // Paper - Add support for proxy protocol
      // Paper end
 -    implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") // Paper - remove exclusion
 +    implementation("org.apache.logging.log4j:log4j-iostreams:2.23.1") // Paper - remove exclusion
@@ -49,10 +49,11 @@ index 59b84e4c4566e0185c6f7b002374e51c8415cad9..cd3d9b098b13c01f1ac6e7b27043e391
      }
      // Paper end - Use Velocity cipher
 
-     runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
+-    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
 -    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 +    // Leaf start - Bump Dependencies
++    runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.7")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.20")
 +    runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.20")
 +    // Leaf end
@@ -65,7 +66,7 @@ index 59b84e4c4566e0185c6f7b002374e51c8415cad9..cd3d9b098b13c01f1ac6e7b27043e391
 
 -    testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
 -    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
-+    testImplementation("io.github.classgraph:classgraph:4.8.172") // Paper - mob goal test // Leaf - Bump Dependencies
++    testImplementation("io.github.classgraph:classgraph:4.8.173") // Paper - mob goal test // Leaf - Bump Dependencies
 +    testImplementation("org.junit.jupiter:junit-jupiter:5.11.0-M2") // Leaf - Bump Dependencies
      testImplementation("org.hamcrest:hamcrest:2.2")
 -    testImplementation("org.mockito:mockito-core:5.11.0")
@@ -78,7 +79,7 @@ index 59b84e4c4566e0185c6f7b002374e51c8415cad9..cd3d9b098b13c01f1ac6e7b27043e391
      implementation("io.papermc:reflection-rewriter-proxy-generator:$reflectionRewriterVersion")
      // Paper end - Remap reflection
 +
-+    implementation("io.netty:netty-all:4.1.109.Final") // Leaf - Bump Dependencies
++    implementation("io.netty:netty-all:4.1.111.Final") // Leaf - Bump Dependencies
  }
 
  paperweight {