Update Upstream (Folia)

* Linear flusher

* Use a queue & a single thread

* Customizable flusher thread number

* Use try statements

README.md

@@ -11,30 +11,46 @@
 
 ## Features
 
-### Primary
-- **Xymb Linear Format**: Saves about 50% of disk space in OW/Nether and 95% in The End.
-- **Auto update**: Automatic upstream updates.
-
 ### Notable
-- **Entity throttling & removal**: Tweak entity tick frequency & max entity per region.
+- **Xymb Linear Format**: A Region file format that reduces disk space usage by about 50%.
+- **Async Pathfinding**: Petal async pathfinding fixed & reworked.
 - **Technical Minecraft**: Enable Vanilla exploits such as sand duping, RNG manipulation...
 
+### Other
+- **Small optimizations**: Increase server efficiency by disabling unnecessary features.
+- **Commands**: Restore few commands that were previously removed by Folia.
+
 ### Configuration
 
 ```yaml
 network:
   send-null-entity-packets: true
   alternate-keepalive: false
+  kick-player-on-bad-packet: true
+gameplay:
+  server-mod-name: Kaiiju
+  shared-random-for-players: true
+region-format:
+  debug: false
 optimization:
   disable-vanish-api: false
   disable-player-stats: false
   disable-arm-swing-event: false
   disable-ensure-tick-thread-checks: false
-gameplay:
+  async-path-processing:
-  server-mod-name: Kaiiju
+    enable: false
-  shared-random-for-players: true
+    max-threads: 0
+    keepalive: 60
+    queue-capacity: 4096
 world-settings:
   default:
+    gameplay:
+      fix-void-trading: true
+      break-redstone-on-top-of-trap-doors-early: true
+      fix-tripwire-state-inconsistency: true
+      safe-teleportation: true
+      sand-duplication: false
+      teleport-async-on-high-velocity: false
     region-format:
       format: ANVIL
       linear:
@@ -42,25 +58,22 @@ world-settings:
         crash-on-broken-symlink: true
     optimization:
       shulker-box-drop-contents-when-destroyed: true
+      optimize-hoppers: true
+      tick-when-empty: true
       enable-entity-throttling: false
       disable-achievements: false
       disable-creatures-spawn-events: false
       disable-dolphin-swim-to-treasure: false
-    gameplay:
-      fix-void-trading: true
-      optimize-hoppers: true
-      tick-when-empty: true
-      break-redstone-on-top-of-trap-doors-early: true
-      fix-tripwire-state-inconsistency: true
-      safe-teleportation: true
-      sand-duplication: false
 ```
 Documentation: [Kaiiju Wiki](https://github.com/KaiijuMC/Kaiiju/wiki/Configuration)
 
 ### Roadmap
-- **Static view distance**: Reduce RAM usage / Region size with a "static" view distance.
-- **Native world conversion**: Convert region file format at startup.
 - **Stash deduplication**: Make giant dupe stashes possible and lagless.
+- **Multithreaded Tracker**: Rework Petal multithreaded tracker.
+
+## Open to contributions
+- **Native world conversion**: Convert region file format at startup.
+- **Performance patch**: Any significative performance patch.
 
 ## Building
 

gradle.properties

@@ -2,7 +2,7 @@ group = dev.kaiijumc.kaiiju
 version = 1.20.1-R0.1-SNAPSHOT
 mcVersion = 1.20.1
 
-foliaRef = daacd4255022f3a1bf74dd3e84f751be838678ac
+foliaRef = 3cf16eeaf2e9c2346b9825900e5eaab376654c36
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0003-Region-format-configuration.patch

@@ -5,18 +5,15 @@ Subject: [PATCH] Region format configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027..b86c90cc3601e666998cfa12f44515f605bb53eb 100644
+index 7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027..f08bcc9ae1770fa847d8a5e873a554bef5485100 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -192,4 +192,10 @@ public class KaiijuConfig {
+@@ -192,4 +192,7 @@ public class KaiijuConfig {
          }
          return builder.build();
      }
 +
-+    public static boolean regionFormatDebug = false;
-+
 +    private static void regionFormatSettings() {
-+        regionFormatDebug = getBoolean("region-format.debug", regionFormatDebug);
 +    }
  }
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java
@@ -85,7 +82,7 @@ index 0000000000000000000000000000000000000000..7164d9cd03186f0657783f83de3d6435
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cc1a7c4d38874ec218f7151685ae6cc00295c2e4..06233380f7580726753de34c1fb23d6347c9ac94 100644
+index 7e5645d9cb64ce17f60c85619f5640c8de4b1e86..bc9204d2c925437e9ff5c5d62d9faf38c2938e48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -893,7 +893,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0004-Add-Linear-region-format.patch

@@ -38,6 +38,34 @@ index f2c27e0ac65be4b75c1d86ef6fd45fdb538d96ac..00724993d0448454d14a47652b039b88
  
          public static final class InProgressWrite {
              public long writeCounter;
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+index f08bcc9ae1770fa847d8a5e873a554bef5485100..b7f43cce80742aa0cd523e930772ff84946f3eef 100644
+--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
++++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
+@@ -15,7 +15,6 @@ import java.io.IOException;
+ import java.lang.reflect.InvocationTargetException;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
+-import java.util.Arrays;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+@@ -193,6 +192,15 @@ public class KaiijuConfig {
+         return builder.build();
+     }
+ 
++    public static int linearFlushFrequency = 10;
++    public static int linearFlushThreads = 1;
++
+     private static void regionFormatSettings() {
++        linearFlushFrequency = getInt("region-format.linear.flush-frequency", linearFlushFrequency);
++        linearFlushThreads = getInt("region-format.linear.flush-max-threads", linearFlushThreads);
++        if (linearFlushThreads < 0)
++            linearFlushThreads = Math.max(Runtime.getRuntime().availableProcessors() + linearFlushThreads, 1);
++        else
++            linearFlushThreads = Math.max(linearFlushThreads, 1);
+     }
+ }
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/region/AbstractRegionFile.java b/src/main/java/dev/kaiijumc/kaiiju/region/AbstractRegionFile.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..249303116d3cfadd078ebf0ae6e44bf99eed6a47
@@ -112,10 +140,10 @@ index 0000000000000000000000000000000000000000..dcfbabf54b19a4c29d5c95830242c5c2
 +}
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/region/LinearRegionFile.java b/src/main/java/dev/kaiijumc/kaiiju/region/LinearRegionFile.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4bf89d0727
+index 0000000000000000000000000000000000000000..e40989889f3821bb7484fc0bae5d94b033013904
 --- /dev/null
 +++ b/src/main/java/dev/kaiijumc/kaiiju/region/LinearRegionFile.java
-@@ -0,0 +1,337 @@
+@@ -0,0 +1,316 @@
 +package dev.kaiijumc.kaiiju.region;
 +
 +import com.github.luben.zstd.ZstdInputStream;
@@ -138,65 +166,57 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.List;
++import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.locks.ReentrantLock;
 +
-+public class LinearRegionFile extends Thread implements AbstractRegionFile {
++public class LinearRegionFile implements AbstractRegionFile, AutoCloseable {
 +    private static final long SUPERBLOCK = -4323716122432332390L;
 +    private static final byte VERSION = 2;
 +    private static final int HEADER_SIZE = 32;
 +    private static final int FOOTER_SIZE = 8;
 +    private static final Logger LOGGER = LogUtils.getLogger();
 +    private static final List<Byte> SUPPORTED_VERSIONS = Arrays.asList((byte) 1, (byte) 2);
-+
++    private static final LinearRegionFileFlusher linearRegionFileFlusher = new LinearRegionFileFlusher();
 +
 +    private final byte[][] buffer = new byte[1024][];
 +    private final int[] bufferUncompressedSize = new int[1024];
 +
 +    private final int[] chunkTimestamps = new int[1024];
-+    private final Object markedToSaveLock = new Object();
 +    private final ChunkStatus[] statuses = new ChunkStatus[1024];
 +
 +    private final LZ4Compressor compressor;
 +    private final LZ4FastDecompressor decompressor;
 +
-+    private boolean markedToSave = false;
-+    private boolean close = false;
-+
 +    public final ReentrantLock fileLock = new ReentrantLock(true);
-+    public Path regionFile;
-+
 +    private final int compressionLevel;
 +
-+    public Path getRegionFile() {
++    private AtomicBoolean markedToSave = new AtomicBoolean(false);
-+        return this.regionFile;
++    public boolean closed = false;
-+    }
++    public Path path;
 +
-+    public ReentrantLock getFileLock() {
-+        return this.fileLock;
-+    }
 +
 +    public LinearRegionFile(Path file, int compression) throws IOException {
-+        this.regionFile = file;
++        this.path = file;
 +        this.compressionLevel = compression;
-+
 +        this.compressor = LZ4Factory.fastestInstance().fastCompressor();
 +        this.decompressor = LZ4Factory.fastestInstance().fastDecompressor();
 +
-+        File regionFile = new File(this.regionFile.toString());
++        File regionFile = new File(this.path.toString());
 +
 +        Arrays.fill(this.bufferUncompressedSize, 0);
 +
-+        if(regionFile.canRead()) {
++        if (!regionFile.canRead()) return;
-+            FileInputStream fileStream = new FileInputStream(regionFile);
++
-+            DataInputStream rawDataStream = new DataInputStream(fileStream);
++        try (FileInputStream fileStream = new FileInputStream(regionFile);
++             DataInputStream rawDataStream = new DataInputStream(fileStream)) {
 +
 +            long superBlock = rawDataStream.readLong();
 +            if (superBlock != SUPERBLOCK)
-+                throw new RuntimeException("Invalid superblock: " + superBlock + " file " + file);
++                throw new RuntimeException("Invalid superblock: " + superBlock + " in " + file);
 +
 +            byte version = rawDataStream.readByte();
 +            if (!SUPPORTED_VERSIONS.contains(version))
-+                throw new RuntimeException("Invalid version: " + version + " file " + file);
++                throw new RuntimeException("Invalid version: " + version + " in " + file);
 +
 +            // Skip newestTimestamp (Long) + Compression level (Byte) + Chunk count (Short): Unused.
 +            rawDataStream.skipBytes(11);
@@ -204,7 +224,7 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +            int dataCount = rawDataStream.readInt();
 +            long fileLength = file.toFile().length();
 +            if (fileLength != HEADER_SIZE + dataCount + FOOTER_SIZE)
-+                throw new IOException("Invalid file length: " + this.regionFile + " " + fileLength + " " + (HEADER_SIZE + dataCount + FOOTER_SIZE));
++                throw new IOException("Invalid file length: " + this.path + " " + fileLength + " " + (HEADER_SIZE + dataCount + FOOTER_SIZE));
 +
 +            rawDataStream.skipBytes(8); // Skip data hash (Long): Unused.
 +
@@ -213,133 +233,124 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +
 +            superBlock = rawDataStream.readLong();
 +            if (superBlock != SUPERBLOCK)
-+                throw new IOException("Footer superblock invalid " + this.regionFile);
++                throw new IOException("Footer superblock invalid " + this.path);
 +
-+            DataInputStream dataStream = new DataInputStream(new ZstdInputStream(new ByteArrayInputStream(rawCompressed)));
++            try (DataInputStream dataStream = new DataInputStream(new ZstdInputStream(new ByteArrayInputStream(rawCompressed)))) {
 +
-+            int[] starts = new int[1024];
++                int[] starts = new int[1024];
-+            for(int i = 0; i < 1024; i++) {
++                for (int i = 0; i < 1024; i++) {
-+                starts[i] = dataStream.readInt();
++                    starts[i] = dataStream.readInt();
-+                dataStream.skipBytes(4); // Skip timestamps (Int): Unused.
++                    dataStream.skipBytes(4); // Skip timestamps (Int): Unused.
-+            }
-+
-+            for(int i = 0; i < 1024; i++) {
-+                if(starts[i] > 0) {
-+                    int size = starts[i];
-+                    byte[] b = new byte[size];
-+                    dataStream.readFully(b, 0, size);
-+
-+                    int maxCompressedLength = this.compressor.maxCompressedLength(size);
-+                    byte[] compressed = new byte[maxCompressedLength];
-+                    int compressedLength = this.compressor.compress(b, 0, size, compressed, 0, maxCompressedLength);
-+                    b = new byte[compressedLength];
-+                    System.arraycopy(compressed, 0, b, 0, compressedLength);
-+
-+                    this.buffer[i] = b;
-+                    this.bufferUncompressedSize[i] = size;
 +                }
-+            }
-+        }
-+        this.start();
-+    }
 +
-+    private synchronized void markToSave() {
++                for (int i = 0; i < 1024; i++) {
-+        synchronized(markedToSaveLock) {
++                    if (starts[i] > 0) {
-+            markedToSave = true;
++                        int size = starts[i];
-+        }
++                        byte[] b = new byte[size];
-+    }
++                        dataStream.readFully(b, 0, size);
 +
-+    private synchronized boolean isMarkedToSave() {
++                        int maxCompressedLength = this.compressor.maxCompressedLength(size);
-+        synchronized(markedToSaveLock) {
++                        byte[] compressed = new byte[maxCompressedLength];
-+            if(markedToSave) {
++                        int compressedLength = this.compressor.compress(b, 0, size, compressed, 0, maxCompressedLength);
-+                markedToSave = false;
++                        b = new byte[compressedLength];
-+                return true;
++                        System.arraycopy(compressed, 0, b, 0, compressedLength);
-+            }
-+            return false;
-+        }
-+    }
 +
-+    public void run() {
++                        this.buffer[i] = b;
-+        try {
++                        this.bufferUncompressedSize[i] = size;
-+            while(true) {
-+                if(markedToSave) {
-+                    try {
-+                        flush();
-+                    } catch(IOException ex) {
-+                        LOGGER.error("Region file " + this.regionFile.toAbsolutePath() + " flush failed");
 +                    }
 +                }
-+                for(int i = 0 ; i < 100 ; i++) {
-+                    Thread.sleep(100);
-+                    if(close) return;
-+                }
 +            }
-+        } catch(InterruptedException ignored) {}
++        }
 +    }
 +
-+    public synchronized boolean doesChunkExist(ChunkPos pos) throws Exception {
++    public Path getRegionFile() {
++        return this.path;
++    }
++
++    public ReentrantLock getFileLock() {
++        return this.fileLock;
++    }
++
++    public void flush() throws IOException {
++        if (isMarkedToSave()) flushWrapper(); // sync
++    }
++
++    private void markToSave() {
++        linearRegionFileFlusher.scheduleSave(this);
++        markedToSave.set(true);
++    }
++
++    public boolean isMarkedToSave() {
++        return markedToSave.getAndSet(false);
++    }
++
++    public void flushWrapper() {
++        try {
++            save();
++        } catch (IOException e) {
++            LOGGER.error("Failed to flush region file " + path.toAbsolutePath(), e);
++        }
++    }
++
++    public boolean doesChunkExist(ChunkPos pos) throws Exception {
 +        throw new Exception("doesChunkExist is a stub");
 +    }
 +
-+    public synchronized void flush() throws IOException {
++    private synchronized void save() throws IOException {
-+        if(!isMarkedToSave()) return;
-+
 +        long timestamp = getTimestamp();
 +        short chunkCount = 0;
 +
-+        File tempFile = new File(regionFile.toString() + ".tmp");
++        File tempFile = new File(path.toString() + ".tmp");
-+        FileOutputStream fileStream = new FileOutputStream(tempFile);
 +
-+        ByteArrayOutputStream zstdByteArray = new ByteArrayOutputStream();
++        try (FileOutputStream fileStream = new FileOutputStream(tempFile);
-+        ZstdOutputStream zstdStream = new ZstdOutputStream(zstdByteArray, this.compressionLevel);
++             ByteArrayOutputStream zstdByteArray = new ByteArrayOutputStream();
-+        zstdStream.setChecksum(true);
++             ZstdOutputStream zstdStream = new ZstdOutputStream(zstdByteArray, this.compressionLevel);
-+        DataOutputStream zstdDataStream = new DataOutputStream(zstdStream);
++             DataOutputStream zstdDataStream = new DataOutputStream(zstdStream);
-+        DataOutputStream dataStream = new DataOutputStream(fileStream);
++             DataOutputStream dataStream = new DataOutputStream(fileStream)) {
 +
-+        dataStream.writeLong(SUPERBLOCK);
++            dataStream.writeLong(SUPERBLOCK);
-+        dataStream.writeByte(VERSION);
++            dataStream.writeByte(VERSION);
-+        dataStream.writeLong(timestamp);
++            dataStream.writeLong(timestamp);
-+        dataStream.writeByte(this.compressionLevel);
++            dataStream.writeByte(this.compressionLevel);
 +
-+        ArrayList<byte[]> byteBuffers = new ArrayList<>();
++            ArrayList<byte[]> byteBuffers = new ArrayList<>();
-+        for(int i = 0; i < 1024; i++) {
++            for (int i = 0; i < 1024; i++) {
-+            if(this.bufferUncompressedSize[i] != 0) {
++                if (this.bufferUncompressedSize[i] != 0) {
-+                chunkCount += 1;
++                    chunkCount += 1;
-+                byte[] content = new byte[bufferUncompressedSize[i]];
++                    byte[] content = new byte[bufferUncompressedSize[i]];
-+                this.decompressor.decompress(buffer[i], 0, content, 0, bufferUncompressedSize[i]);
++                    this.decompressor.decompress(buffer[i], 0, content, 0, bufferUncompressedSize[i]);
 +
-+                byteBuffers.add(content);
++                    byteBuffers.add(content);
-+            } else byteBuffers.add(null);
++                } else byteBuffers.add(null);
++            }
++            for (int i = 0; i < 1024; i++) {
++                zstdDataStream.writeInt(this.bufferUncompressedSize[i]); // Write uncompressed size
++                zstdDataStream.writeInt(this.chunkTimestamps[i]); // Write timestamp
++            }
++            for (int i = 0; i < 1024; i++) {
++                if (byteBuffers.get(i) != null)
++                    zstdDataStream.write(byteBuffers.get(i), 0, byteBuffers.get(i).length);
++            }
++            zstdDataStream.close();
++
++            dataStream.writeShort(chunkCount);
++
++            byte[] compressed = zstdByteArray.toByteArray();
++
++            dataStream.writeInt(compressed.length);
++            dataStream.writeLong(0);
++
++            dataStream.write(compressed, 0, compressed.length);
++            dataStream.writeLong(SUPERBLOCK);
++
++            dataStream.flush();
++            fileStream.getFD().sync();
++            fileStream.getChannel().force(true); // Ensure atomicity on Btrfs
 +        }
-+        for(int i = 0; i < 1024; i++) {
++        Files.move(tempFile.toPath(), this.path, StandardCopyOption.REPLACE_EXISTING);
-+            zstdDataStream.writeInt(this.bufferUncompressedSize[i]); // Write uncompressed size
-+            zstdDataStream.writeInt(this.chunkTimestamps[i]); // Write timestamp
-+        }
-+        for(int i = 0; i < 1024; i++) {
-+            if(byteBuffers.get(i) != null)
-+                zstdDataStream.write(byteBuffers.get(i), 0, byteBuffers.get(i).length);
-+        }
-+        zstdDataStream.close();
-+
-+        dataStream.writeShort(chunkCount);
-+
-+        byte[] compressed = zstdByteArray.toByteArray();
-+
-+        dataStream.writeInt(compressed.length);
-+        dataStream.writeLong(0);
-+
-+        dataStream.write(compressed, 0, compressed.length);
-+        dataStream.writeLong(SUPERBLOCK);
-+
-+        dataStream.flush();
-+        fileStream.getFD().sync();
-+        fileStream.getChannel().force(true); // Ensure atomicity on Btrfs
-+        dataStream.close();
-+
-+        fileStream.close();
-+        Files.move(tempFile.toPath(), this.regionFile, StandardCopyOption.REPLACE_EXISTING);
 +    }
 +
++
 +    public void setStatus(int x, int z, ChunkStatus status) {
 +        this.statuses[getChunkIndex(x, z)] = status;
 +    }
@@ -360,7 +371,7 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +            this.chunkTimestamps[index] = getTimestamp();
 +            this.bufferUncompressedSize[getChunkIndex(pos.x, pos.z)] = uncompressedSize;
 +        } catch (IOException e) {
-+            LOGGER.error("Chunk write IOException " + e + " " + this.regionFile);
++            LOGGER.error("Chunk write IOException " + e + " " + this.path);
 +        }
 +        markToSave();
 +    }
@@ -370,7 +381,6 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +    }
 +
 +    private class ChunkBuffer extends ByteArrayOutputStream {
-+
 +        private final ChunkPos pos;
 +
 +        public ChunkBuffer(ChunkPos chunkcoordintpair) {
@@ -423,12 +433,9 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +    }
 +
 +    public void close() throws IOException {
-+        close = true;
++        if (closed) return;
-+        try {
++        closed = true;
-+            flush();
++        flush(); // sync
-+        } catch(IOException e) {
-+            throw new IOException("Region flush IOException " + e + " " + this.regionFile);
-+        }
 +    }
 +
 +    private static int getChunkIndex(int x, int z) {
@@ -446,13 +453,64 @@ index 0000000000000000000000000000000000000000..b7ce89429675bde7f037793305275f4b
 +    public void setOversized(int x, int z, boolean something) {}
 +
 +    public CompoundTag getOversizedData(int x, int z) throws IOException {
-+        throw new IOException("getOversizedData is a stub " + this.regionFile);
++        throw new IOException("getOversizedData is a stub " + this.path);
 +    }
 +
 +    public boolean isOversized(int x, int z) {
 +        return false;
 +    }
 +}
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/region/LinearRegionFileFlusher.java b/src/main/java/dev/kaiijumc/kaiiju/region/LinearRegionFileFlusher.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..a5731e37aa63004476dd6db67191d5be6ce480be
+--- /dev/null
++++ b/src/main/java/dev/kaiijumc/kaiiju/region/LinearRegionFileFlusher.java
+@@ -0,0 +1,45 @@
++package dev.kaiijumc.kaiiju.region;
++
++import com.google.common.util.concurrent.ThreadFactoryBuilder;
++import java.util.Queue;
++import java.util.concurrent.*;
++import dev.kaiijumc.kaiiju.KaiijuConfig;
++import org.bukkit.Bukkit;
++
++public class LinearRegionFileFlusher {
++    private final Queue<LinearRegionFile> savingQueue = new LinkedBlockingQueue<>();
++    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(
++        new ThreadFactoryBuilder()
++            .setNameFormat("linear-flush-scheduler")
++            .build()
++    );
++    private final ExecutorService executor = Executors.newFixedThreadPool(
++        KaiijuConfig.linearFlushThreads,
++        new ThreadFactoryBuilder()
++            .setNameFormat("linear-flusher-%d")
++            .build()
++    );
++
++    public LinearRegionFileFlusher() {
++        Bukkit.getLogger().info("Using " + KaiijuConfig.linearFlushThreads + " threads for linear region flushing.");
++        scheduler.scheduleAtFixedRate(this::pollAndFlush, 0L, KaiijuConfig.linearFlushFrequency, TimeUnit.SECONDS);
++    }
++
++    public void scheduleSave(LinearRegionFile regionFile) {
++        if (savingQueue.contains(regionFile)) return;
++        savingQueue.add(regionFile);
++    }
++
++    private void pollAndFlush() {
++        while (!savingQueue.isEmpty()) {
++            LinearRegionFile regionFile = savingQueue.poll();
++            if (!regionFile.closed && regionFile.isMarkedToSave())
++                executor.execute(regionFile::flushWrapper);
++        }
++    }
++
++    public void shutdown() {
++        executor.shutdown();
++        scheduler.shutdown();
++    }
++}
 diff --git a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java b/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
 index 8a11e10b01fa012b2f98b1c193c53251e848f909..61001e76b38f8647b33e73b5cc15b4b6785cf49a 100644
 --- a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
@@ -587,21 +645,21 @@ index 25fe439c8d1e88a86e85ac9a4761425d98ee6c4f..c4d28d887b4cc71dc713b1e3f46bc80f
          regionFile.setStatus(chunkPos.x, chunkPos.z, ChunkSerializer.getStatus(compound));
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 042ca6b3faae5249210567f2c26dff404974e1ff..7099a44a2322ab390c21e74668c8657dcc9e5e87 100644
+index cf8f93734121e5c1959959f0ba13ee4e6db31959..e6e985e8e2c7cccb2c3395ae3fbc30072e1d48f0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -426,8 +426,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -453,8 +453,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private static final class EntityRegionFileStorage extends net.minecraft.world.level.chunk.storage.RegionFileStorage {
  
 -        public EntityRegionFileStorage(Path directory, boolean dsync) {
 -            super(directory, dsync);
-+        public EntityRegionFileStorage(String format, int linearCompression, Path directory, boolean dsync) { // Kaiiju
++        public EntityRegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path directory, boolean dsync) { // Kaiiju
 +            super(format, linearCompression, directory, dsync); // Kaiiju
          }
  
          protected void write(ChunkPos pos, net.minecraft.nbt.CompoundTag nbt) throws IOException {
-@@ -666,7 +666,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -693,7 +693,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // CraftBukkit end
          boolean flag2 = minecraftserver.forceSynchronousWrites();
          DataFixer datafixer = minecraftserver.getFixerUpper();
@@ -754,7 +812,7 @@ index dcfe090c269d4cbcc2eb1b6f85392848bb34656c..d42c320179ae055b8675d1ce6ce1788e
          try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) {
              return NbtIo.read((java.io.DataInput) out);
 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 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823f4b63a3a 100644
+index 81554c321a78258ff78da3801f00d0fb90b9e113..e91e8aef8b63ea9d94e0ecb3e4a62655a8c77ce1 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
 @@ -22,9 +22,13 @@ public class RegionFileStorage implements AutoCloseable {
@@ -836,7 +894,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
              }
              // Paper end
              return regionfile;
-@@ -126,28 +134,49 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -126,28 +134,45 @@ public class RegionFileStorage implements AutoCloseable {
              }
              // Paper end - cache regionfile does not exist state
              if (this.regionCache.size() >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.regionFileCacheSize) { // Paper - configurable
@@ -874,10 +932,6 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
 +                // Kaiiju end
                  this.createRegionFile(regionPos);
              }
-+            // Kaiiju start - Polyglot
-+            if (dev.kaiijumc.kaiiju.KaiijuConfig.regionFormatDebug)
-+                org.bukkit.Bukkit.getLogger().info("Opening file " + path1 + " with format " + this.format + " (existingOnly = " + existingOnly + ")");
-+            // Kaiiju end
 +
              // Paper end - cache regionfile does not exist state
              FileUtil.createDirectoriesSafe(this.folder); // Paper - only create directory if not existing only - moved from above
@@ -893,7 +947,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
              }
              // Paper end
              return regionfile1;
-@@ -175,7 +204,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -175,7 +200,7 @@ public class RegionFileStorage implements AutoCloseable {
      }
  
  
@@ -902,7 +956,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
          synchronized (regionfile) {
              try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
                  CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
-@@ -222,14 +251,14 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -222,14 +247,14 @@ public class RegionFileStorage implements AutoCloseable {
      @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
@@ -919,7 +973,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
          // We add the regionfile parameter to avoid the potential deadlock (on fileLock) if we went back to obtain a regionfile
          // if we decide to re-read
          // Paper end
-@@ -239,7 +268,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -239,7 +264,7 @@ public class RegionFileStorage implements AutoCloseable {
  
          // Paper start
          if (regionfile.isOversized(pos.x, pos.z)) {
@@ -928,7 +982,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
              return readOversizedChunk(regionfile, pos);
          }
          // Paper end
-@@ -253,12 +282,12 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -253,12 +278,12 @@ public class RegionFileStorage implements AutoCloseable {
                      if (this.isChunkData) {
                          ChunkPos chunkPos = ChunkSerializer.getChunkCoordinate(nbttagcompound);
                          if (!chunkPos.equals(pos)) {
@@ -944,7 +998,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
                              return null;
                          }
                      }
-@@ -292,13 +321,13 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -292,13 +317,13 @@ public class RegionFileStorage implements AutoCloseable {
  
          return nbttagcompound;
          } finally { // Paper start
@@ -960,7 +1014,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
          if (regionfile == null) {
              return;
          }
-@@ -328,7 +357,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -328,7 +353,7 @@ public class RegionFileStorage implements AutoCloseable {
      }
  
      protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException {
@@ -969,7 +1023,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
          if (nbt == null && regionfile == null) {
              return;
          }
-@@ -378,7 +407,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -378,7 +403,7 @@ public class RegionFileStorage implements AutoCloseable {
          }
          // Paper end
          } finally { // Paper start
@@ -978,7 +1032,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
          } // Paper end
      }
  
-@@ -387,7 +416,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -387,7 +412,7 @@ public class RegionFileStorage implements AutoCloseable {
          ObjectIterator objectiterator = this.regionCache.values().iterator();
  
          while (objectiterator.hasNext()) {
@@ -987,7 +1041,7 @@ index 81554c321a78258ff78da3801f00d0fb90b9e113..b35a6a7daf768af3bc453fe18deec823
  
              try {
                  regionfile.close();
-@@ -403,7 +432,7 @@ public class RegionFileStorage implements AutoCloseable {
+@@ -403,7 +428,7 @@ public class RegionFileStorage implements AutoCloseable {
          ObjectIterator objectiterator = this.regionCache.values().iterator();
  
          while (objectiterator.hasNext()) {

patches/server/0005-Network-configuration.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Network configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index b86c90cc3601e666998cfa12f44515f605bb53eb..7c6d43d8a360530344ef296f4477750c8a298607 100644
+index b7f43cce80742aa0cd523e930772ff84946f3eef..fa829cef4033625470dfae29ddf777e6c5ab8c55 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -198,4 +198,7 @@ public class KaiijuConfig {
+@@ -203,4 +203,7 @@ public class KaiijuConfig {
-     private static void regionFormatSettings() {
+         else
-         regionFormatDebug = getBoolean("region-format.debug", regionFormatDebug);
+             linearFlushThreads = Math.max(linearFlushThreads, 1);
      }
 +
 +    private static void networkSettings() {

patches/server/0006-Send-null-entity-packets.patch

@@ -6,12 +6,12 @@ Subject: [PATCH] Send null entity packets
 This is from Purpur. Don't send null entity packets.
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 7c6d43d8a360530344ef296f4477750c8a298607..ab08e11f13921163b8ff1ff51ff9e9b86d2b47c7 100644
+index fa829cef4033625470dfae29ddf777e6c5ab8c55..47e23a196ae5e44600a64184b69141c00235baca 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -198,7 +198,10 @@ public class KaiijuConfig {
+@@ -203,7 +203,10 @@ public class KaiijuConfig {
-     private static void regionFormatSettings() {
+         else
-         regionFormatDebug = getBoolean("region-format.debug", regionFormatDebug);
+             linearFlushThreads = Math.max(linearFlushThreads, 1);
      }
 +    
 +    public static boolean sendNullEntityPackets = true;
@@ -21,7 +21,7 @@ index 7c6d43d8a360530344ef296f4477750c8a298607..ab08e11f13921163b8ff1ff51ff9e9b8
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 6670e657e08e130f7e0368f418379fd1ece00cdf..5558d87ef182f82be7877455dd027082c6a80632 100644
+index 81d0b2933040a451441f660f9e46199ae3b111e3..cdbc4be679d7e096c1005eaf84b74c4877479c43 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -201,6 +201,11 @@ public class ServerEntity {

patches/server/0007-Alternate-Keepalive.patch

@@ -7,10 +7,10 @@ Don't kick players because 1 keepalive is lost.
 This patch is from Purpur.
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index ab08e11f13921163b8ff1ff51ff9e9b86d2b47c7..b42a3466f145a92608c8746fd4beb529b4a60b01 100644
+index 47e23a196ae5e44600a64184b69141c00235baca..95b53b50606ea0ad47f407bebbb9e2bd445c0e66 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -200,8 +200,10 @@ public class KaiijuConfig {
+@@ -205,8 +205,10 @@ public class KaiijuConfig {
      }
      
      public static boolean sendNullEntityPackets = true;

patches/server/0008-Optimization-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Optimization Configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index b42a3466f145a92608c8746fd4beb529b4a60b01..7b56cc1275319cf07a4a25280e0ff900bdca8afa 100644
+index 95b53b50606ea0ad47f407bebbb9e2bd445c0e66..8aab072a21b0775338b8235a84f5f675f385cf37 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -206,4 +206,7 @@ public class KaiijuConfig {
+@@ -211,4 +211,7 @@ public class KaiijuConfig {
          sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets);
          alternateKeepAlive = getBoolean("network.alternate-keepalive", alternateKeepAlive);
      }

patches/server/0009-Gameplay-Configuration.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Gameplay Configuration
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 7b56cc1275319cf07a4a25280e0ff900bdca8afa..fdc4cdbf34ed10f6523dceac7c1931d3ca4eb522 100644
+index 8aab072a21b0775338b8235a84f5f675f385cf37..46ae5b84ee5b87b0ed0b93e920689e44288a50d2 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -209,4 +209,7 @@ public class KaiijuConfig {
+@@ -214,4 +214,7 @@ public class KaiijuConfig {
  
      private static void optimizationSettings() {
      }

patches/server/0011-Server-mod-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Server mod name
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index fdc4cdbf34ed10f6523dceac7c1931d3ca4eb522..e1f50adfa216320bc53b460d11666064cb58c969 100644
+index 46ae5b84ee5b87b0ed0b93e920689e44288a50d2..778de435ca3c13ccc2f2d86030e3529436a2d945 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -210,6 +210,9 @@ public class KaiijuConfig {
+@@ -215,6 +215,9 @@ public class KaiijuConfig {
      private static void optimizationSettings() {
      }
  
@@ -19,7 +19,7 @@ index fdc4cdbf34ed10f6523dceac7c1931d3ca4eb522..e1f50adfa216320bc53b460d11666064
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 06233380f7580726753de34c1fb23d6347c9ac94..1b3f895b51b634ee9cf69cdbbfd7a1e600de16f0 100644
+index bc9204d2c925437e9ff5c5d62d9faf38c2938e48..5168d16b7e9ed08bdedd0e386f9671a63b6859be 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1812,7 +1812,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0012-Crash-on-broken-symlink.patch

@@ -42,7 +42,7 @@ index abf5e2a06af9853b58ac9107cd6e9787c4185c66..389c68c0becd2f69dc1004d0b383f1a8
          long expectedChunks = (long)regionFiles.length * (32L * 32L);
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 61c6bc2859235874aefac71e9e55162f0a89f29f..24bd63c596c9f61f1e89ec5b001b7cb7a29a09ff 100644
+index c4d28d887b4cc71dc713b1e3f46bc80f4484a95d..f50507ab85282d261985ce9b186581f5a7a50f79 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -269,7 +269,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -64,21 +64,21 @@ index 61c6bc2859235874aefac71e9e55162f0a89f29f..24bd63c596c9f61f1e89ec5b001b7cb7
          // Paper start
          this.dataRegionManager = new io.papermc.paper.chunk.SingleThreadChunkRegionManager(this.level, 2, (1.0 / 3.0), 1, 6, "Data", DataRegionData::new, DataRegionSectionData::new);
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 4774d3f357d62b0818b4713f8085d05be09eaa5c..1bbd8b475cdc57fb15ca05ffe122220a5539da10 100644
+index e6e985e8e2c7cccb2c3395ae3fbc30072e1d48f0..ad896c8a3060f5c8d85a8b5707317de646bf9cae 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -426,8 +426,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -453,8 +453,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
  
      private static final class EntityRegionFileStorage extends net.minecraft.world.level.chunk.storage.RegionFileStorage {
  
--        public EntityRegionFileStorage(String format, int linearCompression, Path directory, boolean dsync) { // Kaiiju
+-        public EntityRegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, Path directory, boolean dsync) { // Kaiiju
 -            super(format, linearCompression, directory, dsync); // Kaiiju
 +        public EntityRegionFileStorage(dev.kaiijumc.kaiiju.region.RegionFileFormat format, int linearCompression, boolean linearCrashOnBrokenSymlink, Path directory, boolean dsync) { // Kaiiju
 +            super(format, linearCompression, linearCrashOnBrokenSymlink, directory, dsync); // Kaiiju
          }
  
          protected void write(ChunkPos pos, net.minecraft.nbt.CompoundTag nbt) throws IOException {
-@@ -666,7 +666,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -693,7 +693,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          // CraftBukkit end
          boolean flag2 = minecraftserver.forceSynchronousWrites();
          DataFixer datafixer = minecraftserver.getFixerUpper();
@@ -135,7 +135,7 @@ index 1d880f27dd147da683fc30ed6f1bfa43ecdb7d93..41598adf6d49a44bcaadfff379722146
      }
  
 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 b35a6a7daf768af3bc453fe18deec823f4b63a3a..8409293b3f329715d6dff3d455c6a484d5b133ee 100644
+index e91e8aef8b63ea9d94e0ecb3e4a62655a8c77ce1..bbc6a0c70cbafbfa411ab418e4fec11ad101ae91 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
 @@ -20,6 +20,7 @@ import net.minecraft.world.level.ChunkPos;
@@ -209,7 +209,7 @@ index b35a6a7daf768af3bc453fe18deec823f4b63a3a..8409293b3f329715d6dff3d455c6a484
 +                guardAgainstBrokenSymlinks(path1); // Kaiiju - Crash on broken symlink
                  this.createRegionFile(regionPos);
              }
-             // Kaiiju start - Polyglot
+ 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java
 index 9394d191c56aab78e63fd3f283efedd69384e323..dcfe4a285cc5865be3b0c1b8104b722895135dd0 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java

patches/server/0013-Toggle-void-trading.patch

@@ -22,10 +22,10 @@ index f3f824d0ab1a2a72825c40b67192386479a0b34c..95ed6cb7b94797187d1011cab344e187
      }
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 1bbd8b475cdc57fb15ca05ffe122220a5539da10..7f39e36037d55278d15399196459e51b885c5d1e 100644
+index ad896c8a3060f5c8d85a8b5707317de646bf9cae..0df4672abb5e87587da8712b6febf6312e241cda 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2838,7 +2838,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2865,7 +2865,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start

patches/server/0015-Toggle-tick-level-when-empty.patch

@@ -22,10 +22,10 @@ index 6d7356cc07da58b1cef8d8963e790251d765de2c..601b9867d839f4928ba993ee8f00df9c
  
      public boolean fixVoidTrading = true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7f39e36037d55278d15399196459e51b885c5d1e..66509fa23bfcde70abd3917eb774cf48d5d6da93 100644
+index 0df4672abb5e87587da8712b6febf6312e241cda..1818c5ae88c331fb900470436f72049165c9e9f4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -798,7 +798,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -825,7 +825,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
          timings.doSounds.stopTiming(); // Spigot
          regionizedWorldData.setHandlingTick(false); // Folia - regionised ticking
          gameprofilerfiller.pop();

patches/server/0019-Toggle-shared-random-for-players.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle shared random for players
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index e1f50adfa216320bc53b460d11666064cb58c969..c934341c17caf4696065ac6c39bdfef570c62f13 100644
+index 778de435ca3c13ccc2f2d86030e3529436a2d945..cac747a46cccf8b115917a72340e9b81e7a437c9 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -211,8 +211,10 @@ public class KaiijuConfig {
+@@ -216,8 +216,10 @@ public class KaiijuConfig {
      }
  
      public static String serverModName = "Kaiiju";
@@ -20,7 +20,7 @@ index e1f50adfa216320bc53b460d11666064cb58c969..c934341c17caf4696065ac6c39bdfef5
      }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 27b57db24587337ccdce29e492052ca419863323..fc6279a39fd5e1bd02b2d9e77f451cd9ba1baf78 100644
+index ee15661227754149164893d6acf678d13b2e1b27..0c50b516d0ff1c2812a877b57148f01861f8027f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -566,6 +566,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch

@@ -319,10 +319,10 @@ index 991e4c19763a34a6fead88363e007c2d11aad836..24a2d3f496727790f63cb66a2534d442
          dev.kaiijumc.kaiiju.KaiijuConfig.registerCommands();
          // Kaiiju end
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 245c3e63588379f51780963ba91bc6bf0a3feda6..761019f86983daaea4fface519e052f8fb6de1cd 100644
+index 1818c5ae88c331fb900470436f72049165c9e9f4..7115a481bc8805333aa36af334132f98da9d8742 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -822,6 +822,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -849,6 +849,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                  } // Folia end - region threading
              }
  
@@ -330,21 +330,21 @@ index 245c3e63588379f51780963ba91bc6bf0a3feda6..761019f86983daaea4fface519e052f8
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
              timings.entityTick.startTiming(); // Spigot
              regionizedWorldData.forEachTickingEntity((entity) -> { // Folia - regionised ticking
-@@ -844,6 +845,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -871,6 +872,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
                                  entity.stopRiding();
                              }
  
 +                            // Kaiiju start
 +                            if (kaiijuConfig.enableEntityThrottling) {
 +                                dev.kaiijumc.kaiiju.KaiijuEntityThrottler.EntityThrottlerReturn throttle = regionizedWorldData.entityThrottler.tickLimiterShouldSkip(entity);
-+                                if (throttle.remove) entity.remove(Entity.RemovalReason.DISCARDED);
++                                if (throttle.remove && !entity.hasCustomName()) entity.remove(Entity.RemovalReason.DISCARDED);
 +                                if (throttle.skip) return;
 +                            }
 +                            // Kaiiju end
                              gameprofilerfiller.push("tick");
                              this.guardEntityTick(this::tickNonPassenger, entity);
                              gameprofilerfiller.pop();
-@@ -851,6 +859,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -878,6 +886,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
                      }
                  }
              });

patches/server/0025-Vanilla-end-portal-teleportation.patch

@@ -5,12 +5,15 @@ Subject: [PATCH] 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 b971f35b69a930dddcf603207f524dc95e09f0fd..135573308662845ecc73fde1c620345e1f372538 100644
+index b971f35b69a930dddcf603207f524dc95e09f0fd..03895d35c02ff9422aaa0177eb0aa40e03fdc925 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4031,10 +4031,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4029,12 +4029,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+                         targetPos, 16, // load 16 blocks to be safe from block physics
+                         ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH,
                          (chunks) -> {
-                             ServerLevel.makeObsidianPlatform(destination, null, targetPos);
+-                            ServerLevel.makeObsidianPlatform(destination, null, targetPos);
++                            //ServerLevel.makeObsidianPlatform(destination, null, targetPos); // Kaiiju - Vanilla end teleportation - moved down
  
 +                            // Kaiiju start - Vanilla end teleportation
 +                            Vec3 finalPos;
@@ -25,3 +28,23 @@ index b971f35b69a930dddcf603207f524dc95e09f0fd..135573308662845ecc73fde1c620345e
                              );
                          }
                      );
+@@ -4221,6 +4226,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+         if (!this.canPortalAsync(takePassengers)) {
+             return false;
+         }
++        // Kaiiju start - sync end platform spawning & entity teleportation
++        final java.util.function.Consumer<Entity> tpComplete = type == PortalType.END && destination.getTypeKey() == LevelStem.END ?
++              e -> ServerLevel.makeObsidianPlatform(destination, null, ServerLevel.END_SPAWN_POINT) : teleportComplete;
++        // Kaiiju end
+ 
+         Vec3 initialPosition = this.position();
+         ChunkPos initialPositionChunk = new ChunkPos(
+@@ -4279,7 +4288,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+             // place
+             passengerTree.root.placeInAsync(
+                 originWorld, destination, Entity.TELEPORT_FLAG_LOAD_CHUNK | (takePassengers ? Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS : 0L),
+-                passengerTree, teleportComplete
++                passengerTree, tpComplete // Kaiiju - vanilla end teleportation
+             );
+         });
+ 

patches/server/0031-Option-to-disable-vanish-api.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable vanish api
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index c934341c17caf4696065ac6c39bdfef570c62f13..f49510c999ce5241f26dc9ba90a6148bf31467c7 100644
+index cac747a46cccf8b115917a72340e9b81e7a437c9..a3c15f1009dad095b9411242e2d0347a6141984b 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -207,7 +207,10 @@ public class KaiijuConfig {
+@@ -212,7 +212,10 @@ public class KaiijuConfig {
          alternateKeepAlive = getBoolean("network.alternate-keepalive", alternateKeepAlive);
      }
  

patches/server/0032-Option-to-disable-player-stats.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable player stats
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index f49510c999ce5241f26dc9ba90a6148bf31467c7..b23f2df433d7ebc871f4009081c28ed9054d91c7 100644
+index a3c15f1009dad095b9411242e2d0347a6141984b..8c872b2ad341f0105275209201fda03706535161 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -208,9 +208,11 @@ public class KaiijuConfig {
+@@ -213,9 +213,11 @@ public class KaiijuConfig {
      }
  
      public static boolean disableVanishApi = false;
@@ -21,10 +21,10 @@ index f49510c999ce5241f26dc9ba90a6148bf31467c7..b23f2df433d7ebc871f4009081c28ed9
  
      public static String serverModName = "Kaiiju";
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 817f79bfca1aec161cb4635b9c7a8e21b14db7eb..bba90683202b47284208416a37724e9d54266ffa 100644
+index c0ad878cd29e2f72b7899d9539031b15ccbf6193..53f5bf8e6660f25290d4e64aca9c2911921b9fed 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2081,6 +2081,7 @@ public class ServerPlayer extends Player {
+@@ -2138,6 +2138,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void awardStat(Stat<?> stat, int amount) {

patches/server/0033-Option-to-disable-achievements.patch

@@ -24,10 +24,10 @@ index 9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7..31d66bb2fcf4bb7262df2d8006e307fe
  
      public boolean fixVoidTrading = true;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67ebac5561 100644
+index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42597d0816 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -734,7 +734,7 @@ public class ServerPlayer extends Player {
+@@ -792,7 +792,7 @@ public class ServerPlayer extends Player {
  
      @Override
      protected void onInsideBlock(BlockState state) {
@@ -36,7 +36,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
      }
  
      @Override
-@@ -781,9 +781,9 @@ public class ServerPlayer extends Player {
+@@ -839,9 +839,9 @@ public class ServerPlayer extends Player {
              }
          }
  
@@ -48,7 +48,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
          }
  
          this.trackStartFallingPosition();
-@@ -858,7 +858,7 @@ public class ServerPlayer extends Player {
+@@ -916,7 +916,7 @@ public class ServerPlayer extends Player {
              }
  
              if (this.tickCount % 20 == 0) {
@@ -57,7 +57,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
              }
  
              // CraftBukkit start - initialize oldLevel, fire PlayerLevelChangeEvent, and tick client-sided world border
-@@ -887,7 +887,7 @@ public class ServerPlayer extends Player {
+@@ -945,7 +945,7 @@ public class ServerPlayer extends Player {
      @Override
      public void resetFallDistance() {
          if (this.getHealth() > 0.0F && this.startingToFallPosition != null) {
@@ -66,7 +66,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
          }
  
          this.startingToFallPosition = null;
-@@ -906,7 +906,7 @@ public class ServerPlayer extends Player {
+@@ -964,7 +964,7 @@ public class ServerPlayer extends Player {
              if (this.enteredLavaOnVehiclePosition == null) {
                  this.enteredLavaOnVehiclePosition = this.position();
              } else {
@@ -75,7 +75,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
              }
          }
  
-@@ -1110,7 +1110,7 @@ public class ServerPlayer extends Player {
+@@ -1168,7 +1168,7 @@ public class ServerPlayer extends Player {
  
              this.handleTeamKill(s, s1, ObjectiveCriteria.TEAM_KILL);
              this.handleTeamKill(s1, s, ObjectiveCriteria.KILLED_BY_TEAM);
@@ -84,7 +84,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
          }
      }
  
-@@ -1228,7 +1228,7 @@ public class ServerPlayer extends Player {
+@@ -1286,7 +1286,7 @@ public class ServerPlayer extends Player {
          this.wonGame = false;
  
          this.respawn((player) -> {
@@ -93,7 +93,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
          }, true);
      }
  
-@@ -1730,14 +1730,14 @@ public class ServerPlayer extends Player {
+@@ -1787,14 +1787,14 @@ public class ServerPlayer extends Player {
              maindimensionkey1 = resourcekey1;
          }
          // Paper end
@@ -111,7 +111,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
          }
  
          if (maindimensionkey1 != Level.NETHER) { // CraftBukkit
-@@ -1815,7 +1815,7 @@ public class ServerPlayer extends Player {
+@@ -1872,7 +1872,7 @@ public class ServerPlayer extends Player {
                  {
                      Either<Player.BedSleepingProblem, Unit> either = super.startSleepInBed(blockposition, force).ifRight((unit) -> {
                          this.awardStat(Stats.SLEEP_IN_BED);
@@ -120,7 +120,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
                      });
  
                      if (!this.serverLevel().canSleepThroughNights()) {
-@@ -2101,7 +2101,7 @@ public class ServerPlayer extends Player {
+@@ -2158,7 +2158,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void triggerRecipeCrafted(Recipe<?> recipe, List<ItemStack> ingredients) {
@@ -129,7 +129,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
      }
  
      @Override
-@@ -2230,14 +2230,14 @@ public class ServerPlayer extends Player {
+@@ -2287,14 +2287,14 @@ public class ServerPlayer extends Player {
              this.levitationStartPos = this.position();
          }
  
@@ -146,7 +146,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
      }
  
      @Override
-@@ -2248,7 +2248,7 @@ public class ServerPlayer extends Player {
+@@ -2305,7 +2305,7 @@ public class ServerPlayer extends Player {
              this.levitationStartPos = null;
          }
  
@@ -155,7 +155,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
      }
  
      @Override
-@@ -2808,7 +2808,7 @@ public class ServerPlayer extends Player {
+@@ -2865,7 +2865,7 @@ public class ServerPlayer extends Player {
  
      @Override
      protected void updateUsingItem(ItemStack stack) {
@@ -164,7 +164,7 @@ index bba90683202b47284208416a37724e9d54266ffa..6bbbd7d4a409140df65f52f36e413c67
          super.updateUsingItem(stack);
      }
  
-@@ -2837,7 +2837,7 @@ public class ServerPlayer extends Player {
+@@ -2894,7 +2894,7 @@ public class ServerPlayer extends Player {
          Entity entity = item.getOwner();
  
          if (entity != null) {

patches/server/0034-Option-to-disable-arm-swing-event.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable arm swing event
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index b23f2df433d7ebc871f4009081c28ed9054d91c7..ec71f3f52cb8f7931aabd94619d2e7a24491d7ad 100644
+index 8c872b2ad341f0105275209201fda03706535161..9b118a6e22264c88c0460016822b1920631fff85 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -209,10 +209,12 @@ public class KaiijuConfig {
+@@ -214,10 +214,12 @@ public class KaiijuConfig {
  
      public static boolean disableVanishApi = false;
      public static boolean disablePlayerStats = false;

patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable ensure tick thread checks
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index ec71f3f52cb8f7931aabd94619d2e7a24491d7ad..fa2a763e5784e7dae02c94a13751cbf746b6eee8 100644
+index 9b118a6e22264c88c0460016822b1920631fff85..95015955a8076bc903c012704b57b1b84286aaae 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -210,11 +210,13 @@ public class KaiijuConfig {
+@@ -215,11 +215,13 @@ public class KaiijuConfig {
      public static boolean disableVanishApi = false;
      public static boolean disablePlayerStats = false;
      public static boolean disableArmSwingEvent = false;

patches/server/0038-Don-t-kick-player-on-bad-packet.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Don't kick player on bad packet
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index fa2a763e5784e7dae02c94a13751cbf746b6eee8..ebfa9e1dcca5ea8272e796f0409902d92b59ee76 100644
+index 95015955a8076bc903c012704b57b1b84286aaae..6df1720159383c2f536b40ded1092a437c1a20af 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -201,10 +201,12 @@ public class KaiijuConfig {
+@@ -206,10 +206,12 @@ public class KaiijuConfig {
      
      public static boolean sendNullEntityPackets = true;
      public static boolean alternateKeepAlive = false;

patches/server/0044-Improve-container-checking-with-a-bitset.patch

@@ -0,0 +1,458 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Paul Sauve <paul@technove.co>
+Date: Tue, 1 Aug 2023 03:38:09 +0200
+Subject: [PATCH] Improve container checking with a bitset
+
+
+diff --git a/src/main/java/dev/kaiijumc/kaiiju/structs/ItemListWithBitset.java b/src/main/java/dev/kaiijumc/kaiiju/structs/ItemListWithBitset.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ee32b7c4a1ae1e23149694ecba5ab7bd347d6ca6
+--- /dev/null
++++ b/src/main/java/dev/kaiijumc/kaiiju/structs/ItemListWithBitset.java
+@@ -0,0 +1,114 @@
++package dev.kaiijumc.kaiiju.structs;
++
++
++import net.minecraft.core.NonNullList;
++import net.minecraft.world.item.ItemStack;
++import org.apache.commons.lang.Validate;
++import org.jetbrains.annotations.NotNull;
++
++import java.util.AbstractList;
++import java.util.Arrays;
++import java.util.List;
++
++public class ItemListWithBitset extends AbstractList<ItemStack> {
++    public static ItemListWithBitset fromList(List<ItemStack> list) {
++        if (list instanceof ItemListWithBitset ours) {
++            return ours;
++        }
++        return new ItemListWithBitset(list);
++    }
++
++    private static ItemStack[] createArray(int size) {
++        ItemStack[] array = new ItemStack[size];
++        Arrays.fill(array, ItemStack.EMPTY);
++        return array;
++    }
++
++    private final ItemStack[] items;
++
++    private long bitSet = 0;
++    private final long allBits;
++
++    private static class OurNonNullList extends NonNullList<ItemStack> {
++        protected OurNonNullList(List<ItemStack> delegate) {
++            super(delegate, ItemStack.EMPTY);
++        }
++    }
++
++    public final NonNullList<ItemStack> nonNullList = new OurNonNullList(this);
++
++    private ItemListWithBitset(List<ItemStack> list) {
++        this(list.size());
++
++        for (int i = 0; i < list.size(); i++) {
++            this.set(i, list.get(i));
++        }
++    }
++
++    public ItemListWithBitset(int size) {
++        Validate.isTrue(size < Long.BYTES * 8, "size is too large");
++
++        this.items = createArray(size);
++        this.allBits = ((1L << size) - 1);
++    }
++
++    public boolean isCompletelyEmpty() {
++        return this.bitSet == 0;
++    }
++
++    public boolean hasFullStacks() {
++        return (this.bitSet & this.allBits) == allBits;
++    }
++
++    @Override
++    public ItemStack set(int index, @NotNull ItemStack itemStack) {
++        ItemStack existing = this.items[index];
++
++        this.items[index] = itemStack;
++
++        if (itemStack == ItemStack.EMPTY) {
++            this.bitSet &= ~(1L << index);
++        } else {
++            this.bitSet |= 1L << index;
++        }
++
++        return existing;
++    }
++
++    @NotNull
++    @Override
++    public ItemStack get(int var0) {
++        return this.items[var0];
++    }
++
++    @Override
++    public int size() {
++        return this.items.length;
++    }
++
++    @Override
++    public void clear() {
++        Arrays.fill(this.items, ItemStack.EMPTY);
++    }
++
++    // these are unsupported for block inventories which have a static size
++    @Override
++    public void add(int var0, ItemStack var1) {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public ItemStack remove(int var0) {
++        throw new UnsupportedOperationException();
++    }
++
++    @Override
++    public String toString() {
++        return "ItemListWithBitset{" +
++          "items=" + Arrays.toString(items) +
++          ", bitSet=" + Long.toString(bitSet, 2) +
++          ", allBits=" + Long.toString(allBits, 2) +
++          ", size=" + this.items.length +
++          '}';
++    }
++}
+diff --git a/src/main/java/net/minecraft/world/CompoundContainer.java b/src/main/java/net/minecraft/world/CompoundContainer.java
+index 241fec02e6869c638d3a160819b32173a081467b..62848ca68f532fa14241320df76d180c13072c34 100644
+--- a/src/main/java/net/minecraft/world/CompoundContainer.java
++++ b/src/main/java/net/minecraft/world/CompoundContainer.java
+@@ -64,6 +64,23 @@ public class CompoundContainer implements Container {
+         this.container2 = second;
+     }
+ 
++    // Kaiiju start - airplane - improve container checking with a bitset
++    @Override
++   public boolean hasEmptySlot(net.minecraft.core.Direction enumdirection) {
++        return this.container1.hasEmptySlot(null) || this.container2.hasEmptySlot(null);
++    }
++
++    @Override
++   public boolean isCompletelyFull(net.minecraft.core.Direction enumdirection) {
++        return this.container1.isCompletelyFull(null) && this.container2.isCompletelyFull(null);
++    }
++
++    @Override
++    public boolean isCompletelyEmpty(net.minecraft.core.Direction enumdirection) {
++        return this.container1.isCompletelyEmpty(null) && this.container2.isCompletelyEmpty(null);
++    }
++    // Kaiiju end
++
+     @Override
+     public int getContainerSize() {
+         return this.container1.getContainerSize() + this.container2.getContainerSize();
+diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
+index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..ac1e21a4fc210424ea57c247d03914c54129de9c 100644
+--- a/src/main/java/net/minecraft/world/Container.java
++++ b/src/main/java/net/minecraft/world/Container.java
+@@ -13,6 +13,63 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+ // CraftBukkit end
+ 
+ public interface Container extends Clearable {
++    // Kaiiju start - airplane - allow the inventory to override and optimize these frequent calls
++    default boolean hasEmptySlot(@org.jetbrains.annotations.Nullable net.minecraft.core.Direction enumdirection) { // there is a slot with 0 items in it
++        if (this instanceof WorldlyContainer worldlyContainer) {
++            for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
++                if (this.getItem(i).isEmpty()) {
++                    return true;
++                }
++            }
++        } else {
++            int size = this.getContainerSize();
++            for (int i = 0; i < size; i++) {
++                if (this.getItem(i).isEmpty()) {
++                    return true;
++                }
++            }
++        }
++        return false;
++    }
++
++    default boolean isCompletelyFull(@org.jetbrains.annotations.Nullable net.minecraft.core.Direction enumdirection) { // every stack is maxed
++        if (this instanceof WorldlyContainer worldlyContainer) {
++            for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
++                ItemStack itemStack = this.getItem(i);
++                if (itemStack.getCount() < itemStack.getMaxStackSize()) {
++                    return false;
++                }
++            }
++        } else {
++            int size = this.getContainerSize();
++            for (int i = 0; i < size; i++) {
++                ItemStack itemStack = this.getItem(i);
++                if (itemStack.getCount() < itemStack.getMaxStackSize()) {
++                    return false;
++                }
++            }
++        }
++        return true;
++    }
++
++    default boolean isCompletelyEmpty(@org.jetbrains.annotations.Nullable net.minecraft.core.Direction enumdirection) {
++        if (this instanceof WorldlyContainer worldlyContainer) {
++            for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
++                if (!this.getItem(i).isEmpty()) {
++                    return false;
++                }
++            }
++        } else {
++            int size = this.getContainerSize();
++            for (int i = 0; i < size; i++) {
++                if (!this.getItem(i).isEmpty()) {
++                    return false;
++                }
++            }
++        }
++        return true;
++    }
++    // Kaiiju end
+ 
+     int LARGE_MAX_STACK_SIZE = 64;
+     int DEFAULT_DISTANCE_LIMIT = 8;
+diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+index 272095d7a09ab41227d741172735f66fd2798ce1..1f2e2d7726abd63bb46697697c91696387c819a2 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+@@ -28,6 +28,7 @@ import org.bukkit.inventory.InventoryHolder;
+ public abstract class AbstractMinecartContainer extends AbstractMinecart implements ContainerEntity {
+ 
+     private NonNullList<ItemStack> itemStacks;
++    private dev.kaiijumc.kaiiju.structs.ItemListWithBitset itemStacksOptimized; // Kaiiju - airplane - implement ItemListWithBitset
+     @Nullable
+     public ResourceLocation lootTable;
+     public long lootTableSeed;
+@@ -89,12 +90,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+ 
+     protected AbstractMinecartContainer(EntityType<?> type, Level world) {
+         super(type, world);
+-        this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.itemStacksOptimized = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
++        this.itemStacks = this.itemStacksOptimized.nonNullList;
++        // Kaiiju end
+     }
+ 
+     protected AbstractMinecartContainer(EntityType<?> type, double x, double y, double z, Level world) {
+         super(type, world, x, y, z);
+-        this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.itemStacksOptimized = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
++        this.itemStacks = this.itemStacksOptimized.nonNullList;
++        // Kaiiju end
+     }
+ 
+     @Override
+@@ -156,6 +163,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
+     protected void readAdditionalSaveData(CompoundTag nbt) {
+         super.readAdditionalSaveData(nbt);
+         this.lootableData.loadNbt(nbt); // Paper
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.itemStacksOptimized = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
++        this.itemStacks = this.itemStacksOptimized.nonNullList;
++        // Kaiiju end
+         this.readChestVehicleSaveData(nbt);
+     }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+index a71414397bd45ee7bcacfeef0041d80dfa25f114..67f69540e6c217070f8d2af8908d4eb6f2b5c1c1 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
+@@ -31,6 +31,7 @@ import org.bukkit.entity.HumanEntity;
+ public class ChestBlockEntity extends RandomizableContainerBlockEntity implements LidBlockEntity {
+ 
+     private static final int EVENT_SET_OPEN_COUNT = 1;
++    private dev.kaiijumc.kaiiju.structs.ItemListWithBitset optimizedItems; // Kaiiju - airplane - implement ItemListWithBitset
+     private NonNullList<ItemStack> items;
+     public final ContainerOpenersCounter openersCounter;
+     private final ChestLidController chestLidController;
+@@ -65,9 +66,14 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
+     }
+     // CraftBukkit end
+ 
++    private final boolean isNative = getClass().equals(ChestBlockEntity.class); // Kaiiju - airplane
++
+     protected ChestBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
+         super(type, pos, state);
+-        this.items = NonNullList.withSize(27, ItemStack.EMPTY);
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(27);
++        this.items = this.optimizedItems.nonNullList;
++        // Kaiiju end
+         this.openersCounter = new ContainerOpenersCounter() {
+             @Override
+             protected void onOpen(Level world, BlockPos pos, BlockState state) {
+@@ -98,6 +104,23 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
+         this.chestLidController = new ChestLidController();
+     }
+ 
++    // Kaiiju start - airplane - improve container checking with a bitset
++    @Override
++    public boolean hasEmptySlot(Direction enumdirection) {
++        return isNative ? !this.optimizedItems.hasFullStacks() : super.hasEmptySlot(enumdirection);
++    }
++
++    @Override
++    public boolean isCompletelyFull(Direction enumdirection) {
++        return isNative ? this.optimizedItems.hasFullStacks() && super.isCompletelyFull(enumdirection) : super.isCompletelyFull(enumdirection);
++    }
++
++    @Override
++    public boolean isCompletelyEmpty(Direction enumdirection) {
++        return isNative && this.optimizedItems.isCompletelyEmpty() || super.isCompletelyEmpty(enumdirection);
++    }
++    // Kaiiju end
++
+     public ChestBlockEntity(BlockPos pos, BlockState state) {
+         this(BlockEntityType.CHEST, pos, state);
+     }
+@@ -115,7 +138,10 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
+     @Override
+     public void load(CompoundTag nbt) {
+         super.load(nbt);
+-        this.items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize());
++        this.items = this.optimizedItems.nonNullList;
++        // Kaiiju end
+         if (!this.tryLoadLootTable(nbt)) {
+             ContainerHelper.loadAllItems(nbt, this.items);
+         }
+@@ -187,7 +213,10 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
+ 
+     @Override
+     protected void setItems(NonNullList<ItemStack> list) {
+-        this.items = list;
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.optimizedItems = dev.kaiijumc.kaiiju.structs.ItemListWithBitset.fromList(list);
++        this.items = this.optimizedItems.nonNullList;
++        // Kaiiju end
+     }
+ 
+     @Override
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+index 762b763f271c3208b4f8a7e346897207ec5beb6c..a212a62bc2b43b55e9040e2de8360d6e55a7dd86 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+@@ -48,6 +48,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     public static final int MOVE_ITEM_SPEED = 8;
+     public static final int HOPPER_CONTAINER_SIZE = 5;
+     private NonNullList<ItemStack> items;
++    private dev.kaiijumc.kaiiju.structs.ItemListWithBitset optimizedItems; // Kaiiju - airplane - implement ItemListWithBitset
+     private int cooldownTime;
+     private long tickedGameTime;
+ 
+@@ -83,14 +84,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+ 
+     public HopperBlockEntity(BlockPos pos, BlockState state) {
+         super(BlockEntityType.HOPPER, pos, state);
+-        this.items = NonNullList.withSize(5, ItemStack.EMPTY);
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(5);
++        this.items = this.optimizedItems.nonNullList;
++        // Kaiiju end
+         this.cooldownTime = -1;
+     }
+ 
++    // Kaiiju start - airplane - improve container checking with a bitset
++    @Override
++    public boolean hasEmptySlot(Direction enumdirection) {
++        return !this.optimizedItems.hasFullStacks();
++    }
++
++    @Override
++    public boolean isCompletelyFull(Direction enumdirection) {
++        return this.optimizedItems.hasFullStacks() && super.isCompletelyFull(enumdirection);
++    }
++
++    @Override
++    public boolean isCompletelyEmpty(Direction enumdirection) {
++        return this.optimizedItems.isCompletelyEmpty() || super.isCompletelyEmpty(enumdirection);
++    }
++    // Kaiiju end
++
+     @Override
+     public void load(CompoundTag nbt) {
+         super.load(nbt);
+-        this.items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.optimizedItems = new dev.kaiijumc.kaiiju.structs.ItemListWithBitset(this.getContainerSize());
++        this.items = this.optimizedItems.nonNullList;
++        // Kaiiju end
+         if (!this.tryLoadLootTable(nbt)) {
+             ContainerHelper.loadAllItems(nbt, this.items);
+         }
+@@ -162,7 +186,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+                     flag = HopperBlockEntity.ejectItems(world, pos, state, (Container) blockEntity, blockEntity); // CraftBukkit
+                 }
+ 
+-                if (!blockEntity.inventoryFull()) {
++                if (!blockEntity.optimizedItems.hasFullStacks() || !blockEntity.inventoryFull()) { // Kaiiju - airplane
+                     flag |= booleansupplier.getAsBoolean();
+                 }
+ 
+@@ -455,11 +479,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+     }
+ 
+     private static boolean isFullContainer(Container inventory, Direction direction) {
+-        return allMatch(inventory, direction, STACK_SIZE_TEST); // Paper - no streams
++        return inventory.isCompletelyFull(direction); // Kaiiju - airplane - use bitsets
+     }
+ 
+     private static boolean isEmptyContainer(Container inv, Direction facing) {
+-        return allMatch(inv, facing, IS_EMPTY_TEST);
++        return inv.isCompletelyEmpty(facing); // Kaiiju - airplane - use bitsets
+     }
+ 
+     public static boolean suckInItems(Level world, Hopper hopper) {
+@@ -649,7 +673,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+ 
+         if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
+             boolean flag = false;
+-            boolean flag1 = to.isEmpty();
++            boolean flag1 = to.isCompletelyEmpty(side); // Kaiiju - airplane - use bitsets
+ 
+             if (itemstack1.isEmpty()) {
+                 // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
+@@ -844,7 +868,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+ 
+     @Override
+     protected void setItems(NonNullList<ItemStack> list) {
+-        this.items = list;
++        // Kaiiju start - airplane - use ItemListWithBitset
++        this.optimizedItems = dev.kaiijumc.kaiiju.structs.ItemListWithBitset.fromList(list);
++        this.items = this.optimizedItems.nonNullList;
++        // Kaiiju end
+     }
+ 
+     public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+index 081691f9710ff1115e4308f79ed49fbc38941193..648e28c5fba5c62e65f83fbb5ebc8836ffb166a9 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
+@@ -95,14 +95,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
+     @Override
+     public boolean isEmpty() {
+         this.unpackLootTable((Player)null);
+-        // Paper start
+-        for (final ItemStack itemStack : this.getItems()) {
+-            if (!itemStack.isEmpty()) {
+-                return false;
+-            }
+-        }
+-        return true;
+-        // Paper end
++        return this.isCompletelyEmpty(null); // Kaiiju - airplane - use super
+     }
+ 
+     @Override