Rewrite linear flushing

Fix wrong end portal teleport position
Fix extension name parsing again *
2024-12-26 12:53:23 +08:00 · 2024-12-15 15:36:38 +08:00 · 2024-12-15 14:01:21 +08:00 · 2024-12-15 13:49:22 +08:00 · 2024-12-15 13:26:16 +08:00 · 2024-12-15 13:14:20 +08:00
3 changed files with 216 additions and 118 deletions
--- a/patches/server/0003-Empty-config-file-base.patch
+++ b/patches/server/0003-Empty-config-file-base.patch
@@ -192,10 +192,10 @@ index 0000000000000000000000000000000000000000..9f6896711907ac30fe0c00130207b970
 +}
 diff --git a/src/main/java/me/earthme/luminol/config/LuminolConfig.java b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..976cc572861174787b37992388a03ab01f8703a4
+index 0000000000000000000000000000000000000000..fcacd381e4a5875ed0c542a9e6c1804fae823435
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/LuminolConfig.java
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,221 @@
 +package me.earthme.luminol.config;
 +
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
@@ -275,6 +275,7 @@ index 0000000000000000000000000000000000000000..976cc572861174787b37992388a03ab0
 +            loadAllModules();
 +        }catch (Exception e){
 +            logger.error("Failed to load config modules!",e);
+            throw new RuntimeException(e);
 +        }
 +
 +        configFileInstance.save();
--- a/patches/server/0018-Add-configurable-region-format-framework-linear-v2-r.patch
+++ b/patches/server/0018-Add-configurable-region-format-framework-linear-v2-r.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrHua269 <wangxyper@163.com>
-Date: Sun, 15 Dec 2024 12:11:39 +0800
-Subject: [PATCH] Add configurable region format framework & linear v2 region 
+Date: Sun, 15 Dec 2024 12:53:33 +0800
+Subject: [PATCH] Add configurable region format framework & linear v2 region
 format support


@@ -68,15 +68,12 @@ index 0000000000000000000000000000000000000000..d92f1d549c7e01daa6b5bba7d405e462
 +}
 diff --git a/src/main/java/abomination/LinearRegionFile.java b/src/main/java/abomination/LinearRegionFile.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27eb2f99239
+index 0000000000000000000000000000000000000000..9fdc9aa840c6b2ae027bcf84a2b77856d79a6a38
 --- /dev/null
 +++ b/src/main/java/abomination/LinearRegionFile.java
-@@ -0,0 +1,668 @@
+@@ -0,0 +1,608 @@
 +package abomination;
 +
-+import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
-+import ca.spottedleaf.concurrentutil.executor.thread.PrioritisedThreadPool;
-+import ca.spottedleaf.concurrentutil.util.Priority;
 +import ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO;
 +import com.github.luben.zstd.ZstdInputStream;
 +import com.github.luben.zstd.ZstdOutputStream;
@@ -85,7 +82,6 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +import net.jpountz.lz4.LZ4Compressor;
 +import net.jpountz.lz4.LZ4Factory;
 +import net.jpountz.lz4.LZ4FastDecompressor;
-+import net.minecraft.server.MinecraftServer;
 +import net.openhft.hashing.LongHashFunction;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.world.level.chunk.storage.RegionStorageInfo;
@@ -99,16 +95,13 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +import java.nio.file.Files;
 +import java.nio.file.Path;
 +import java.nio.file.StandardCopyOption;
-+import java.util.concurrent.CompletableFuture;
-+import java.util.concurrent.Executor;
-+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ScheduledFuture;
 +import java.util.concurrent.atomic.AtomicInteger;
 +import java.util.concurrent.locks.ReentrantLock;
-+import java.util.stream.IntStream;
 +
 +// LinearRegionFile_implementation_version_0_5byXymb
 +// Just gonna use this string to inform other forks about updates ;-)
-+public class LinearRegionFile extends Thread implements IRegionFile{
+public class LinearRegionFile implements IRegionFile{
 +    private static final long SUPERBLOCK = 0xc3ff13183cca9d9aL;
 +    private static final byte VERSION = 3;
 +    private static final int HEADER_SIZE = 27;
@@ -136,7 +129,7 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +    private int bucketSize = 4;
 +
 +    private final AtomicInteger modifiedChunkCount = new AtomicInteger(0);
-+    private PrioritisedExecutor.PrioritisedTask ioTask = null;
+    private ScheduledFuture<?> ioTask = null;
 +
 +    public Path getRegionFile() {
 +        return this.regionFile;
@@ -354,28 +347,12 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +        }
 +    }
 +
-+    private static final AtomicInteger ioThreadId = new AtomicInteger();
-+    private static final PrioritisedThreadPool linearIOThreadPool = new PrioritisedThreadPool(thread -> {
-+        thread.setName("Linear RegionFile IO Thread- " + ioThreadId.getAndIncrement());
-+        thread.setContextClassLoader(MinecraftServer.class.getClassLoader());
-+    });
-+    public static final long WORKER_QUEUE_HOLD_TIME = (long)(20.0e6); // 20ms
-+    private static PrioritisedExecutor linearIOExecutor;
-+
 +    /*
 +    private static final int SAVE_THREAD_MAX_COUNT = 6;
 +    private static final Object saveLock = new Object();
 +    private static int activeSaveThreads = 0;
 +    */
 +
-+    public static void initIOExecutor() {
-+        linearIOExecutor = linearIOThreadPool.createExecutorGroup(1, 0).createExecutor(RegionFormatConfig.linearIoThreadCount, WORKER_QUEUE_HOLD_TIME, 0);
-+    }
-+
-+    public static void shutdownIOExecutor() {
-+        linearIOThreadPool.shutdown(true);
-+    }
-+
 +    /*public void run() {
 +        try {
 +            while (!close) {
@@ -560,53 +537,15 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +        markToSave();
 +        this.modifiedChunkCount.getAndIncrement();
 +
-+        if (ioTask == null) {
-+            this.scheduleSave();
-+        }else {
-+            if (this.ioTask.getPriority() == Priority.COMPLETING) {
-+                this.scheduleSave();
-+                return;
-+            }
-+
-+            this.ioTask.raisePriority(this.computeSavePriority());
-+        }
+        this.ioTask = RegionFormatConfig.linearFlusher.claimTask(this.ioTask, this);
 +    }
 +
-+    private Priority computeSavePriority() {
-+        final int currentModifiedChunkCount = this.modifiedChunkCount.get();
-+
-+        final int[] ordinals = new int[]{2, 3, 4, 5, 6};
-+        final int[] thresholds = new int[]{20, 40, 60, 80, 100};
-+        final int coverPercent = (currentModifiedChunkCount / 1024) * 100;
-+
-+        int actualOrdinal = 6;
-+        for (int i = 0; i < thresholds.length; i++) {
-+            if (coverPercent >= thresholds[i]) {
-+                actualOrdinal = ordinals[i];
-+            }
-+        }
-+
-+        return Priority.values()[actualOrdinal];
+    public synchronized boolean isClosed() {
+        return this.close;
 +    }
 +
-+    private void scheduleSave() {
-+        final PrioritisedExecutor.PrioritisedTask created = linearIOExecutor.createTask(() -> {
-+            try {
-+                synchronized (this) {
-+                    if (!this.isMarkedToSave() && !this.close) {
-+                        return;
-+                    }
-+                }
-+
-+                this.flush();
-+            } catch (IOException e) {
-+                throw new RuntimeException(e);
-+            }
-+        }, this.computeSavePriority());
-+
-+        created.queue();
-+
-+        this.ioTask = created;
+    public double getLoadPercent() {
+        return ((double)this.modifiedChunkCount.get()) / (32 * 32);
 +    }
 +
 +    public DataOutputStream getChunkDataOutputStream(ChunkPos pos) {
@@ -685,6 +624,7 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +        openRegionFile();
 +        close = true;
 +        try {
+            if (this.ioTask != null) this.ioTask.cancel(false);
 +            flush();
 +        } catch(IOException e) {
 +            throw new IOException("Region flush IOException " + e + " " + this.regionFile);
@@ -740,6 +680,67 @@ index 0000000000000000000000000000000000000000..4b4a0f9b514909debf36e0937338f27e
 +        }
 +    }
 +}
+diff --git a/src/main/java/abomination/LinearRegionFileFlusher.java b/src/main/java/abomination/LinearRegionFileFlusher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..b4e4b4a7fb8f37715b6a3099ec2c7f48d65f9390
+--- /dev/null
+++ b/src/main/java/abomination/LinearRegionFileFlusher.java
+@@ -0,0 +1,55 @@
+package abomination;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class LinearRegionFileFlusher {
+    private final ScheduledThreadPoolExecutor delayedIoSchedule;
+    private final long baseDelay;
+
+    public LinearRegionFileFlusher(int nThreads, long baseDelay) {
+        this.delayedIoSchedule = new ScheduledThreadPoolExecutor(nThreads,
+                new ThreadFactoryBuilder()
+                        .setPriority(3)
+                        .setNameFormat("Linear IO Thread - %d")
+                        .build()
+        );
+        this.baseDelay = baseDelay;
+    }
+
+    public void shutdown() {
+        this.delayedIoSchedule.shutdown();
+        while (true) {
+            try {
+                if (this.delayedIoSchedule.awaitTermination(1000, TimeUnit.MILLISECONDS)) break;
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public ScheduledFuture<?> claimTask(@Nullable ScheduledFuture<?> parent, @NotNull LinearRegionFile file){
+        if (parent != null) {
+            if (!parent.isCancelled() && !parent.isDone()) {
+                parent.cancel(false);
+            }
+        }
+
+        final double loadPercent = file.getLoadPercent() * 100;
+        final double delayOffset = Math.max(this.baseDelay, loadPercent * this.baseDelay);
+
+        final long actualDelay = (long) (this.baseDelay - delayOffset);
+        return this.delayedIoSchedule.schedule(() -> {
+            try {
+                file.flush();
+            }catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }, actualDelay, java.util.concurrent.TimeUnit.MILLISECONDS);
+    }
+}
 diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
 index a814512fcfb85312474ae2c2c21443843bf57831..2e084a5b28cbe4737f48c25e10af589213525362 100644
 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/ChunkSystemRegionFileStorage.java
@@ -782,30 +783,35 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..c7d4d944eb198ac53a3eeae717a25c7d
 }
 diff --git a/src/main/java/me/earthme/luminol/config/modules/misc/RegionFormatConfig.java b/src/main/java/me/earthme/luminol/config/modules/misc/RegionFormatConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d755934d41ed7cbcf26bc9f5682984a732edd18a
+index 0000000000000000000000000000000000000000..4dc62688fe2731f7b43d7f48c7cb76fef33821c1
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/config/modules/misc/RegionFormatConfig.java
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,64 @@
 +package me.earthme.luminol.config.modules.misc;
 +
 +import abomination.LinearRegionFile;
+import abomination.LinearRegionFileFlusher;
 +import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-+import me.earthme.luminol.config.ConfigInfo;
-+import me.earthme.luminol.config.DoNotLoad;
-+import me.earthme.luminol.config.EnumConfigCategory;
-+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.*;
 +import me.earthme.luminol.utils.EnumRegionFormat;
 +import net.minecraft.server.MinecraftServer;
 +
 +public class RegionFormatConfig implements IConfigModule {
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "format")
 +    public static String format = "MCA";
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "linear_compression_level")
 +    public static int linearCompressionLevel = 1;
+    @HotReloadUnsupported
 +    @ConfigInfo(baseName = "linear_io_thread_count")
 +    public static int linearIoThreadCount = 6;
-+    @ConfigInfo(baseName = "linear_io_signal_check_delay_ms")
-+    public static int linearIoQueueSize = 100;
+    @HotReloadUnsupported
+    @ConfigInfo(baseName = "linear_io_flush_delay_ms")
+    public static int linearIoFlushDelayMs = 100;
+
+    @DoNotLoad
+    public static LinearRegionFileFlusher linearFlusher;
 +
 +    @DoNotLoad
 +    public static EnumRegionFormat regionFormat;
@@ -822,7 +828,6 @@ index 0000000000000000000000000000000000000000..d755934d41ed7cbcf26bc9f5682984a7
 +
 +    @Override
 +    public void onLoaded(CommentedFileConfig configInstance) {
-+        LinearRegionFile.initIOExecutor();
 +        regionFormat = EnumRegionFormat.fromString(format.toUpperCase());
 +
 +        if (regionFormat == null) {
@@ -834,11 +839,21 @@ index 0000000000000000000000000000000000000000..d755934d41ed7cbcf26bc9f5682984a7
 +            MinecraftServer.LOGGER.error("Falling back to compression level 1.");
 +            RegionFormatConfig.linearCompressionLevel = 1;
 +        }
+
+        if (regionFormat == EnumRegionFormat.LINEAR_V2) {
+            linearFlusher = new LinearRegionFileFlusher(RegionFormatConfig.linearIoThreadCount, RegionFormatConfig.linearIoFlushDelayMs);
+        }
+    }
+
+    public static void shutdownLinearIOPool() {
+        if (linearFlusher != null) {
+            linearFlusher.shutdown();
+        }
 +    }
 +}
 diff --git a/src/main/java/me/earthme/luminol/utils/EnumRegionFormat.java b/src/main/java/me/earthme/luminol/utils/EnumRegionFormat.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f8e9ebd95312e94a07dc18c3435471810f0b5b2a
+index 0000000000000000000000000000000000000000..73b4f9b5f608322839cf1e37fbf1d3a147247c60
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/utils/EnumRegionFormat.java
@@ -0,0 +1,40 @@
@@ -850,8 +865,8 @@ index 0000000000000000000000000000000000000000..f8e9ebd95312e94a07dc18c343547181
 +import org.jetbrains.annotations.Nullable;
 +
 +public enum EnumRegionFormat {
-+    MCA("mca", ".mca" , (info) -> new RegionFile(info.info(), info.filePath(), info.folder(), info.sync())),
-+    LINEAR_V2("linear_v2", ".linear" ,(info) -> new LinearRegionFile(info.info(), info.filePath(), info.folder(), info.sync(), RegionFormatConfig.linearCompressionLevel));
+    MCA("mca", "mca" , (info) -> new RegionFile(info.info(), info.filePath(), info.folder(), info.sync())),
+    LINEAR_V2("linear_v2", "linear" ,(info) -> new LinearRegionFile(info.info(), info.filePath(), info.folder(), info.sync(), RegionFormatConfig.linearCompressionLevel));
 +
 +    private final String name;
 +    private final String argument;
@@ -911,17 +926,79 @@ index 0000000000000000000000000000000000000000..5af068489646ed70330d8c6242ec88f5
 +
 +public record RegionCreatorInfo (RegionStorageInfo info, Path filePath, Path folder, boolean sync) {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8cc0c01a19fc71753d7c3ed4fa7e9992aaf93b5a..88be8a6232bc3311cc0bdb7c697f7a78ce33e38d 100644
+index 8cc0c01a19fc71753d7c3ed4fa7e9992aaf93b5a..ad79dee048a57be6a6997a38195d636ce952c48d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1036,10 +1036,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+             while (iterator1.hasNext()) {
+                 ServerLevel worldserver2 = (ServerLevel) iterator1.next();
+ 
+-                MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage ({}): All chunks are saved", worldserver2.getChunkSource().chunkMap.getStorageName());
+                MinecraftServer.LOGGER.info("ThreadedChunkStorage ({}): All chunks are saved", worldserver2.getChunkSource().chunkMap.getStorageName()); // Luminol - configurable region format
+             }
+ 
+-            MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
+            MinecraftServer.LOGGER.info("ThreadedChunkStorage: All dimensions are saved"); // Luminol - configurable region format
+         }
+ 
+         return flag3;
@@ -1180,6 +1180,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
         this.saveAllChunks(false, true, true, true); // Paper - rewrite chunk system
 
         this.isSaving = false;
-+        abomination.LinearRegionFile.shutdownIOExecutor(); // Luminol - Linear region file format
+        me.earthme.luminol.config.modules.misc.RegionFormatConfig.linearFlusher.shutdown(); // Luminol - Linear region file format
         // Folia start - region threading
         this.stopPart2();
     }
+diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+index 622d0cbe023774d92d212f242b60b96317720835..9b4b01a741e8779f4ea06b0fd801ce243e179910 100644
+--- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+@@ -75,7 +75,7 @@ public class WorldUpgrader implements AutoCloseable {
+     volatile int skipped;
+     final Reference2FloatMap<ResourceKey<Level>> progressMap = Reference2FloatMaps.synchronize(new Reference2FloatOpenHashMap());
+     volatile Component status = Component.translatable("optimizeWorld.stage.counting");
+-    static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$");
+    static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\\\"+ net.minecraft.world.level.chunk.storage.RegionFileStorage.getExtensionName() +"$"); // Luminol - Configurable region file format
+     final DimensionDataStorage overworldDataStorage;
+ 
+     public WorldUpgrader(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, RegistryAccess dynamicRegistryManager, boolean eraseCache, boolean recreateRegionFiles) {
+@@ -399,7 +399,7 @@ public class WorldUpgrader implements AutoCloseable {
+ 
+         private static List<WorldUpgrader.FileToUpgrade> getAllChunkPositions(RegionStorageInfo key, Path regionDirectory) {
+             File[] afile = regionDirectory.toFile().listFiles((file, s) -> {
+-                return s.endsWith(".mca");
+                return s.endsWith(net.minecraft.world.level.chunk.storage.RegionFileStorage.getExtensionName()); // Luminol - Configurable region file format
+             });
+ 
+             if (afile == null) {
+@@ -419,7 +419,7 @@ public class WorldUpgrader implements AutoCloseable {
+                         List<ChunkPos> list1 = Lists.newArrayList();
+ 
+                         try {
+-                            RegionFile regionfile = new RegionFile(key, file.toPath(), regionDirectory, true);
+                            abomination.IRegionFile regionfile = net.minecraft.world.level.chunk.storage.RegionFileStorage.createNew(key, file.toPath(), regionDirectory, true);
+ 
+                             try {
+                                 for (int i1 = 0; i1 < 32; ++i1) {
+@@ -482,7 +482,7 @@ public class WorldUpgrader implements AutoCloseable {
+ 
+         protected abstract boolean tryProcessOnePosition(T storage, ChunkPos chunkPos, ResourceKey<Level> worldKey);
+ 
+-        private void onFileFinished(RegionFile regionFile) {
+        private void onFileFinished(abomination.IRegionFile regionFile) {
+             if (WorldUpgrader.this.recreateRegionFiles) {
+                 if (this.previousWriteFuture != null) {
+                     this.previousWriteFuture.join();
+@@ -507,7 +507,7 @@ public class WorldUpgrader implements AutoCloseable {
+         }
+     }
+ 
+-    static record FileToUpgrade(RegionFile file, List<ChunkPos> chunksToUpgrade) {
+    static record FileToUpgrade(abomination.IRegionFile file, List<ChunkPos> chunksToUpgrade) {
+ 
+     }
+ 
 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 16f07007a0f73ec0c6f421c9b082518e87e8cc7b..fc69834e18e0860750d878e1361722fc38b513f8 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
@@ -985,7 +1062,7 @@ index 16f07007a0f73ec0c6f421c9b082518e87e8cc7b..fc69834e18e0860750d878e1361722fc
         }
         // Paper end - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a09ff02da 100644
+index e40665cead218502b44dd49051a53326ed94f061..a25e1bfd74b7ec9d6fcc3fe7c4369bc20b33a0da 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -23,7 +23,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
@@ -997,34 +1074,36 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
     private final RegionStorageInfo info;
     private final Path folder;
     private final boolean sync;
-@@ -35,6 +35,26 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -33,8 +33,27 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+     private static final int MAX_NON_EXISTING_CACHE = 1024 * 4;
+     private final it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet nonExistingRegionFiles = new it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet();
     private static String getRegionFileName(final int chunkX, final int chunkZ) {
-         return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + ".mca";
+-        return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + ".mca";
+        return "r." + (chunkX >> REGION_SHIFT) + "." + (chunkZ >> REGION_SHIFT) + getExtensionName(); // Luminol - Configurable region file format
     }
 +    // Luminol start - Configurable region file format
-+    protected abomination.IRegionFile createNew(RegionStorageInfo info, Path filePath, Path folder, boolean sync) throws IOException{
+    public static abomination.IRegionFile createNew(RegionStorageInfo info, Path filePath, Path folder, boolean sync) throws IOException{
 +        final me.earthme.luminol.utils.EnumRegionFormat regionFormat = me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat;
 +        final String fullFileName = filePath.getFileName().toString();
-+        final String argument;
+        final String[] fullNameSplit = fullFileName.split("\\.");
+        final String extensionName = fullNameSplit[fullNameSplit.length - 1];
 +
-+        int lastDotIndex = fullFileName.lastIndexOf(".");
-+        if (lastDotIndex != -1 && lastDotIndex < fullFileName.length() - 1) {
-+            argument = fullFileName.substring(lastDotIndex + 1);
-+        }else {
-+            throw new IOException("Invalid region file name: " + fullFileName);
-+        }
-+
-+        if (!regionFormat.getArgument().equalsIgnoreCase(argument)) {
-+            throw new IOException("Invalid region file format: " + argument + " expected " + regionFormat.getArgument());
+        if (!regionFormat.getArgument().equalsIgnoreCase(extensionName)) {
+            net.minecraft.server.MinecraftServer.setFatalException(new RuntimeException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument()));
+            throw new IOException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument());
 +        }
 +
 +        return regionFormat.getCreator().create(new me.earthme.luminol.utils.RegionCreatorInfo(info, filePath, folder, sync));
 +    }
+
+    public static String getExtensionName() {
+        return "." + me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat.getArgument();
+    }
 +    // Luminol end
 
     private boolean doesRegionFilePossiblyExist(final long position) {
         synchronized (this.nonExistingRegionFiles) {
-@@ -68,15 +88,15 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -68,15 +87,15 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
     }
 
     @Override
@@ -1043,7 +1122,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
         if (ret != null) {
             return ret;
         }
-@@ -100,7 +120,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -100,7 +119,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
 
         FileUtil.createDirectoriesSafe(this.folder);
 
@@ -1052,7 +1131,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
 
         this.regionCache.putAndMoveToFirst(key, ret);
 
-@@ -119,7 +139,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -119,7 +138,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
         }
 
         final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
@@ -1061,7 +1140,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
 
         // note: not required to keep regionfile loaded after this call, as the write param takes a regionfile as input
         // (and, the regionfile parameter is unused for writing until the write call)
-@@ -153,7 +173,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -153,7 +172,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
     ) throws IOException {
         final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
         if (writeData.result() == ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData.WriteResult.DELETE) {
@@ -1070,7 +1149,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
             if (regionFile != null) {
                 regionFile.clear(pos);
             } // else: didn't exist
-@@ -168,7 +188,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -168,7 +187,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
     public final ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.ReadData moonrise$readData(
         final int chunkX, final int chunkZ
     ) throws IOException {
@@ -1079,7 +1158,16 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
 
         final DataInputStream input = regionFile == null ? null : regionFile.getChunkDataInputStream(new ChunkPos(chunkX, chunkZ));
 
-@@ -250,12 +270,12 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -221,7 +240,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+     @Nullable
+     public static ChunkPos getRegionFileCoordinates(Path file) {
+         String fileName = file.getFileName().toString();
+-        if (!fileName.startsWith("r.") || !fileName.endsWith(".mca")) {
+        if (!fileName.startsWith("r.") || !fileName.endsWith(getExtensionName())) { // Luminol - Configurable region file format
+             return null;
+         }
+ 
+@@ -250,12 +269,12 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
     }
 
     // Paper start - rewrite chunk system
@@ -1094,7 +1182,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
         // Paper start - rewrite chunk system
         if (existingOnly) {
             return this.moonrise$getRegionFileIfExists(chunkcoordintpair.x, chunkcoordintpair.z);
-@@ -263,7 +283,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -263,7 +282,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
         synchronized (this) {
             final long key = ChunkPos.asLong(chunkcoordintpair.x >> REGION_SHIFT, chunkcoordintpair.z >> REGION_SHIFT);
 
@@ -1103,7 +1191,16 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
             if (ret != null) {
                 return ret;
             }
-@@ -292,7 +312,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -278,7 +297,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+ 
+             FileUtil.createDirectoriesSafe(this.folder);
+ 
+-            ret = new RegionFile(this.info, regionPath, this.folder, this.sync);
+            ret = this.createNew(this.info, regionPath, this.folder, this.sync);
+ 
+             this.regionCache.putAndMoveToFirst(key, ret);
+ 
+@@ -292,7 +311,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
         org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
     }
 
@@ -1112,7 +1209,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
         synchronized (regionfile) {
             try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
                 CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
-@@ -327,7 +347,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -327,7 +346,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
     @Nullable
     public CompoundTag read(ChunkPos pos) throws IOException {
         // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
@@ -1121,7 +1218,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
         if (regionfile == null) {
             return null;
         }
-@@ -391,7 +411,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -391,7 +410,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
 
     public void scanChunk(ChunkPos chunkPos, StreamTagVisitor scanner) throws IOException {
         // CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
@@ -1130,7 +1227,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
         if (regionfile == null) {
             return;
         }
-@@ -421,7 +441,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -421,7 +440,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
     }
 
     public void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { // Paper - rewrite chunk system - public
@@ -1139,7 +1236,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
         // Paper start - rewrite chunk system
         if (regionfile == null) {
             // if the RegionFile doesn't exist, no point in deleting from it
-@@ -465,7 +485,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -465,7 +484,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
         // Paper start - rewrite chunk system
         synchronized (this) {
             final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
@@ -1148,7 +1245,7 @@ index e40665cead218502b44dd49051a53326ed94f061..c9371ef5123df1c343d6e8dccad7347a
                 try {
                     regionFile.close();
                 } catch (final IOException ex) {
-@@ -482,7 +502,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
+@@ -482,7 +501,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
         // Paper start - rewrite chunk system
         synchronized (this) {
             final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
--- a/patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch
+++ b/patches/server/0024-Kaiiju-Vanilla-end-portal-teleportation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4fdbdd1c5c937c20026afe555fa1c8371b4eaa16..bd3f0c807c36ecfb8a89a0ca68ffa0c3640b7423 100644
+index 4fdbdd1c5c937c20026afe555fa1c8371b4eaa16..64e081f993c2c844f83af227380b8a957eaabad4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -114,6 +114,7 @@ import net.minecraft.world.level.block.Rotation;
@@ -33,7 +33,7 @@ index 4fdbdd1c5c937c20026afe555fa1c8371b4eaa16..bd3f0c807c36ecfb8a89a0ca68ffa0c3
                             portalInfoCompletable.complete(
                                 new net.minecraft.world.level.portal.TeleportTransition(
 -                                    destination, Vec3.atBottomCenterOf(targetPos.below()), Vec3.ZERO, 90.0f, 0.0f,
-+                                    destination, Vec3.atBottomCenterOf(targetPos.below()), this.getDeltaMovement(), 90.0f, 0.0f, // Kaiiju - Vanilla end teleportation
+                                    destination, finalPos, this.getDeltaMovement(), 90.0f, 0.0f, // Kaiiju - Vanilla end teleportation
                                     TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET),
                                     org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL
                                 )
Author	SHA1	Message	Date
MrHua269	8a01b9ad39	Rewrite linear flushing	2024-12-26 12:53:23 +08:00
MrHua269	27a2e2a129	Fix wrong end portal teleport position	2024-12-15 15:36:38 +08:00
MrHua269	3b9b3813b4	Fix extension name parsing again * Jesus what careless I am()	2024-12-15 14:01:21 +08:00
MrHua269	9b4a6d60ac	Fix extension name parsing again	2024-12-15 13:49:22 +08:00
MrHua269	6055cc7367	Fix extension name parsing	2024-12-15 13:26:16 +08:00
MrHua269	9edeb2a539	Remove dot* in argument option of EnumRegionFormat	2024-12-15 13:14:20 +08:00
MrHua269	207f96891a	Fix missing replaces	2024-12-15 13:04:52 +08:00
MrHua269	9baaa0a236	Split out changes into the patches it should be	2024-12-15 12:55:14 +08:00
MrHua269	99c167504b	Fix file extension	2024-12-15 12:50:29 +08:00