Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
716b4fce Revert SnakeYAML upgrade
ca6f8942 Update to Minecraft 1.18-rc3
57e7e952 #683: Add Player#showDemoScreen

CraftBukkit Changes:
c98abfb0 Update to Minecraft 1.18-rc3
9b258501 #960: Add Player#showDemoScreen
d9542247 Produce remapped jars after bootstrap jar
99f3ddde SPIGOT-6808: Fix RegionAccessor#getBiome

Spigot Changes:
b7a4222e Update to Minecraft 1.18-rc3

build.gradle.kts

@@ -46,7 +46,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.18-pre8+build.4:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.18-rc3+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.498.22")
     paperclip("io.papermc:paperclip:3.0.0-SNAPSHOT")

gradle.properties

@@ -1,7 +1,7 @@
 group=io.papermc.paper
-version=1.18-pre8-R0.1-SNAPSHOT
+version=1.18-rc3-R0.1-SNAPSHOT
 
-mcVersion=1.18-pre8
+mcVersion=1.18-rc3
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/Convert-project-to-Gradle.patch

@@ -109,7 +109,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.18-pre8-R0.1-SNAPSHOT</version>
+-    <version>1.18-rc3-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>

patches/server/Duplicate-UUID-Resolve-Option.patch

@@ -94,9 +94,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.collect.ImmutableList;
  import com.google.common.collect.ImmutableList.Builder;
  import com.google.common.collect.Iterables;
-@@ -0,0 +0,0 @@ import java.io.IOException;
- import java.io.Writer;
+@@ -0,0 +0,0 @@ import java.io.Writer;
  import java.nio.file.Path;
+ import java.util.ArrayList;
  import java.util.BitSet;
 +import java.util.HashMap; // Paper
 +import java.util.Collection;

patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch

@@ -426,7 +426,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public void updatePlayerMobTypeMap(Entity entity) {
          if (!this.level.paperConfig.perPlayerMobSpawns) {
 @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         List<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> list = Lists.newArrayList();
+         List<ChunkHolder> list1 = new ArrayList();
          int j = centerChunk.x;
          int k = centerChunk.z;
 +        ChunkHolder requestingNeighbor = getUpdatingChunkIfPresent(centerChunk.toLong()); // Paper
@@ -446,8 +446,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                }
 +                // Paper end
  
+                 list1.add(playerchunk);
                  list.add(completablefuture);
-             }
 @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          if (requiredStatus == ChunkStatus.EMPTY) {
              return this.scheduleChunkLoad(chunkcoordintpair);

patches/server/Improved-Watchdog-Support.patch

@@ -296,8 +296,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          } catch (Exception var3) {
 +            if (var3.getCause() instanceof ThreadDeath) throw var3; // Paper
              LOGGER.fatal("Error executing task on {}", this.name(), var3);
-             throw var3;
          }
+ 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java

patches/server/MC-Utils.patch

@@ -5398,8 +5398,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      private CompletableFuture<Either<List<ChunkAccess>, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkPos centerChunk, int margin, IntFunction<ChunkStatus> distanceToStatus) {
-         List<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> list = Lists.newArrayList();
-         int j = centerChunk.x;
+         List<CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>> list = new ArrayList();
+         List<ChunkHolder> list1 = new ArrayList();
 @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                      holder.setTicketLevel(level);
                  } else {

patches/server/Remove-some-streams-from-structures.patch

@@ -21,9 +21,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.rigids = new ObjectArrayList<>(10);
  
          for(StructureFeature<?> structureFeature : StructureFeature.NOISE_AFFECTING_FEATURES) {
--            structureAccessor.startsForFeature(SectionPos.bottomOf(chunk), structureFeature).forEach((structureStart) -> {
-+            for (StructureStart<?> structureStart : structureAccessor.startsForFeature(SectionPos.bottomOf(chunk), structureFeature)) { // Paper - remove streams
-                 for(StructurePiece structurePiece : structureStart.getPieces()) {
+-            structureAccessor.startsForFeature(SectionPos.bottomOf(chunk), structureFeature).forEach((start) -> {
++            for (StructureStart<?> start : structureAccessor.startsForFeature(SectionPos.bottomOf(chunk), structureFeature)) { // Paper - remove streams
+                 for(StructurePiece structurePiece : start.getPieces()) {
                      if (structurePiece.isCloseToChunk(chunkPos, 12)) {
                          if (structurePiece instanceof PoolElementStructurePiece) {
 @@ -0,0 +0,0 @@ public class Beardifier implements NoiseChunk.NoiseFiller {

patches/server/Setup-Gradle-project.patch

@@ -192,7 +192,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.18-pre8-R0.1-SNAPSHOT</version>
+-    <version>1.18-rc3-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -
@@ -694,7 +694,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                        <artifactId>specialsource-maven-plugin</artifactId>
 -                        <executions>
 -                            <execution>
--                                <phase>package</phase>
+-                                <phase>verify</phase>
 -                                <goals>
 -                                    <goal>remap</goal>
 -                                </goals>
@@ -707,7 +707,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                                </configuration>
 -                            </execution>
 -                            <execution>
--                                <phase>package</phase>
+-                                <phase>verify</phase>
 -                                <goals>
 -                                    <goal>remap</goal>
 -                                </goals>