[ci skip] Update mache for new unpick definitions

Author: jpenilla

paper-server/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:1.21.10+build.8")
+    mache("io.papermc:mache:1.21.10+build.9")
     paperclip("io.papermc:paperclip:3.0.3")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -26252,7 +26252,7 @@ index 9dbb7c744030fb8d6891780a0928c8cca2a2b68d..f019f1330f9f1e6aa98ef3f914833769
          if (!passengers.equals(this.lastPassengers)) {
              this.synchronizer
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1ab99c963 100644
+index 704733ff5e558a12f2f9dde924ab4c507745595d..5e305c9a64e856de70ed787901c01d09e68aa979 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -175,7 +175,7 @@ import net.minecraft.world.ticks.LevelTicks;
@@ -26804,7 +26804,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
          }
 
          profilerFiller.pop();
-@@ -979,6 +1266,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -975,6 +1262,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (fluidState.is(fluid)) {
              fluidState.tick(this, pos, blockState);
          }
@@ -26817,7 +26817,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
      private void tickBlock(BlockPos pos, Block block) {
-@@ -986,6 +1279,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -982,6 +1275,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          if (blockState.is(block)) {
              blockState.tick(this, pos, this.random);
          }
@@ -26830,7 +26830,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
      // Paper start - log detailed entity tick information
-@@ -1070,6 +1369,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1066,6 +1365,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      }
 
      public void save(@Nullable ProgressListener progress, boolean flush, boolean skipSave) {
@@ -26842,7 +26842,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
          ServerChunkCache chunkSource = this.getChunkSource();
          if (!skipSave) {
              org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit
-@@ -1082,13 +1386,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1078,13 +1382,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  progress.progressStage(Component.translatable("menu.savingChunks"));
              }
 
@@ -26866,7 +26866,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
 
          // CraftBukkit start - moved from MinecraftServer#saveAllChunks
          ServerLevel serverLevel1 = this;
-@@ -1218,7 +1527,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1214,7 +1523,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              this.removePlayerImmediately((ServerPlayer)entity, Entity.RemovalReason.DISCARDED);
          }
 
@@ -26875,7 +26875,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
      // CraftBukkit start
-@@ -1249,7 +1558,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1245,7 +1554,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              }
              // CraftBukkit end
 
@@ -26884,7 +26884,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
          }
      }
 
-@@ -1260,7 +1569,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1256,7 +1565,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
 
      public boolean tryAddFreshEntityWithPassengers(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
          // CraftBukkit end
@@ -26893,7 +26893,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
              return false;
          } else {
              this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit
-@@ -2013,7 +2322,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2009,7 +2318,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
                  }
              }
 
@@ -26902,7 +26902,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
              bufferedWriter.write(String.format(Locale.ROOT, "block_entity_tickers: %d\n", this.blockEntityTickers.size()));
              bufferedWriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count()));
              bufferedWriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count()));
-@@ -2031,13 +2340,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2027,13 +2336,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          Path path1 = path.resolve("chunks.csv");
 
          try (Writer bufferedWriter2 = Files.newBufferedWriter(path1)) {
@@ -26918,7 +26918,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
          }
 
          Path path3 = path.resolve("entities.csv");
-@@ -2134,8 +2443,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2130,8 +2439,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              Locale.ROOT,
              "players: %s, entities: %s [%s], block_entities: %d [%s], block_ticks: %d, fluid_ticks: %d, chunk_source: %s",
              this.players.size(),
@@ -26929,7 +26929,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
              this.blockEntityTickers.size(),
              getTypeCount(this.blockEntityTickers, TickingBlockEntity::getType),
              this.getBlockTicks().count(),
-@@ -2167,15 +2476,25 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2163,15 +2472,25 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      @Override
      public LevelEntityGetter<Entity> getEntities() {
          org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot
@@ -26958,7 +26958,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
      public void startTickingChunk(LevelChunk chunk) {
-@@ -2192,8 +2511,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2188,8 +2507,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
 
      public void waitForEntities(ChunkPos chunkPos, int radius) {
          List<ChunkPos> list = ChunkPos.rangeClosed(chunkPos, radius).toList();
@@ -26969,7 +26969,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
 
              for (ChunkPos chunkPos1 : list) {
                  if (!this.areEntitiesLoaded(chunkPos1.toLong())) {
-@@ -2212,28 +2531,38 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2208,28 +2527,38 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      @Override
      public void close() throws IOException {
          super.close();
@@ -27014,7 +27014,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
      public boolean anyPlayerCloseEnoughForSpawning(BlockPos pos) {
-@@ -2245,7 +2574,10 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2241,7 +2570,10 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      }
 
      public boolean canSpawnEntitiesInChunk(ChunkPos chunkPos) {
@@ -27026,7 +27026,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
      @Override
-@@ -2300,7 +2632,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2296,7 +2628,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      @Override
      public CrashReportCategory fillReportDetails(CrashReport report) {
          CrashReportCategory crashReportCategory = super.fillReportDetails(report);
@@ -27036,7 +27036,7 @@ index d711f47bf02a44247653fbaa32253ddc0b12e12f..c4274cbefc8622a2ef841bcd93f8b4d1
      }
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index a9978cfb8a85e055b4a72d29b2265d74dc3b23fe..92551d5228854e24a9b8824c6e79955a2514fd02 100644
+index 8ecbcfb5f4e2d1cfcde694e9c57b74bbae4b2ac9..8b3efe83166e73dea6545384883c8db74f04cea7 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -202,7 +202,7 @@ import net.minecraft.world.scores.Team;
@@ -27739,10 +27739,10 @@ index 4367d84309e6dbae6637cb465332896304db5b5a..384289f5d898fef2f791edcbe0716ed0
                      PrepareSpawnTask.this.loadListener.updateFocus(this.spawnLevel.dimension(), chunkPos);
                  }
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index df3be6267d834b591a85b43fc864d929ce9950e0..51e8abb15392772ad53ea1da80127d4e61a21e00 100644
+index f0a231faba60cd00bdfeb2db01c3d2af53812ea9..3939b5333e3f2f0c1771a3fba04d75445eaba14f 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1183,7 +1183,7 @@ public abstract class PlayerList {
+@@ -1182,7 +1182,7 @@ public abstract class PlayerList {
 
      public void setViewDistance(int viewDistance) {
          this.viewDistance = viewDistance;
@@ -27751,7 +27751,7 @@ index df3be6267d834b591a85b43fc864d929ce9950e0..51e8abb15392772ad53ea1da80127d4e
 
          for (ServerLevel serverLevel : this.server.getAllLevels()) {
              if (serverLevel != null) {
-@@ -1194,7 +1194,7 @@ public abstract class PlayerList {
+@@ -1193,7 +1193,7 @@ public abstract class PlayerList {
 
      public void setSimulationDistance(int simulationDistance) {
          this.simulationDistance = simulationDistance;

paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch

@@ -354,7 +354,7 @@ index 0000000000000000000000000000000000000000..ae2bb9a73106febfe5f0d090abd4252b
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index c4274cbefc8622a2ef841bcd93f8b4d1ab99c963..7e635c5fe5ada10f2cf84830826639da59c4ea4e 100644
+index 5e305c9a64e856de70ed787901c01d09e68aa979..ce6f83c83b0235d59b4cadd248ff218985978ab5 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -815,6 +815,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -365,7 +365,7 @@ index c4274cbefc8622a2ef841bcd93f8b4d1ab99c963..7e635c5fe5ada10f2cf84830826639da
              this.entityTickList
                  .forEach(
                      entity -> {
-@@ -1313,12 +1314,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1309,12 +1310,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          entity.totalEntityAge++; // Paper - age-like counter for all entities
          profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString());
          profilerFiller.incrementCounter("tickNonPassenger");
@@ -382,7 +382,7 @@ index c4274cbefc8622a2ef841bcd93f8b4d1ab99c963..7e635c5fe5ada10f2cf84830826639da
          }
          // Paper start - log detailed entity tick information
          } finally {
-@@ -1329,7 +1333,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1325,7 +1329,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          // Paper end - log detailed entity tick information
      }
 
@@ -391,7 +391,7 @@ index c4274cbefc8622a2ef841bcd93f8b4d1ab99c963..7e635c5fe5ada10f2cf84830826639da
          if (passengerEntity.isRemoved() || passengerEntity.getVehicle() != ridingEntity) {
              passengerEntity.stopRiding();
          } else if (passengerEntity instanceof Player || this.entityTickList.contains(passengerEntity)) {
-@@ -1339,12 +1343,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1335,12 +1339,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              ProfilerFiller profilerFiller = Profiler.get();
              profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(passengerEntity.getType()).toString());
              profilerFiller.incrementCounter("tickPassenger");

paper-server/patches/features/0016-Add-Alternate-Current-redstone-implementation.patch

@@ -2326,7 +2326,7 @@ index 0000000000000000000000000000000000000000..298076a0db4e6ee6e4775ac43bf749d9
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 7e635c5fe5ada10f2cf84830826639da59c4ea4e..76d063a5bcbfdb6339f0aa1a75c2eb4fdf14c4d4 100644
+index ce6f83c83b0235d59b4cadd248ff218985978ab5..71de8d8920eb33d15a18653dcef370c8e1a43712 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -2337,7 +2337,7 @@ index 7e635c5fe5ada10f2cf84830826639da59c4ea4e..76d063a5bcbfdb6339f0aa1a75c2eb4f
 
      @Override
      public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
-@@ -2664,6 +2665,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2660,6 +2661,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return this.debugSynchronizers;
      }
 

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -50,10 +50,10 @@ index a31ef450a0c8f2929065a3c10e47c14bf5eb30f2..d5f3083354d70c4da3c39e2f909ce4c7
          ProfilerFiller profilerFiller = Profiler.get();
          this.server.spark.executeMainThreadTasks(); // Paper - spark
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 76d063a5bcbfdb6339f0aa1a75c2eb4fdf14c4d4..bf27fe05ee17b2483bb9bfe5a1b52c8d686e3737 100644
+index 71de8d8920eb33d15a18653dcef370c8e1a43712..20b8cbb84805e4259438766a773d65fb37581662 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1382,6 +1382,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1378,6 +1378,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return !(entity instanceof Player player && (this.server.isUnderSpawnProtection(this, pos, player) || !this.getWorldBorder().isWithinBounds(pos)));
      }
 
@@ -81,7 +81,7 @@ index 76d063a5bcbfdb6339f0aa1a75c2eb4fdf14c4d4..bf27fe05ee17b2483bb9bfe5a1b52c8d
          // Paper start - add close param
          this.save(progress, flush, skipSave, false);
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 92551d5228854e24a9b8824c6e79955a2514fd02..691df6f92af8cbb7b5b2dd863678258e78e1884b 100644
+index 8b3efe83166e73dea6545384883c8db74f04cea7..595e63c3ebe0f8486c7f5f9421013506cd96a6f6 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -204,6 +204,7 @@ import org.slf4j.Logger;
@@ -93,7 +93,7 @@ index 92551d5228854e24a9b8824c6e79955a2514fd02..691df6f92af8cbb7b5b2dd863678258e
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      private static final int FLY_STAT_RECORDING_SPEED = 25;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 51e8abb15392772ad53ea1da80127d4e61a21e00..410be367549a345677c94e9f8d7db0b7fffbf073 100644
+index 3939b5333e3f2f0c1771a3fba04d75445eaba14f..84fc528245d610c8145736b1e618d24301ff4d7b 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -406,6 +406,7 @@ public abstract class PlayerList {
@@ -104,7 +104,7 @@ index 51e8abb15392772ad53ea1da80127d4e61a21e00..410be367549a345677c94e9f8d7db0b7
          this.playerIo.save(player);
          ServerStatsCounter serverStatsCounter = player.getStats(); // CraftBukkit
          if (serverStatsCounter != null) {
-@@ -939,9 +940,23 @@ public abstract class PlayerList {
+@@ -938,9 +939,23 @@ public abstract class PlayerList {
      }
 
      public void saveAll() {