Add system properties for configuring bytebuf allocator

booky10 · booky10 · commit 795e618bd27f · 2025-10-02T18:22:35.000+02:00
diff --git a/common/src/main/java/dev/booky/betterview/common/util/BetterViewUtil.java b/common/src/main/java/dev/booky/betterview/common/util/BetterViewUtil.java
@@ -6,12 +6,21 @@
 import dev.booky.betterview.common.ChunkCacheEntry;
 import dev.booky.betterview.common.hooks.LevelHook;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 public final class BetterViewUtil {
 
+    private static final boolean ALLOC_UNPOOLED = Boolean.getBoolean("betterview.alloc.unpooled");
+    private static final boolean ALLOC_HEAP = Boolean.getBoolean("betterview.alloc.heap");
+    public static final ByteBufAllocator ALLOC = ALLOC_UNPOOLED
+            ? new UnpooledByteBufAllocator(!ALLOC_HEAP)
+            : new PooledByteBufAllocator(!ALLOC_HEAP);
+
     public static final int MC_MAX_DIMENSION_SIZE = 30_000_000;
     public static final int MC_MAX_DIMENSION_SIZE_CHUNKS = MC_MAX_DIMENSION_SIZE << 4;
 
diff --git a/fabric-1211/src/main/java/dev/booky/betterview/fabric/v1211/mixin/platform/ServerLevelMixin.java b/fabric-1211/src/main/java/dev/booky/betterview/fabric/v1211/mixin/platform/ServerLevelMixin.java
@@ -160,7 +160,7 @@ private void postInit(CallbackInfo ci) {
 
     public ByteBuf betterview$getEmptyChunkBuf(McChunkPos chunkPos) {
         ByteBuf posBuf = BetterViewUtil.encodeChunkPos(chunkPos.getX(), chunkPos.getZ());
-        return PooledByteBufAllocator.DEFAULT.compositeBuffer(3)
+        return BetterViewUtil.ALLOC.compositeBuffer(3)
                 .addComponent(true, PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID_BUF.retainedSlice())
                 .addComponent(true, posBuf)
                 .addComponent(true, this.emptyChunkData.retainedSlice());
diff --git a/fabric-1211/src/main/java/dev/booky/betterview/fabric/v1211/mixin/platform/ServerPlayerMixin.java b/fabric-1211/src/main/java/dev/booky/betterview/fabric/v1211/mixin/platform/ServerPlayerMixin.java
@@ -98,7 +98,7 @@ private void onDeathRestore(ServerPlayer from, boolean keepInventory, CallbackIn
     public void betterview$sendChunkUnload(int chunkX, int chunkZ) {
         ByteBuf packetId = PacketUtil.FORGET_LEVEL_CHUNK_PACKET_ID_BUF.retainedSlice();
         ByteBuf chunkPos = BetterViewUtil.encodeChunkPos(McChunkPos.getChunkKey(chunkX, chunkZ));
-        CompositeByteBuf packetBuf = PooledByteBufAllocator.DEFAULT.compositeBuffer(2)
+        CompositeByteBuf packetBuf = BetterViewUtil.ALLOC.compositeBuffer(2)
                 .addComponent(true, packetId)
                 .addComponent(true, chunkPos);
         ((PlayerHook) this).getNettyChannel().write(new BypassedPacket(packetBuf));
diff --git a/fabric-1211/src/main/java/dev/booky/betterview/fabric/v1211/packet/ChunkWriter.java b/fabric-1211/src/main/java/dev/booky/betterview/fabric/v1211/packet/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -74,7 +75,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -98,7 +99,7 @@ public static void writeFullBody(
         FriendlyByteBuf.writeNbt(buf, heightmapsTag);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/fabric-1213/src/main/java/dev/booky/betterview/fabric/v1213/mixin/platform/ServerLevelMixin.java b/fabric-1213/src/main/java/dev/booky/betterview/fabric/v1213/mixin/platform/ServerLevelMixin.java
@@ -158,7 +158,7 @@ private void postInit(CallbackInfo ci) {
 
     public ByteBuf betterview$getEmptyChunkBuf(McChunkPos chunkPos) {
         ByteBuf posBuf = BetterViewUtil.encodeChunkPos(chunkPos.getX(), chunkPos.getZ());
-        return PooledByteBufAllocator.DEFAULT.compositeBuffer(3)
+        return BetterViewUtil.ALLOC.compositeBuffer(3)
                 .addComponent(true, PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID_BUF.retainedSlice())
                 .addComponent(true, posBuf)
                 .addComponent(true, this.emptyChunkData.retainedSlice());
diff --git a/fabric-1213/src/main/java/dev/booky/betterview/fabric/v1213/mixin/platform/ServerPlayerMixin.java b/fabric-1213/src/main/java/dev/booky/betterview/fabric/v1213/mixin/platform/ServerPlayerMixin.java
@@ -98,7 +98,7 @@ private void onDeathRestore(ServerPlayer from, boolean keepInventory, CallbackIn
     public void betterview$sendChunkUnload(int chunkX, int chunkZ) {
         ByteBuf packetId = PacketUtil.FORGET_LEVEL_CHUNK_PACKET_ID_BUF.retainedSlice();
         ByteBuf chunkPos = BetterViewUtil.encodeChunkPos(McChunkPos.getChunkKey(chunkX, chunkZ));
-        CompositeByteBuf packetBuf = PooledByteBufAllocator.DEFAULT.compositeBuffer(2)
+        CompositeByteBuf packetBuf = BetterViewUtil.ALLOC.compositeBuffer(2)
                 .addComponent(true, packetId)
                 .addComponent(true, chunkPos);
         ((PlayerHook) this).getNettyChannel().write(new BypassedPacket(packetBuf));
diff --git a/fabric-1213/src/main/java/dev/booky/betterview/fabric/v1213/packet/ChunkWriter.java b/fabric-1213/src/main/java/dev/booky/betterview/fabric/v1213/packet/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -74,7 +75,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -98,7 +99,7 @@ public static void writeFullBody(
         FriendlyByteBuf.writeNbt(buf, heightmapsTag);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/fabric-1214/src/main/java/dev/booky/betterview/fabric/v1214/mixin/platform/ServerLevelMixin.java b/fabric-1214/src/main/java/dev/booky/betterview/fabric/v1214/mixin/platform/ServerLevelMixin.java
@@ -158,7 +158,7 @@ private void postInit(CallbackInfo ci) {
 
     public ByteBuf betterview$getEmptyChunkBuf(McChunkPos chunkPos) {
         ByteBuf posBuf = BetterViewUtil.encodeChunkPos(chunkPos.getX(), chunkPos.getZ());
-        return PooledByteBufAllocator.DEFAULT.compositeBuffer(3)
+        return BetterViewUtil.ALLOC.compositeBuffer(3)
                 .addComponent(true, PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID_BUF.retainedSlice())
                 .addComponent(true, posBuf)
                 .addComponent(true, this.emptyChunkData.retainedSlice());
diff --git a/fabric-1214/src/main/java/dev/booky/betterview/fabric/v1214/mixin/platform/ServerPlayerMixin.java b/fabric-1214/src/main/java/dev/booky/betterview/fabric/v1214/mixin/platform/ServerPlayerMixin.java
@@ -98,7 +98,7 @@ private void onDeathRestore(ServerPlayer from, boolean keepInventory, CallbackIn
     public void betterview$sendChunkUnload(int chunkX, int chunkZ) {
         ByteBuf packetId = PacketUtil.FORGET_LEVEL_CHUNK_PACKET_ID_BUF.retainedSlice();
         ByteBuf chunkPos = BetterViewUtil.encodeChunkPos(McChunkPos.getChunkKey(chunkX, chunkZ));
-        CompositeByteBuf packetBuf = PooledByteBufAllocator.DEFAULT.compositeBuffer(2)
+        CompositeByteBuf packetBuf = BetterViewUtil.ALLOC.compositeBuffer(2)
                 .addComponent(true, packetId)
                 .addComponent(true, chunkPos);
         ((PlayerHook) this).getNettyChannel().write(new BypassedPacket(packetBuf));
diff --git a/fabric-1214/src/main/java/dev/booky/betterview/fabric/v1214/packet/ChunkWriter.java b/fabric-1214/src/main/java/dev/booky/betterview/fabric/v1214/packet/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -74,7 +75,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -98,7 +99,7 @@ public static void writeFullBody(
         FriendlyByteBuf.writeNbt(buf, heightmapsTag);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/fabric-1215/src/main/java/dev/booky/betterview/fabric/v1215/mixin/platform/ServerLevelMixin.java b/fabric-1215/src/main/java/dev/booky/betterview/fabric/v1215/mixin/platform/ServerLevelMixin.java
@@ -158,7 +158,7 @@ private void postInit(CallbackInfo ci) {
 
     public ByteBuf betterview$getEmptyChunkBuf(McChunkPos chunkPos) {
         ByteBuf posBuf = BetterViewUtil.encodeChunkPos(chunkPos.getX(), chunkPos.getZ());
-        return PooledByteBufAllocator.DEFAULT.compositeBuffer(3)
+        return BetterViewUtil.ALLOC.compositeBuffer(3)
                 .addComponent(true, PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID_BUF.retainedSlice())
                 .addComponent(true, posBuf)
                 .addComponent(true, this.emptyChunkData.retainedSlice());
diff --git a/fabric-1215/src/main/java/dev/booky/betterview/fabric/v1215/mixin/platform/ServerPlayerMixin.java b/fabric-1215/src/main/java/dev/booky/betterview/fabric/v1215/mixin/platform/ServerPlayerMixin.java
@@ -98,7 +98,7 @@ private void onDeathRestore(ServerPlayer from, boolean keepInventory, CallbackIn
     public void betterview$sendChunkUnload(int chunkX, int chunkZ) {
         ByteBuf packetId = PacketUtil.FORGET_LEVEL_CHUNK_PACKET_ID_BUF.retainedSlice();
         ByteBuf chunkPos = BetterViewUtil.encodeChunkPos(McChunkPos.getChunkKey(chunkX, chunkZ));
-        CompositeByteBuf packetBuf = PooledByteBufAllocator.DEFAULT.compositeBuffer(2)
+        CompositeByteBuf packetBuf = BetterViewUtil.ALLOC.compositeBuffer(2)
                 .addComponent(true, packetId)
                 .addComponent(true, chunkPos);
         ((PlayerHook) this).getNettyChannel().write(new BypassedPacket(packetBuf));
diff --git a/fabric-1215/src/main/java/dev/booky/betterview/fabric/v1215/packet/ChunkWriter.java b/fabric-1215/src/main/java/dev/booky/betterview/fabric/v1215/packet/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -74,7 +75,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -120,7 +121,7 @@ public static void writeFullBody(
         writeHeightmaps(buf, heightmapsData);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/fabric-1217/src/main/java/dev/booky/betterview/fabric/v1217/mixin/platform/ServerLevelMixin.java b/fabric-1217/src/main/java/dev/booky/betterview/fabric/v1217/mixin/platform/ServerLevelMixin.java
@@ -158,7 +158,7 @@ private void postInit(CallbackInfo ci) {
 
     public ByteBuf betterview$getEmptyChunkBuf(McChunkPos chunkPos) {
         ByteBuf posBuf = BetterViewUtil.encodeChunkPos(chunkPos.getX(), chunkPos.getZ());
-        return PooledByteBufAllocator.DEFAULT.compositeBuffer(3)
+        return BetterViewUtil.ALLOC.compositeBuffer(3)
                 .addComponent(true, PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID_BUF.retainedSlice())
                 .addComponent(true, posBuf)
                 .addComponent(true, this.emptyChunkData.retainedSlice());
diff --git a/fabric-1217/src/main/java/dev/booky/betterview/fabric/v1217/mixin/platform/ServerPlayerMixin.java b/fabric-1217/src/main/java/dev/booky/betterview/fabric/v1217/mixin/platform/ServerPlayerMixin.java
@@ -93,7 +93,7 @@ private void onDeathRestore(ServerPlayer from, boolean keepInventory, CallbackIn
     public void betterview$sendChunkUnload(int chunkX, int chunkZ) {
         ByteBuf packetId = PacketUtil.FORGET_LEVEL_CHUNK_PACKET_ID_BUF.retainedSlice();
         ByteBuf chunkPos = BetterViewUtil.encodeChunkPos(McChunkPos.getChunkKey(chunkX, chunkZ));
-        CompositeByteBuf packetBuf = PooledByteBufAllocator.DEFAULT.compositeBuffer(2)
+        CompositeByteBuf packetBuf = BetterViewUtil.ALLOC.compositeBuffer(2)
                 .addComponent(true, packetId)
                 .addComponent(true, chunkPos);
         ((PlayerHook) this).getNettyChannel().write(new BypassedPacket(packetBuf));
diff --git a/fabric-1217/src/main/java/dev/booky/betterview/fabric/v1217/packet/ChunkWriter.java b/fabric-1217/src/main/java/dev/booky/betterview/fabric/v1217/packet/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import ca.spottedleaf.moonrise.patches.starlight.chunk.StarlightChunk;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -73,7 +74,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(PacketUtil.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -119,7 +120,7 @@ public static void writeFullBody(
         writeHeightmaps(buf, heightmapsData);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/paper-1211/src/main/java/dev/booky/betterview/nms/v1211/ChunkWriter.java b/paper-1211/src/main/java/dev/booky/betterview/nms/v1211/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import com.destroystokyo.paper.util.SneakyThrow;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import dev.booky.betterview.nms.ReflectionUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -77,7 +78,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(NmsAdapter.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -101,7 +102,7 @@ public static void writeFullBody(
         FriendlyByteBuf.writeNbt(buf, heightmapsTag);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/paper-1213/src/main/java/dev/booky/betterview/nms/v1213/ChunkWriter.java b/paper-1213/src/main/java/dev/booky/betterview/nms/v1213/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import com.destroystokyo.paper.util.SneakyThrow;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import dev.booky.betterview.nms.ReflectionUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -77,7 +78,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(NmsAdapter.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -101,7 +102,7 @@ public static void writeFullBody(
         FriendlyByteBuf.writeNbt(buf, heightmapsTag);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/paper-1214/src/main/java/dev/booky/betterview/nms/v1214/ChunkWriter.java b/paper-1214/src/main/java/dev/booky/betterview/nms/v1214/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import com.destroystokyo.paper.util.SneakyThrow;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import dev.booky.betterview.nms.ReflectionUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -77,7 +78,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(NmsAdapter.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -101,7 +102,7 @@ public static void writeFullBody(
         FriendlyByteBuf.writeNbt(buf, heightmapsTag);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/paper-1215/src/main/java/dev/booky/betterview/nms/v1215/ChunkWriter.java b/paper-1215/src/main/java/dev/booky/betterview/nms/v1215/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import com.destroystokyo.paper.util.SneakyThrow;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import dev.booky.betterview.nms.ReflectionUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -78,7 +79,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(NmsAdapter.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -124,7 +125,7 @@ public static void writeFullBody(
         writeHeightmaps(buf, heightmapsData);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/paper-1219/src/main/java/dev/booky/betterview/nms/v1219/ChunkWriter.java b/paper-1219/src/main/java/dev/booky/betterview/nms/v1219/ChunkWriter.java
@@ -3,6 +3,7 @@
 
 import com.destroystokyo.paper.util.SneakyThrow;
 import dev.booky.betterview.common.antixray.AntiXrayProcessor;
+import dev.booky.betterview.common.util.BetterViewUtil;
 import dev.booky.betterview.nms.ReflectionUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
@@ -78,7 +79,7 @@ public static ByteBuf writeFull(
             LevelChunkSection[] sections, byte[][] blockLight, byte @Nullable [][] skyLight
     ) {
         // allocate pooled buffer
-        ByteBuf buf = PooledByteBufAllocator.DEFAULT.directBuffer();
+        ByteBuf buf = BetterViewUtil.ALLOC.buffer();
         try {
             // packet id
             buf.writeByte(NmsAdapter.LEVEL_CHUNK_WITH_LIGHT_PACKET_ID);
@@ -124,7 +125,7 @@ public static void writeFullBody(
         writeHeightmaps(buf, heightmapsData);
         // allocate sub-buffer if we're using anti-xray
         if (antiXray != null) {
-            ByteBuf subBuf = PooledByteBufAllocator.DEFAULT.buffer();
+            ByteBuf subBuf = BetterViewUtil.ALLOC.buffer();
             try {
                 FriendlyByteBuf friendlyBuf = new FriendlyByteBuf(subBuf);
                 for (int i = 0, len = sections.length; i < len; i++) {
diff --git a/paper-common/src/main/java/dev/booky/betterview/platform/PaperLevel.java b/paper-common/src/main/java/dev/booky/betterview/platform/PaperLevel.java
@@ -73,7 +73,7 @@ public void resetChunkGeneration() {
     @Override
     public ByteBuf getEmptyChunkBuf(McChunkPos chunkPos) {
         ByteBuf posBuf = BetterViewUtil.encodeChunkPos(chunkPos.getX(), chunkPos.getZ());
-        return PooledByteBufAllocator.DEFAULT.compositeBuffer(3)
+        return BetterViewUtil.ALLOC.compositeBuffer(3)
                 .addComponent(true, PaperNmsInterface.SERVICE.getClientboundLevelChunkWithLightPacketId())
                 .addComponent(true, posBuf)
                 .addComponent(true, this.emptyChunkData.retainedSlice());
diff --git a/paper-common/src/main/java/dev/booky/betterview/platform/PaperPlayer.java b/paper-common/src/main/java/dev/booky/betterview/platform/PaperPlayer.java
