From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Astralchroma Date: Thu, 27 Oct 2022 22:19:31 +0100 Subject: [PATCH] Configurable Region Compression Format diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java index b0fa77d298ad1476fdc2433b0308276068e53a71..22de360e6775943c0c8bd5717c78d49b45e70d6d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -424,11 +424,11 @@ public class RegionFile implements AutoCloseable { // Paper end public RegionFile(Path file, Path directory, boolean dsync) throws IOException { - this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync); + this(file, directory, RegionFileVersion.getCompressionFormat(), dsync); // Paper - Configurable region compression format } // Paper start - add can recalc flag public RegionFile(Path file, Path directory, boolean dsync, boolean canRecalcHeader) throws IOException { - this(file, directory, RegionFileVersion.VERSION_DEFLATE, dsync, canRecalcHeader); + this(file, directory, RegionFileVersion.getCompressionFormat(), dsync, canRecalcHeader); // Paper - Configurable region compression format } // Paper end - add can recalc flag diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java index 4411e427d3b6b592f8a18e61b6c59309cf699d3f..6210a202d27788b1304e749b5bc2d9e2b88f5a63 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileVersion.java @@ -30,6 +30,17 @@ public class RegionFileVersion { }, (stream) -> { return stream; })); + + // Paper start - Configurable region compression format + public static RegionFileVersion getCompressionFormat() { + return switch (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.compressionFormat) { + case GZIP -> VERSION_GZIP; + case ZLIB -> VERSION_DEFLATE; + case NONE -> VERSION_NONE; + }; + } + // Paper end - Configurable region compression format + private final int id; private final RegionFileVersion.StreamWrapper inputWrapper; private final RegionFileVersion.StreamWrapper outputWrapper;