Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
2 changed files with 3 additions and 1 deletions
Showing only changes of commit 597dcfffb9 - Show all commits

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/chunk/storage/RegionFileVersion.java --- a/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
+++ b/net/minecraft/world/level/chunk/storage/RegionFileVersion.java +++ b/net/minecraft/world/level/chunk/storage/RegionFileVersion.java
@@ -61,6 +_,15 @@ @@ -61,6 +_,16 @@
private final RegionFileVersion.StreamWrapper<InputStream> inputWrapper; private final RegionFileVersion.StreamWrapper<InputStream> inputWrapper;
private final RegionFileVersion.StreamWrapper<OutputStream> outputWrapper; private final RegionFileVersion.StreamWrapper<OutputStream> outputWrapper;
@@ -9,6 +9,7 @@
+ return switch (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.compressionFormat) { + return switch (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.compressionFormat) {
+ case GZIP -> VERSION_GZIP; + case GZIP -> VERSION_GZIP;
+ case ZLIB -> VERSION_DEFLATE; + case ZLIB -> VERSION_DEFLATE;
+ case LZ4 -> VERSION_LZ4;
+ case NONE -> VERSION_NONE; + case NONE -> VERSION_NONE;
+ }; + };
+ } + }

View File

@@ -186,6 +186,7 @@ public class GlobalConfiguration extends ConfigurationPart {
public enum CompressionFormat { public enum CompressionFormat {
GZIP, GZIP,
ZLIB, ZLIB,
LZ4,
NONE NONE
} }
} }