diff --git a/build.gradle.kts b/build.gradle.kts index 4885c0be6e..2e36928c96 100644 --- a/build.gradle.kts +++ b/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") diff --git a/gradle.properties b/gradle.properties index 07543018ce..756f59c21f 100644 --- a/gradle.properties +++ b/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 diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index 216d91716e..e24e81096c 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -109,7 +109,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.18-pre8-R0.1-SNAPSHOT +- 1.18-rc3-R0.1-SNAPSHOT - jar - - Spigot-API diff --git a/patches/server/Duplicate-UUID-Resolve-Option.patch b/patches/server/Duplicate-UUID-Resolve-Option.patch index f469223aa9..8fa578974d 100644 --- a/patches/server/Duplicate-UUID-Resolve-Option.patch +++ b/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; diff --git a/patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index e4ccb6d6f8..683df8ad28 100644 --- a/patches/server/Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/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>> list = Lists.newArrayList(); + List 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); diff --git a/patches/server/Improved-Watchdog-Support.patch b/patches/server/Improved-Watchdog-Support.patch index 31b9501a75..ac44397338 100644 --- a/patches/server/Improved-Watchdog-Support.patch +++ b/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 diff --git a/patches/server/MC-Utils.patch b/patches/server/MC-Utils.patch index b9823521fa..e7e3c0af39 100644 --- a/patches/server/MC-Utils.patch +++ b/patches/server/MC-Utils.patch @@ -5398,8 +5398,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + private CompletableFuture, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkPos centerChunk, int margin, IntFunction distanceToStatus) { - List>> list = Lists.newArrayList(); - int j = centerChunk.x; + List>> list = new ArrayList(); + List list1 = new ArrayList(); @@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider holder.setTicketLevel(level); } else { diff --git a/patches/server/Remove-some-streams-from-structures.patch b/patches/server/Remove-some-streams-from-structures.patch index 7ec0c8d1cf..e4c305d737 100644 --- a/patches/server/Remove-some-streams-from-structures.patch +++ b/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 { diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index 84e45d4466..51a8602fb6 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -192,7 +192,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - org.spigotmc - spigot - jar -- 1.18-pre8-R0.1-SNAPSHOT +- 1.18-rc3-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -694,7 +694,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - specialsource-maven-plugin - - -- package +- verify - - remap - @@ -707,7 +707,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - - -- package +- verify - - remap - diff --git a/work/BuildData b/work/BuildData index 09c3da501e..403e1fc440 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 09c3da501e40b5090cbd93cc91c8e5c49ce053b7 +Subproject commit 403e1fc440fdc9eeb6e854e6db1c1974034fccab diff --git a/work/Bukkit b/work/Bukkit index d25437bce3..716b4fce84 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit d25437bce34e0cb0b7c895867183dc949ea41667 +Subproject commit 716b4fce8443809ed39119dbffdd21c04fcea04a diff --git a/work/CraftBukkit b/work/CraftBukkit index 5a39a236c1..c98abfb0ff 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 5a39a236c11b6a5a19f8d26b4c5af1f59f16d447 +Subproject commit c98abfb0ff79f77e91a4116bd7df47495bf81162 diff --git a/work/Spigot b/work/Spigot index 7840c2af5f..b7a4222eac 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 7840c2af5f487981d5a2eab4f9e832fdd7cfb298 +Subproject commit b7a4222eac8fe8634946023cbba965187f568d07