final 1.21.10 upstream update

.github/workflows/build-12110.yml

@@ -10,8 +10,6 @@ jobs:
   build:
     runs-on: blacksmith-8vcpu-ubuntu-2204
     if: "!contains(github.event.commits[0].message, '[ci-skip]')"
-    env:
-      BUILD_NUMBER: ${{ github.run_number }}
     outputs:
       build_number: ${{ env.BUILD_NUMBER }}
       jar_file: ${{ steps.prepare_jar.outputs.jar_file }}
@@ -85,5 +83,6 @@ jobs:
           API_KEY: ${{ secrets.ATLAS_API_KEY }}
           PROJECT_KEY: 'divinemc'
           VERSION_BRANCH: 'ver/1.21.10'
+          BUILD_NUMBER: ${{ github.run_number }}
           JAR_FILE: ${{ env.JAR_FILE }}
         run: bash scripts/uploadBuild.sh

divinemc-api/build.gradle.kts.patch

@@ -23,7 +23,7 @@
 +    api("com.google.guava:guava:33.4.0-jre") // DivineMC - Bump dependencies
      api("com.google.code.gson:gson:2.11.0")
 -    api("org.yaml:snakeyaml:2.2")
-+    api("org.yaml:snakeyaml:2.3") // DivineMC - Bump dependencies
++    api("org.yaml:snakeyaml:2.5") // DivineMC - Bump dependencies
      api("org.joml:joml:1.10.8") {
          isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
      }

divinemc-server/build.gradle.kts.patch

@@ -72,7 +72,7 @@
      }
  }
  val log4jPlugins = sourceSets.create("log4jPlugins") {
-@@ -154,10 +_,23 @@
+@@ -154,10 +_,22 @@
  }
  
  dependencies {
@@ -80,7 +80,6 @@
 +    implementation(project(":divinemc-api")) // DivineMC - Rebrand
 +
 +    // DivineMC start - Dependencies
-+    implementation("org.yaml:snakeyaml:2.3")
 +    implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
 +        exclude(group="org.yaml", module="snakeyaml")
 +    }

divinemc-server/minecraft-patches/features/0003-Completely-remove-Mojang-profiler.patch

@@ -2830,7 +2830,7 @@ index 4c3fa61566ecabf8eccea32f10aabfa7c961e4c5..1b62bc5836fbf0ddc37d8f979b4e7aa6
  
      // Paper start - Add mobcaps commands
 diff --git a/net/minecraft/world/level/ServerExplosion.java b/net/minecraft/world/level/ServerExplosion.java
-index c0c87b7c8e0b6b941fe8a63dc361504e94459d86..3c4de8b43a5658e02ddce7db9f453bfd344703e3 100644
+index ecce109b540654686efd0e34edb0fd55baa37ae6..3d08b183389027e1971559b37f742bba93d267d2 100644
 --- a/net/minecraft/world/level/ServerExplosion.java
 +++ b/net/minecraft/world/level/ServerExplosion.java
 @@ -14,8 +14,6 @@ import net.minecraft.core.BlockPos;
@@ -2842,7 +2842,7 @@ index c0c87b7c8e0b6b941fe8a63dc361504e94459d86..3c4de8b43a5658e02ddce7db9f453bfd
  import net.minecraft.world.damagesource.DamageSource;
  import net.minecraft.world.entity.Entity;
  import net.minecraft.world.entity.EntityType;
-@@ -657,10 +655,7 @@ public class ServerExplosion implements Explosion {
+@@ -658,10 +656,7 @@ public class ServerExplosion implements Explosion {
          List<BlockPos> list = this.calculateExplodedPositions();
          this.hurtEntities();
          if (this.interactsWithBlocks()) {

gradle.properties

@@ -2,7 +2,7 @@ group = org.bxteam.divinemc
 version=1.21.10-R0.1-SNAPSHOT
 
 mcVersion=1.21.10
-purpurRef=802b91662dad3e688cd03f39b02375454ca329c7
+purpurRef=0a2dc04c71f72772c004a45379e7771d5b87bb70
 experimental=false
 
 org.gradle.configuration-cache=true

scripts/uploadBuild.sh

@@ -47,13 +47,14 @@ fi
 
 METADATA=$(cat <<EOF
 {
+  "buildNumber": ${BUILD_NUMBER},
   "channel": "$CHANNEL",
   "commits": $COMMITS_JSON
 }
 EOF
 )
 
-echo "Uploading: $PROJECT_KEY $MC_VERSION ($CHANNEL)"
+echo "Uploading: $PROJECT_KEY $MC_VERSION build #$BUILD_NUMBER ($CHANNEL)"
 
 UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" \
   -X POST "$API_URL/v2/projects/$PROJECT_KEY/versions/$MC_VERSION/builds/upload" \