mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-29 06:57:37 +02:00
90fe0d58a5
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: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
47 lines
2.5 KiB
Diff
47 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Astralchroma <astralchroma@proton.me>
|
|
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 84b2fd9db39e0cdf3e1cbe6444579f7ca839bc45..9248769e6d357f6eec68945fd7700e79b2942c41 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..ee27a553b426d3e1e1317bbeb39a3c2d46520e59 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
|
|
+
|
|
private final int id;
|
|
private final RegionFileVersion.StreamWrapper<InputStream> inputWrapper;
|
|
private final RegionFileVersion.StreamWrapper<OutputStream> outputWrapper;
|