From 8d35d165757ef3422150d0fce06428c071c5d698 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Fri, 26 Nov 2021 10:44:56 +0100
Subject: [PATCH] 4.1.0 Release

---
 README.md                                          |  2 +-
 build.gradle.kts                                   |  2 +-
 .../viabackwards/api/ViaBackwardsPlatform.java     |  2 +-
 .../packets/BlockItemPackets1_18.java              | 14 ++++++++++----
 gradle/libs.versions.toml                          |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 08bd5fb3..fbe70586 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Supported Versions
 **Green** = ViaVersion\
 **Purple** = ViaBackwards addition
 
-![supported_versions](https://i.imgur.com/MGmk8Yp.png)
+![supported_versions](https://i.imgur.com/O2KAFFL.png)
 
 Releases / Dev Builds
 -
diff --git a/build.gradle.kts b/build.gradle.kts
index 7a813cc0..9b3b539d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.1.0-1.18-pre5-SNAPSHOT"
+    version = "4.1.0"
     description = "Allow older clients to join newer server versions."
 }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
index 7b10d532..5ac4155f 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
@@ -56,7 +56,7 @@ import java.util.logging.Logger;
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "4.0.1";
+    String MINIMUM_VV_VERSION = "4.1.0";
     String IMPL_VERSION = "$IMPL_VERSION";
 
     /**
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
index ddb0a631..290287c7 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java
@@ -161,15 +161,23 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                             MathUtil.ceilLog2(tracker.biomesSent()));
                     final Chunk oldChunk = wrapper.read(chunkType);
                     final ChunkSection[] sections = oldChunk.getSections();
+                    final BitSet mask = new BitSet(oldChunk.getSections().length);
                     final int[] biomeData = new int[sections.length * ChunkSection.BIOME_SIZE];
                     int biomeIndex = 0;
-                    for (final ChunkSection section : sections) {
-                        // TODO remove empty sections (always initialized because of biomes in 1.18)?
+                    for (int j = 0; j < sections.length; j++) {
+                        final ChunkSection section = sections[j];
                         // Write biome palette into biome array
                         final DataPalette biomePalette = section.palette(PaletteType.BIOMES);
                         for (int i = 0; i < ChunkSection.BIOME_SIZE; i++) {
                             biomeData[biomeIndex++] = biomePalette.idAt(i);
                         }
+
+                        // Rewrite to empty section
+                        if (section.getNonAirBlocksCount() == 0) {
+                            sections[j] = null;
+                        } else {
+                            mask.set(j);
+                        }
                     }
 
                     final List<CompoundTag> blockEntityTags = new ArrayList<>(oldChunk.blockEntities().size());
@@ -195,8 +203,6 @@ public final class BlockItemPackets1_18 extends ItemRewriter<Protocol1_17_1To1_1
                         tag.put("id", new StringTag(id));
                     }
 
-                    final BitSet mask = new BitSet(oldChunk.getSections().length);
-                    mask.set(0, oldChunk.getSections().length);
                     final Chunk chunk = new BaseChunk(oldChunk.getX(), oldChunk.getZ(), true, false, mask,
                             oldChunk.getSections(), biomeData, oldChunk.getHeightMap(), blockEntityTags);
                     wrapper.write(new Chunk1_17Type(tracker.currentWorldSectionHeight()), chunk);
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6673283c..f3a1ce5e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "4.1.0-1.18-pre2-SNAPSHOT"
+viaver = "4.1.0-1.18-pre8-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"