ViaRewind 4.1.3

Signed-off-by: Florian Reuth <git@florianreuth.de>

.github/FUNDING.yml

@@ -1,2 +1,2 @@
-github: FlorianMichael
-custom: [ 'https://florianmichael.de/donate', 'https://creeper123123321.github.io/#donate' ]
+github: florianreuth
+custom: [ 'https://florianreuth.de/donate', 'https://creeper123123321.github.io/#donate' ]

.github/workflows/build.yml

@@ -10,13 +10,16 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
+        with:
+          cache-disabled: false
+          cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # 5.1.0
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
         with:
           distribution: 'temurin'
           java-version: 17
@@ -24,7 +27,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload Artifacts to GitHub
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/publish.yml

@@ -15,13 +15,16 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
+        uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
+        with:
+          cache-disabled: false
+          cache-provider: basic
       - name: Set up JDK 17
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # 5.1.0
+        uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
         with:
           distribution: 'temurin'
           java-version: 17

build.gradle.kts

@@ -1,10 +1,10 @@
-import de.florianmichael.baseproject.*
+import de.florianreuth.baseproject.*
 
 plugins {
     `java-library`
     id("io.papermc.hangar-publish-plugin")
     id("com.modrinth.minotaur")
-    id("de.florianmichael.baseproject.BaseProject")
+    id("de.florianreuth.baseproject")
 }
 
 allprojects {
@@ -24,8 +24,8 @@ allprojects {
 subprojects {
 
     dependencies {
-        compileOnly("com.viaversion:viaversion:5.7.0")
-        compileOnly("com.viaversion:viabackwards:5.7.0")
+        compileOnly("com.viaversion:viaversion:5.11.0")
+        compileOnly("com.viaversion:viabackwards:5.11.0")
     }
 
     tasks {

bukkit/src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: ViaRewind
 main: com.viaversion.viarewind.BukkitPlugin
-authors: [ FlorianMichael/EnZaXD, Gerrygames, creeper123123321 ]
+authors: [ EnZaXD, Gerrygames, creeper123123321 ]
 version: ${version}
 description: ${description}
 website: https://viaversion.com/rewind

common/build.gradle.kts

@@ -1,4 +1,4 @@
-import de.florianmichael.baseproject.latestCommitHash
+import de.florianreuth.baseproject.latestCommitHash
 
 plugins {
     id("net.raphimc.class-token-replacer")
@@ -9,6 +9,7 @@ val viaProxy: Configuration by configurations.creating
 dependencies {
     compileOnly("io.netty:netty-all:4.0.20.Final")
     compileOnly("com.google.guava:guava:17.0")
+    compileOnly("com.velocitypowered:velocity-native:3.4.0-SNAPSHOT")
 
     viaProxy("net.raphimc:ViaProxy:[3.0.0,4.0.0)") {
         isTransitive = false

common/src/main/java/com/viaversion/viarewind/ViaRewindPlatformImpl.java

@@ -0,0 +1,43 @@
+/*
+ * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
+ * Copyright (C) 2018-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viarewind;
+
+import com.viaversion.viarewind.api.ViaRewindPlatform;
+import com.viaversion.viaversion.api.Via;
+import java.io.File;
+import java.util.logging.Logger;
+
+public class ViaRewindPlatformImpl implements ViaRewindPlatform {
+
+    private final Logger logger;
+
+    public ViaRewindPlatformImpl() {
+        logger = Via.getPlatform().createLogger("ViaRewind");
+        init(new File(getDataFolder(), "viarewind.yml"));
+    }
+
+    @Override
+    public Logger getLogger() {
+        return logger;
+    }
+
+    @Override
+    public File getDataFolder() {
+        return Via.getPlatform().getDataFolder();
+    }
+}

common/src/main/java/com/viaversion/viarewind/api/ViaRewindPlatform.java

@@ -43,7 +43,7 @@ public interface ViaRewindPlatform {
     /**
      * Initialize ViaRewind
      */
-    default void init(final ViaRewindConfig config) {
+    default void init(final com.viaversion.viarewind.api.ViaRewindConfig config) {
         config.reload();
         Via.getManager().getConfigurationProvider().register(config);
 

common/src/main/java/com/viaversion/viarewind/api/compression/ThreadLocalCompressionProvider.java

@@ -0,0 +1,157 @@
+/*
+ * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
+ * Copyright (C) 2018-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viarewind.api.compression;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufAllocator;
+
+import java.util.zip.DataFormatException;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
+
+/**
+ * A ThreadLocal-based compression provider that either uses Velocity's native compression
+ * or falls back to Java's built-in compression (Deflater/Inflater).
+ */
+public final class ThreadLocalCompressionProvider {
+
+    private static final boolean VELOCITY_NATIVES_AVAILABLE;
+
+    static {
+        boolean velocityAvailable = false;
+        try {
+            Class.forName("com.velocitypowered.natives.compression.VelocityCompressor");
+            velocityAvailable = true;
+        } catch (final ClassNotFoundException ignored) {
+        }
+        VELOCITY_NATIVES_AVAILABLE = velocityAvailable;
+    }
+
+    // ThreadLocal for Java's Deflater (used when Velocity natives are not available)
+    private static final ThreadLocal<Deflater> JAVA_DEFLATER = ThreadLocal.withInitial(Deflater::new);
+
+    // ThreadLocal for Java's Inflater (used when Velocity natives are not available)
+    private static final ThreadLocal<Inflater> JAVA_INFLATER = ThreadLocal.withInitial(Inflater::new);
+
+    private ThreadLocalCompressionProvider() {
+    }
+
+    /**
+     * Compresses data from the source buffer into the destination buffer.
+     *
+     * @param source      the source buffer containing uncompressed data
+     * @param destination the destination buffer to write compressed data to
+     * @throws DataFormatException if compression fails
+     */
+    public static void deflate(final ByteBuf source, final ByteBuf destination) throws DataFormatException {
+        if (VELOCITY_NATIVES_AVAILABLE) {
+            deflateVelocity(source, destination);
+        } else {
+            deflateJava(source, destination);
+        }
+    }
+
+
+    /**
+     * Decompresses data from the source buffer into the destination buffer.
+     *
+     * @param source        the source buffer containing compressed data
+     * @param destination   the destination buffer to write decompressed data to
+     * @param expectedSize  the expected size of the decompressed data
+     * @throws DataFormatException if decompression fails
+     */
+    public static void inflate(final ByteBuf source, final ByteBuf destination, final int expectedSize) throws DataFormatException {
+        if (VELOCITY_NATIVES_AVAILABLE) {
+            inflateVelocity(source, destination, expectedSize);
+        } else {
+            inflateJava(source, destination, expectedSize);
+        }
+    }
+
+    // Java native implementation
+
+    private static void deflateJava(final ByteBuf source, final ByteBuf destination) throws DataFormatException {
+        ByteBuf temp = source;
+        if (!source.hasArray()) {
+            temp = ByteBufAllocator.DEFAULT.heapBuffer().writeBytes(source);
+        } else {
+            source.retain();
+        }
+        ByteBuf output = ByteBufAllocator.DEFAULT.heapBuffer();
+        try {
+            final Deflater deflater = JAVA_DEFLATER.get();
+            deflater.setInput(temp.array(), temp.arrayOffset() + temp.readerIndex(), temp.readableBytes());
+            deflater.finish();
+
+            while (!deflater.finished()) {
+                output.ensureWritable(4096);
+                output.writerIndex(output.writerIndex() + deflater.deflate(output.array(), output.arrayOffset() + output.writerIndex(), output.writableBytes()));
+            }
+            destination.writeBytes(output);
+        } finally {
+            output.release();
+            temp.release();
+            JAVA_DEFLATER.get().reset();
+        }
+    }
+
+
+    private static void inflateJava(final ByteBuf source, final ByteBuf destination, final int expectedSize) throws DataFormatException {
+        ByteBuf temp = source;
+        if (!source.hasArray()) {
+            temp = ByteBufAllocator.DEFAULT.heapBuffer().writeBytes(source);
+        } else {
+            source.retain();
+        }
+        ByteBuf output = ByteBufAllocator.DEFAULT.heapBuffer(expectedSize, expectedSize);
+        try {
+            final Inflater inflater = JAVA_INFLATER.get();
+            inflater.setInput(temp.array(), temp.arrayOffset() + temp.readerIndex(), temp.readableBytes());
+            output.writerIndex(output.writerIndex() + inflater.inflate(output.array(), output.arrayOffset(), expectedSize));
+            destination.writeBytes(output);
+        } finally {
+            output.release();
+            temp.release();
+            JAVA_INFLATER.get().reset();
+        }
+    }
+
+    // Velocity native implementation
+    private static void deflateVelocity(final ByteBuf source, final ByteBuf destination) throws DataFormatException {
+        VelocityHolder.deflate(source, destination);
+    }
+
+    private static void inflateVelocity(final ByteBuf source, final ByteBuf destination, final int expectedSize) throws DataFormatException {
+        VelocityHolder.inflate(source, destination, expectedSize);
+    }
+
+    private static final class VelocityHolder {
+
+        private static final ThreadLocal<com.velocitypowered.natives.compression.VelocityCompressor> COMPRESSOR =
+                ThreadLocal.withInitial(() -> com.velocitypowered.natives.util.Natives.compress.get().create(-1));
+
+        static void deflate(final ByteBuf source, final ByteBuf destination) throws DataFormatException {
+            COMPRESSOR.get().deflate(source, destination);
+        }
+
+        static void inflate(final ByteBuf source, final ByteBuf destination, final int expectedSize) throws DataFormatException {
+            COMPRESSOR.get().inflate(source, destination, expectedSize);
+        }
+    }
+}
+

common/src/main/java/com/viaversion/viarewind/api/data/RewindMappingData.java

@@ -20,6 +20,10 @@ package com.viaversion.viarewind.api.data;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viarewind.ViaRewind;
+import com.viaversion.viaversion.api.data.FullMappings;
+import com.viaversion.viaversion.api.data.LegacyFullStringMappingsBase;
+import com.viaversion.viaversion.api.data.MappingDataLoader;
+import com.viaversion.viaversion.api.data.Mappings;
 import java.util.logging.Logger;
 
 public class RewindMappingData extends BackwardsMappingData {
@@ -37,4 +41,9 @@ public class RewindMappingData extends BackwardsMappingData {
     protected CompoundTag readMappingsFile(String name) {
         return RewindMappingDataLoader.INSTANCE.loadNBTFromDir(name);
     }
+
+    @Override
+    protected FullMappings createFullMappings(MappingDataLoader.IdentifiersPair identifiersPair, Mappings mappings) {
+        return new LegacyFullStringMappingsBase(identifiersPair, mappings);
+    }
 }

common/src/main/java/com/viaversion/viarewind/api/minecraft/ExtendedBlockStorage.java

@@ -1,77 +0,0 @@
-/*
- * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2026 ViaVersion and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.viaversion.viarewind.api.minecraft;
-
-import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
-import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;
-
-public class ExtendedBlockStorage {
-    private final byte[] blockLSBArray = new byte[ChunkSection.SIZE];
-
-    private final NibbleArray blockMetadataArray = new NibbleArray(this.blockLSBArray.length);
-    private final NibbleArray blockLightArray = new NibbleArray(this.blockLSBArray.length);
-
-    private NibbleArray blockMSBArray;
-    private NibbleArray skyLightArray;
-
-    public ExtendedBlockStorage(final boolean skylight) {
-        if (skylight) {
-            this.skyLightArray = new NibbleArray(this.blockLSBArray.length);
-        }
-    }
-
-    public void setBlockId(final int x, final int y, final int z, final int value) {
-        this.blockLSBArray[ChunkSection.index(x, y, z)] = (byte) (value & 255);
-        if (value > 255) {
-            this.getOrCreateBlockMSBArray().set(x, y, z, (value & 0xF00) >> 8);
-        } else if (this.blockMSBArray != null) {
-            this.blockMSBArray.set(x, y, z, 0);
-        }
-    }
-
-    public void setBlockMetadata(final int x, final int y, final int z, final int value) {
-        this.blockMetadataArray.set(x, y, z, value);
-    }
-
-    public boolean hasBlockMSBArray() {
-        return this.blockMSBArray != null;
-    }
-
-    public byte[] getBlockLSBArray() {
-        return this.blockLSBArray;
-    }
-
-    public NibbleArray getOrCreateBlockMSBArray() {
-        if (this.blockMSBArray == null) {
-            return this.blockMSBArray = new NibbleArray(this.blockLSBArray.length);
-        }
-        return this.blockMSBArray;
-    }
-
-    public NibbleArray getBlockMetadataArray() {
-        return this.blockMetadataArray;
-    }
-
-    public NibbleArray getBlockLightArray() {
-        return this.blockLightArray;
-    }
-
-    public NibbleArray getSkyLightArray() {
-        return this.skyLightArray;
-    }
-}

common/src/main/java/com/viaversion/viarewind/api/type/RewindTypes.java

@@ -28,7 +28,6 @@ import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.libs.gson.JsonElement;
 import java.util.List;
 
 /**
@@ -36,7 +35,6 @@ import java.util.List;
  */
 public class RewindTypes {
 
-    public static final Type<JsonElement> SIGN_COMPONENT = new SignComponentType();
     public static final Type<int[]> INT_ARRAY = new IntArrayType(); // Integer array with byte as length indicator
 
     public static final Type<BlockPosition> SHORT_POSITION = new PositionVarYType<>(Types.SHORT, value -> (short) value);

common/src/main/java/com/viaversion/viarewind/api/type/SignComponentType.java

@@ -1,51 +0,0 @@
-/*
- * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
- * Copyright (C) 2018-2026 ViaVersion and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.viaversion.viarewind.api.type;
-
-import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.ComponentType;
-import com.viaversion.viaversion.api.type.types.StringType;
-import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.viaversion.libs.gson.JsonParser;
-import com.viaversion.viaversion.libs.gson.JsonSyntaxException;
-import io.netty.buffer.ByteBuf;
-
-public class SignComponentType extends ComponentType {
-
-    public static final Type<String> STRING = new StringType(384);
-
-    @Override
-    public JsonElement read(final ByteBuf buffer) {
-        final String string = STRING.read(buffer);
-        try {
-            return JsonParser.parseString(string);
-        } catch (final JsonSyntaxException e) {
-            if (Via.getManager().isDebug()) {
-                Via.getPlatform().getLogger().severe("Error when trying to parse json: " + string);
-            }
-            throw e;
-        }
-    }
-
-    @Override
-    public void write(final ByteBuf buffer, final JsonElement value) {
-        STRING.write(buffer, value.toString());
-    }
-
-}

common/src/main/java/com/viaversion/viarewind/api/type/chunk/BulkChunkType1_7_6.java

@@ -17,12 +17,13 @@
  */
 package com.viaversion.viarewind.api.type.chunk;
 
+import com.viaversion.viarewind.api.compression.ThreadLocalCompressionProvider;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
-import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.util.Pair;
 import io.netty.buffer.ByteBuf;
-import java.util.zip.Deflater;
+
+import java.util.zip.DataFormatException;
+
 
 public class BulkChunkType1_7_6 extends Type<Chunk[]> {
 
@@ -38,73 +39,80 @@ public class BulkChunkType1_7_6 extends Type<Chunk[]> {
     }
 
     @Override
-    public void write(ByteBuf byteBuf, Chunk[] chunks) {
+    public void write(ByteBuf buffer, Chunk[] chunks) {
         final int chunkCount = chunks.length;
-        final int[] chunkX = new int[chunkCount];
-        final int[] chunkZ = new int[chunkCount];
-        final short[] primaryBitMask = new short[chunkCount];
-        final short[] additionalBitMask = new short[chunkCount];
+        final int[] addBitMasks = new int[chunkCount];
+        int totalSize = 0;
+        boolean anySkyLight = false;
 
-        final byte[][] dataArrays = new byte[chunkCount][];
-        int dataSize = 0;
-
-        for (int i = 0; i < chunkCount; i++) {
-            final Chunk chunk = chunks[i];
-            Pair<byte[], Short> chunkData;
-            try {
-                chunkData = ChunkType1_7_6.serialize(chunk);
-                final byte[] data = chunkData.key();
-                dataArrays[i] = data;
-                dataSize += data.length;
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to serialize chunk", e);
-            }
-            chunkX[i] = chunk.getX();
-            chunkZ[i] = chunk.getZ();
-            primaryBitMask[i] = (short) chunk.getBitmask();
-            additionalBitMask[i] = chunkData.value();
-        }
-
-        final byte[] data = new byte[dataSize];
-        int destPos = 0;
-        for (final byte[] array : dataArrays) {
-            System.arraycopy(array, 0, data, destPos, array.length);
-            destPos += array.length;
-        }
-
-        final Deflater deflater = new Deflater();
-        byte[] compressedData;
-        int compressedSize;
-        try {
-            deflater.setInput(data, 0, data.length);
-            deflater.finish();
-            compressedData = new byte[data.length];
-            compressedSize = deflater.deflate(compressedData);
-        } finally {
-            deflater.end();
-        }
-
-        byteBuf.writeShort(chunkCount);
-        byteBuf.writeInt(compressedSize);
-
-        boolean skyLight = false;
         for (Chunk chunk : chunks) {
-            for (ChunkSection section : chunk.getSections()) {
-                if (section != null && section.getLight().hasSkyLight()) {
-                    skyLight = true;
-                    break;
-                }
+            if (ChunkType1_7_6.hasSkyLight(chunk)) {
+                anySkyLight = true;
+                break;
             }
         }
 
-        byteBuf.writeBoolean(skyLight); // hasSkyLight
-        byteBuf.writeBytes(compressedData, 0, compressedSize);
+        for (int i = 0; i < chunkCount; i++) {
+            Chunk chunk = chunks[i];
+            addBitMasks[i] = ChunkType1_7_6.getAddBitMask(chunk);
+            boolean biomes = chunk.isFullChunk() && chunk.getBiomeData() != null;
+
+            totalSize += ChunkType1_7_6.calcSize(
+                chunk.getBitmask(),
+                addBitMasks[i],
+                anySkyLight,
+                biomes
+            );
+        }
+
+        final ByteBuf uncompressed = buffer.alloc().buffer(totalSize);
+
+        try {
+            for (int i = 0; i < chunkCount; i++) {
+                Chunk chunk = chunks[i];
+                boolean biomes = chunk.isFullChunk() && chunk.getBiomeData() != null;
+
+                ChunkType1_7_6.serialize(
+                    chunk,
+                    uncompressed,
+                    addBitMasks[i],
+                    anySkyLight,
+                    biomes
+                );
+            }
+
+            buffer.writeShort(chunkCount);
+
+            // Reserve 4 bytes for the compressed size
+            final int sizeIndex = buffer.writerIndex();
+            buffer.writeInt(0); // Placeholder for compressed size
+
+            buffer.writeBoolean(anySkyLight);
+
+            // Write compressed data directly to output buffer
+            final int compressedStart = buffer.writerIndex();
+            try {
+                ThreadLocalCompressionProvider.deflate(uncompressed, buffer);
+            } catch (DataFormatException e) {
+                throw new RuntimeException("Failed to compress bulk chunk data", e);
+            }
+            final int compressedSize = buffer.writerIndex() - compressedStart;
+
+            // Go back and write the compressed size
+            final int endIndex = buffer.writerIndex();
+            buffer.writerIndex(sizeIndex);
+            buffer.writeInt(compressedSize);
+            buffer.writerIndex(endIndex);
+        } finally {
+            uncompressed.release();
+        }
 
         for (int i = 0; i < chunkCount; i++) {
-            byteBuf.writeInt(chunkX[i]);
-            byteBuf.writeInt(chunkZ[i]);
-            byteBuf.writeShort(primaryBitMask[i]);
-            byteBuf.writeShort(additionalBitMask[i]);
+            Chunk chunk = chunks[i];
+            buffer.writeInt(chunk.getX());
+            buffer.writeInt(chunk.getZ());
+            buffer.writeShort(chunk.getBitmask());
+            buffer.writeShort(addBitMasks[i]);
         }
     }
 }

common/src/main/java/com/viaversion/viarewind/api/type/chunk/ChunkType1_7_6.java

@@ -17,15 +17,15 @@
  */
 package com.viaversion.viarewind.api.type.chunk;
 
-import com.viaversion.viarewind.api.minecraft.ExtendedBlockStorage;
+import com.viaversion.viarewind.api.compression.ThreadLocalCompressionProvider;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
+import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
 import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.util.Pair;
 import io.netty.buffer.ByteBuf;
-import java.io.IOException;
-import java.util.zip.Deflater;
+
+import java.util.zip.DataFormatException;
 
 import static com.viaversion.viaversion.api.minecraft.chunks.ChunkSection.SIZE;
 import static com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionLight.LIGHT_LENGTH;
@@ -38,143 +38,170 @@ public class ChunkType1_7_6 extends Type<Chunk> {
         super(Chunk.class);
     }
 
-    public static Pair<byte[], Short> serialize(final Chunk chunk) throws IOException {
-        final ExtendedBlockStorage[] storageArrays = new ExtendedBlockStorage[16];
-        for (int i = 0; i < storageArrays.length; i++) {
-            final ChunkSection section = chunk.getSections()[i];
-            if (section != null) {
-                final ExtendedBlockStorage storage = storageArrays[i] = new ExtendedBlockStorage(section.getLight().hasSkyLight());
-                for (int x = 0; x < 16; x++) {
-                    for (int z = 0; z < 16; z++) {
-                        for (int y = 0; y < 16; y++) {
-                            final int flatBlock = section.palette(PaletteType.BLOCKS).idAt(x, y, z);
-                            storage.setBlockId(x, y, z, flatBlock >> 4);
-                            storage.setBlockMetadata(x, y, z, flatBlock & 15);
-                        }
-                    }
-                }
-                storage.getBlockLightArray().setHandle(section.getLight().getBlockLight());
-                if (section.getLight().hasSkyLight()) {
-                    storage.getSkyLightArray().setHandle(section.getLight().getSkyLight());
-                }
-            }
-        }
-
-        final boolean biomes = chunk.isFullChunk() && chunk.getBiomeData() != null;
-        final int totalSize = calculateSize(storageArrays, chunk.getBitmask(), biomes);
-
-        final byte[] output = new byte[totalSize];
-        int index = 0;
-
-        for (int i = 0; i < storageArrays.length; i++) {
-            if ((chunk.getBitmask() & 1 << i) != 0) {
-                final byte[] blockLSBArray = storageArrays[i].getBlockLSBArray();
-                System.arraycopy(blockLSBArray, 0, output, index, blockLSBArray.length);
-                index += blockLSBArray.length;
-            }
-        }
-
-        for (int i = 0; i < storageArrays.length; i++) {
-            if ((chunk.getBitmask() & 1 << i) != 0) {
-                final byte[] blockMetadataArray = storageArrays[i].getBlockMetadataArray().getHandle();
-                System.arraycopy(blockMetadataArray, 0, output, index, blockMetadataArray.length);
-                index += blockMetadataArray.length;
-            }
-        }
-
-        for (int i = 0; i < storageArrays.length; i++) {
-            if ((chunk.getBitmask() & 1 << i) != 0) {
-                final byte[] blockLightArray = storageArrays[i].getBlockLightArray().getHandle();
-                System.arraycopy(blockLightArray, 0, output, index, blockLightArray.length);
-                index += blockLightArray.length;
-            }
-        }
-
-        for (int i = 0; i < storageArrays.length; i++) {
-            if ((chunk.getBitmask() & 1 << i) != 0 && storageArrays[i].getSkyLightArray() != null) {
-                final byte[] skyLightArray = storageArrays[i].getSkyLightArray().getHandle();
-                System.arraycopy(skyLightArray, 0, output, index, skyLightArray.length);
-                index += skyLightArray.length;
-            }
-        }
-
-        short additionalBitMask = 0;
-        for (int i = 0; i < storageArrays.length; i++) {
-            if ((chunk.getBitmask() & 1 << i) != 0 && storageArrays[i].hasBlockMSBArray()) {
-                additionalBitMask |= (short) (1 << i);
-                final byte[] blockMSBArray = storageArrays[i].getOrCreateBlockMSBArray().getHandle();
-                System.arraycopy(blockMSBArray, 0, output, index, blockMSBArray.length);
-                index += blockMSBArray.length;
-            }
-        }
-
-        if (biomes) {
-            for (int biome : chunk.getBiomeData()) {
-                output[index++] = (byte) biome;
-            }
-        }
-
-        return new Pair<>(output, additionalBitMask);
-    }
-
-    private static int calculateSize(final ExtendedBlockStorage[] storageArrays, final int bitmask, final boolean biomes) {
-        int totalSize = 0;
-        for (int i = 0; i < storageArrays.length; i++) {
-            if ((bitmask & 1 << i) != 0) {
-                totalSize += SIZE; // Block lsb array
-                totalSize += SIZE / 2; // Block metadata array
-                totalSize += LIGHT_LENGTH; // Block light array
-
-                if (storageArrays[i].getSkyLightArray() != null) {
-                    totalSize += LIGHT_LENGTH;
-                }
-
-                if (storageArrays[i].hasBlockMSBArray()) {
-                    totalSize += SIZE / 2; // Block msb array
-                }
-            }
-        }
-        if (biomes) {
-            totalSize += 256;
-        }
-        return totalSize;
-    }
-
     @Override
     public Chunk read(ByteBuf byteBuf) {
         throw new UnsupportedOperationException(); // Not needed, see https://github.com/ViaVersion/ViaLegacy/blob/main/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/Chunk1_7_6Type.java
     }
 
     @Override
-    public void write(ByteBuf output, Chunk chunk) {
-        Pair<byte[], Short> chunkData;
-        try {
-            chunkData = serialize(chunk);
-        } catch (IOException e) {
-            throw new RuntimeException("Unable to serialize chunk", e);
-        }
-        final byte[] data = chunkData.key();
-        final short additionalBitMask = chunkData.value();
+    public void write(ByteBuf buffer, Chunk chunk) {
+        final int bitmask = chunk.getBitmask();
+        final int addBitmask = getAddBitMask(chunk);
+        final boolean hasSkyLight = hasSkyLight(chunk);
+        final boolean biomes = chunk.isFullChunk() && chunk.getBiomeData() != null;
+
+        final int size = calcSize(bitmask, addBitmask, hasSkyLight, biomes);
+        final ByteBuf uncompressed = buffer.alloc().buffer(size);
 
-        final Deflater deflater = new Deflater();
-        byte[] compressedData;
-        int compressedSize;
         try {
-            deflater.setInput(data, 0, data.length);
-            deflater.finish();
-            compressedData = new byte[data.length];
-            compressedSize = deflater.deflate(compressedData);
+            serialize(chunk, uncompressed, addBitmask, hasSkyLight, biomes);
+
+            buffer.writeInt(chunk.getX());
+            buffer.writeInt(chunk.getZ());
+            buffer.writeBoolean(chunk.isFullChunk());
+            buffer.writeShort(bitmask);
+            buffer.writeShort(addBitmask);
+
+            // Reserve 4 bytes for the compressed size
+            final int sizeIndex = buffer.writerIndex();
+            buffer.writeInt(0); // Placeholder for compressed size
+
+            // Write compressed data directly to output buffer
+            final int compressedStart = buffer.writerIndex();
+            try {
+                ThreadLocalCompressionProvider.deflate(uncompressed, buffer);
+            } catch (DataFormatException e) {
+                throw new RuntimeException("Failed to compress chunk data", e);
+            }
+            final int compressedSize = buffer.writerIndex() - compressedStart;
+
+            // Go back and write the compressed size
+            final int endIndex = buffer.writerIndex();
+            buffer.writerIndex(sizeIndex);
+            buffer.writeInt(compressedSize);
+            buffer.writerIndex(endIndex);
         } finally {
-            deflater.end();
+            uncompressed.release();
         }
-
-        output.writeInt(chunk.getX());
-        output.writeInt(chunk.getZ());
-        output.writeBoolean(chunk.isFullChunk());
-        output.writeShort(chunk.getBitmask());
-        output.writeShort(additionalBitMask);
-        output.writeInt(compressedSize);
-        output.writeBytes(compressedData, 0, compressedSize);
     }
 
+    public static void serialize(Chunk chunk, ByteBuf output, int addBitmask, boolean writeSkyLight, boolean biomes) {
+        final ChunkSection[] sections = chunk.getSections();
+        final int bitmask = chunk.getBitmask();
+
+        for (int i = 0; i < 16; i++) {
+            if ((bitmask & (1 << i)) != 0) {
+                final ChunkSection section = sections[i];
+                final DataPalette palette = section.palette(PaletteType.BLOCKS);
+                for (int j = 0; j < SIZE; j++) {
+                    final int block = palette.idAt(j);
+                    output.writeByte((block >> 4) & 0xFF);
+                }
+            }
+        }
+
+        for (int i = 0; i < 16; i++) {
+            if ((bitmask & (1 << i)) != 0) {
+                final ChunkSection section = sections[i];
+                final DataPalette palette = section.palette(PaletteType.BLOCKS);
+                for (int j = 0; j < ChunkSection.SIZE; j += 2) {
+                    final int meta1 = palette.idAt(j) & 0xF;
+                    final int meta2 = palette.idAt(j + 1) & 0xF;
+                    output.writeByte(meta1 | (meta2 << 4));
+                }
+            }
+        }
+
+        for (int i = 0; i < 16; i++) {
+            if ((bitmask & (1 << i)) != 0) {
+                final byte[] blockLight = sections[i].getLight().getBlockLight();
+                output.writeBytes(blockLight);
+            }
+        }
+
+        if (writeSkyLight) {
+            for (int i = 0; i < 16; i++) {
+                if ((bitmask & (1 << i)) != 0) {
+                    if (sections[i].getLight().hasSkyLight()) {
+                        final byte[] skyLight = sections[i].getLight().getSkyLight();
+                        output.writeBytes(skyLight);
+                    } else {
+                        // Write empty skylight data
+                        output.writeZero(LIGHT_LENGTH);
+                    }
+                }
+            }
+        }
+
+        if (addBitmask != 0) {
+            for (int i = 0; i < 16; i++) {
+                if ((bitmask & (1 << i)) != 0 && (addBitmask & (1 << i)) != 0) {
+                    final ChunkSection section = sections[i];
+                    final DataPalette palette = section.palette(PaletteType.BLOCKS);
+                    for (int j = 0; j < SIZE; j += 2) {
+                        final int add1 = (palette.idAt(j) >> 12) & 0xF;
+                        final int add2 = (palette.idAt(j + 1) >> 12) & 0xF;
+                        output.writeByte(add1 | (add2 << 4));
+                    }
+                }
+            }
+        }
+
+        if (biomes && chunk.getBiomeData() != null) {
+            final int[] biomeData = chunk.getBiomeData();
+            for (int biome : biomeData) {
+                output.writeByte(biome);
+            }
+        }
+    }
+
+    public static int calcSize(int bitmask, int addBitmask, boolean hasSkyLight, boolean biomes) {
+        int size = 0;
+        int sections = Integer.bitCount(bitmask);
+
+        size += sections * SIZE;
+        size += sections * (SIZE / 2);
+        size += sections * LIGHT_LENGTH;
+
+        if (hasSkyLight) {
+            size += sections * LIGHT_LENGTH;
+        }
+
+        if (addBitmask != 0) {
+            size += Integer.bitCount(addBitmask) * (SIZE / 2);
+        }
+
+        if (biomes) {
+            size += 256;
+        }
+
+        return size;
+    }
+
+    public static int getAddBitMask(Chunk chunk) {
+        int addBitMask = 0;
+        for (int i = 0; i < 16; i++) {
+            if ((chunk.getBitmask() & (1 << i)) != 0) {
+                final ChunkSection section = chunk.getSections()[i];
+                final DataPalette palette = section.palette(PaletteType.BLOCKS);
+                for (int j = 0; j < SIZE; j++) {
+                    final int id = palette.idAt(j);
+                    if ((id >> 12) != 0) {
+                        addBitMask |= (1 << i);
+                        break;
+                    }
+                }
+            }
+        }
+        return addBitMask;
+    }
+
+    public static boolean hasSkyLight(Chunk chunk) {
+        for (ChunkSection section : chunk.getSections()) {
+            if (section != null && section.getLight().hasSkyLight()) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/ChatNewlineRewriter.java

@@ -0,0 +1,234 @@
+/*
+ * This file is part of ViaRewind - https://github.com/ViaVersion/ViaRewind
+ * Copyright (C) 2018-2026 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
+
+import com.viaversion.viaversion.libs.gson.JsonArray;
+import com.viaversion.viaversion.libs.gson.JsonElement;
+import com.viaversion.viaversion.libs.gson.JsonObject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ChatNewlineRewriter {
+    private static final String[] STYLE_KEYS = {
+            "color",
+            "bold",
+            "italic",
+            "underlined",
+            "strikethrough",
+            "obfuscated",
+            "clickEvent",
+            "hoverEvent",
+            "insertion"
+    };
+
+    public static List<JsonObject> splitChatComponentByNewline(JsonElement element) {
+        return splitChatComponentByNewline(element, new JsonObject());
+    }
+
+    private static List<JsonObject> splitChatComponentByNewline(JsonElement element, JsonObject inheritedStyle) {
+        List<JsonObject> results = new ArrayList<>();
+        if (element == null || element.isJsonNull()) {
+            return results;
+        }
+
+        if (element.isJsonPrimitive()) {
+            String text = element.getAsString();
+            for (String part : text.split("\n", -1)) {
+                JsonObject obj = inheritedStyle.deepCopy();
+                obj.addProperty("text", part);
+                results.add(obj);
+            }
+            return results;
+        }
+
+        if (element.isJsonArray()) {
+            List<JsonObject> currentLine = new ArrayList<>();
+            JsonObject siblingStyle = inheritedStyle;
+            boolean foundRoot = false;
+
+            for (JsonElement child : element.getAsJsonArray()) {
+                List<JsonObject> splitParts = splitChatComponentByNewline(child, siblingStyle);
+                for (int i = 0; i < splitParts.size(); i++) {
+                    currentLine.add(splitParts.get(i));
+                    if (i < splitParts.size() - 1) {
+                        results.add(mergeLine(currentLine));
+                        currentLine.clear();
+                    }
+                }
+
+                if (!foundRoot && child != null && !child.isJsonNull()) {
+                    siblingStyle = rootStyle(inheritedStyle, child);
+                    foundRoot = true;
+                }
+            }
+
+            if (!currentLine.isEmpty()) {
+                results.add(mergeLine(currentLine));
+            }
+            return results;
+        }
+
+        if (!element.isJsonObject()) {
+            return results;
+        }
+
+        JsonObject obj = element.getAsJsonObject();
+
+        // Build the style for this node: inherit first, then override with this object's style
+        JsonObject currentStyle = mergeStyle(inheritedStyle, obj);
+
+        // Gather components in order: base text then extra array
+        List<JsonElement> ordered = new ArrayList<>();
+        if (obj.has("text")) {
+            ordered.add(obj.get("text"));
+        }
+        if (obj.has("extra") && obj.get("extra").isJsonArray()) {
+            for (JsonElement extra : obj.getAsJsonArray("extra")) {
+                ordered.add(extra);
+            }
+        }
+
+        // If there is no text/extra, return a single object with the style
+        if (ordered.isEmpty()) {
+            JsonObject baseComponent = copyComponentWithoutExtra(obj, currentStyle);
+            results.add(baseComponent != null ? baseComponent : currentStyle);
+            return results;
+        }
+
+        // Build lines by concatenating split pieces
+        List<JsonObject> currentLine = new ArrayList<>();
+        if (!obj.has("text")) {
+            JsonObject baseComponent = copyComponentWithoutExtra(obj, currentStyle);
+            if (baseComponent != null) {
+                currentLine.add(baseComponent);
+            }
+        }
+        for (JsonElement part : ordered) {
+            if (part == null || part.isJsonNull()) {
+                continue;
+            }
+
+            if (part.isJsonPrimitive()) {
+                String text = part.getAsString();
+                String[] split = text.split("\n", -1);
+                for (int i = 0; i < split.length; i++) {
+                    JsonObject piece = currentStyle.deepCopy();
+                    piece.addProperty("text", split[i]);
+                    currentLine.add(piece);
+
+                    if (i < split.length - 1) {
+                        results.add(mergeLine(currentLine));
+                        currentLine.clear();
+                    }
+                }
+                continue;
+            }
+
+            if (part.isJsonObject() || part.isJsonArray()) {
+                List<JsonObject> splitParts = splitChatComponentByNewline(part, currentStyle);
+                for (int i = 0; i < splitParts.size(); i++) {
+                    currentLine.add(splitParts.get(i));
+                    if (i < splitParts.size() - 1) {
+                        results.add(mergeLine(currentLine));
+                        currentLine.clear();
+                    }
+                }
+            }
+        }
+
+        if (!currentLine.isEmpty()) {
+            results.add(mergeLine(currentLine));
+        }
+
+        return results;
+    }
+
+    private static JsonObject rootStyle(JsonObject inheritedStyle, JsonElement element) {
+        if (element == null || element.isJsonNull()) {
+            return inheritedStyle;
+        }
+        if (element.isJsonObject()) {
+            return mergeStyle(inheritedStyle, element.getAsJsonObject());
+        }
+        if (element.isJsonArray()) {
+            for (JsonElement child : element.getAsJsonArray()) {
+                if (child != null && !child.isJsonNull()) {
+                    return rootStyle(inheritedStyle, child);
+                }
+            }
+        }
+        return inheritedStyle;
+    }
+
+    private static JsonObject mergeStyle(JsonObject inheritedStyle, JsonObject obj) {
+        JsonObject currentStyle = inheritedStyle.deepCopy();
+        for (String key : STYLE_KEYS) {
+            if (obj.has(key)) {
+                currentStyle.add(key, obj.get(key).deepCopy());
+            }
+        }
+        return currentStyle;
+    }
+
+    private static JsonObject copyComponentWithoutExtra(JsonObject obj, JsonObject currentStyle) {
+        JsonObject component = currentStyle.deepCopy();
+        for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
+            String key = entry.getKey();
+            if ("extra".equals(key) || isStyleKey(key)) {
+                continue;
+            }
+
+            component.add(key, entry.getValue().deepCopy());
+        }
+        return component.size() == currentStyle.size() ? null : component;
+    }
+
+    private static boolean isStyleKey(String key) {
+        for (String styleKey : STYLE_KEYS) {
+            if (styleKey.equals(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static JsonObject mergeLine(List<JsonObject> lineParts) {
+        if (lineParts.isEmpty()) {
+            JsonObject empty = new JsonObject();
+            empty.addProperty("text", "");
+            return empty;
+        }
+
+        JsonObject first = lineParts.get(0);
+        if (lineParts.size() == 1) {
+            return first;
+        }
+
+        JsonObject merged = new JsonObject();
+        merged.addProperty("text", "");
+
+        JsonArray extra = new JsonArray();
+        for (JsonObject linePart : lineParts) {
+            extra.add(linePart);
+        }
+        merged.add("extra", extra);
+        return merged;
+    }
+}

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/VirtualHologramEntity.java

@@ -24,6 +24,7 @@ import com.viaversion.viarewind.api.type.RewindTypes;
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter.EntityPacketRewriter1_8;
+import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
@@ -46,6 +47,8 @@ public class VirtualHologramEntity {
     private String name = null;
     private float yaw, pitch;
     private float headYaw;
+    private byte flags = 0;
+    private byte armorStandFlags = 0;
     private boolean small = false;
     private boolean marker = false;
     private boolean sneaking = false;
@@ -99,8 +102,6 @@ public class VirtualHologramEntity {
         }
 
         // Filter armor stand data to calculate emulation
-        byte flags = 0;
-        byte armorStandFlags = 0;
         for (EntityData entityData : entityDataTracker) {
             if (entityData.id() == 0 && entityData.dataType() == EntityDataTypes1_8.BYTE) {
                 flags = ((Number) entityData.getValue()).byteValue();
@@ -120,7 +121,7 @@ public class VirtualHologramEntity {
         gravity = (armorStandFlags & 0x02) == 0;
 
         State prevState = currentState;
-        if (invisible && name != null) {
+        if (invisible && name != null && alwaysShowNametag == 1) {
             currentState = State.HOLOGRAM;
         } else if (gravity) {
             currentState = State.ZOMBIE;
@@ -167,6 +168,18 @@ public class VirtualHologramEntity {
             } else {
                 return baseOffset + (0.9875 * 2);
             }
+        } else if (currentState == State.ZOMBIE_NO_GRAVITY) {
+            // 1.7 ride stack offset sum: Squid (0.95 * 0.75) + Zombie (1.8 * 0.75) = 2.0625
+            // By starting at -2.0625, we zero out the 1.7 passenger height so we can apply 1.8's offsets.
+            double baseOffset = -2.0625;
+
+            if (marker) {
+                // 1.8 Marker ArmorStand height is 0.0 -> mounted offset 0.0
+                return baseOffset;
+            } else {
+                // 1.8 Normal ArmorStand height is 1.975 -> mounted offset 1.975 * 0.75 = 1.48125
+                return baseOffset + 1.48125;
+            }
         } else {
             return -0.4;
         }
@@ -291,6 +304,13 @@ public class VirtualHologramEntity {
             this.entityIds = entityIds;
         }
 
+        for (int extraId : entityIds) {
+            if (extraId != entityId) {
+                ((EntityTracker1_8) user.getEntityTracker(Protocol1_8To1_7_6_10.class)).setExtraHologramId(entityId, extraId);
+            }
+        }
+
+
         sendEntityDataUpdate(entityRewriter);
         if (entityIds == null) {
             return;
@@ -326,6 +346,13 @@ public class VirtualHologramEntity {
         if (entityIds == null) {
             return;
         }
+
+        for (int extraId : entityIds) {
+            if (extraId != entityId) {
+                ((EntityTracker1_8) user.getEntityTracker(Protocol1_8To1_7_6_10.class)).removeExtraHologramId(extraId);
+            }
+        }
+
         final PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.REMOVE_ENTITIES, user);
         despawn.write(Types.BYTE, (byte) entityIds.length);
         for (int id : entityIds) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/provider/CompressionHandlerProvider.java

@@ -20,7 +20,6 @@ package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.CompressionStatusTracker;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.platform.providers.Provider;
-import io.netty.channel.ChannelHandler;
 
 public abstract class CompressionHandlerProvider implements Provider {
 
@@ -28,9 +27,6 @@ public abstract class CompressionHandlerProvider implements Provider {
 
     public abstract void onTransformPacket(UserConnection user);
 
-    public abstract ChannelHandler getEncoder(int threshold);
-
-    public abstract ChannelHandler getDecoder(int threshold);
 
     public boolean isRemoveCompression(UserConnection user) {
         return user.get(CompressionStatusTracker.class).removeCompression;

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/provider/compression/CompressionDecoder.java

@@ -17,17 +17,15 @@
  */
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression;
 
+import com.viaversion.viarewind.api.compression.ThreadLocalCompressionProvider;
 import com.viaversion.viaversion.api.type.Types;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import java.util.List;
-import java.util.zip.Inflater;
 
 public class CompressionDecoder extends MessageToMessageDecoder<ByteBuf> {
-    private final Inflater inflater = new Inflater();
 
     private int threshold;
 
@@ -41,7 +39,9 @@ public class CompressionDecoder extends MessageToMessageDecoder<ByteBuf> {
 
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
-        if (!in.isReadable()) return;
+        if (!in.isReadable()) {
+            return;
+        }
 
         int outLength = Types.VAR_INT.readPrimitive(in);
         if (outLength == 0) {
@@ -55,21 +55,13 @@ public class CompressionDecoder extends MessageToMessageDecoder<ByteBuf> {
             throw new DecoderException("Badly compressed packet - size of " + outLength + " is larger than protocol maximum of " + 2097152);
         }
 
-        ByteBuf temp = in;
-        if (!in.hasArray()) {
-            temp = ByteBufAllocator.DEFAULT.heapBuffer().writeBytes(in);
-        } else {
-            in.retain();
-        }
-        ByteBuf output = ByteBufAllocator.DEFAULT.heapBuffer(outLength, outLength);
+        ByteBuf output = ctx.alloc().buffer(outLength);
         try {
-            this.inflater.setInput(temp.array(), temp.arrayOffset() + temp.readerIndex(), temp.readableBytes());
-            output.writerIndex(output.writerIndex() + this.inflater.inflate(output.array(), output.arrayOffset(), outLength));
+            ThreadLocalCompressionProvider.inflate(in, output, outLength);
             out.add(output.retain());
         } finally {
             output.release();
-            temp.release();
-            this.inflater.reset();
         }
     }
+
 }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/provider/compression/CompressionEncoder.java

@@ -17,15 +17,13 @@
  */
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression;
 
+import com.viaversion.viarewind.api.compression.ThreadLocalCompressionProvider;
 import com.viaversion.viaversion.api.type.Types;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
-import java.util.zip.Deflater;
 
 public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
-    private final Deflater deflater = new Deflater();
 
     private int threshold;
 
@@ -47,27 +45,7 @@ public class CompressionEncoder extends MessageToByteEncoder<ByteBuf> {
         }
 
         Types.VAR_INT.writePrimitive(out, frameLength);
-
-        ByteBuf temp = in;
-        if (!in.hasArray()) {
-            temp = ByteBufAllocator.DEFAULT.heapBuffer().writeBytes(in);
-        } else {
-            in.retain();
-        }
-        ByteBuf output = ByteBufAllocator.DEFAULT.heapBuffer();
-        try {
-            this.deflater.setInput(temp.array(), temp.arrayOffset() + temp.readerIndex(), temp.readableBytes());
-            deflater.finish();
-
-            while (!deflater.finished()) {
-                output.ensureWritable(4096);
-                output.writerIndex(output.writerIndex() + this.deflater.deflate(output.array(), output.arrayOffset() + output.writerIndex(), output.writableBytes()));
-            }
-            out.writeBytes(output);
-        } finally {
-            output.release();
-            temp.release();
-            this.deflater.reset();
-        }
+        ThreadLocalCompressionProvider.deflate(in, out);
     }
+
 }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/provider/compression/TrackingCompressionHandlerProvider.java

@@ -23,7 +23,6 @@ import com.viaversion.viarewind.api.minecraft.netty.ForwardMessageToByteEncoder;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.CompressionHandlerProvider;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPipeline;
 
 public class TrackingCompressionHandlerProvider extends CompressionHandlerProvider {
@@ -41,7 +40,7 @@ public class TrackingCompressionHandlerProvider extends CompressionHandlerProvid
         if (encoder != null) {
             encoder.setThreshold(threshold);
         } else {
-            pipeline.addBefore(Via.getManager().getInjector().getEncoderName(), compressHandlerName, getEncoder(threshold));
+            pipeline.addBefore(Via.getManager().getInjector().getEncoderName(), compressHandlerName, new CompressionEncoder(threshold));
         }
 
         final String decompressHandlerName = ViaRewind.getPlatform().decompressHandlerName();
@@ -49,7 +48,7 @@ public class TrackingCompressionHandlerProvider extends CompressionHandlerProvid
         if (decoder != null) {
             decoder.setThreshold(threshold);
         } else {
-            pipeline.addBefore(Via.getManager().getInjector().getDecoderName(), decompressHandlerName, getDecoder(threshold));
+            pipeline.addBefore(Via.getManager().getInjector().getDecoderName(), decompressHandlerName, new CompressionDecoder(threshold));
         }
     }
 
@@ -76,13 +75,5 @@ public class TrackingCompressionHandlerProvider extends CompressionHandlerProvid
         }
     }
 
-    @Override
-    public ChannelHandler getEncoder(int threshold) {
-        return new CompressionEncoder(threshold);
-    }
 
-    @Override
-    public ChannelHandler getDecoder(int threshold) {
-        return new CompressionDecoder(threshold);
-    }
 }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/EntityPacketRewriter1_8.java

@@ -337,6 +337,11 @@ public class EntityPacketRewriter1_8 extends VREntityRewriter<ClientboundPackets
                 map(Types.ENTITY_DATA_LIST1_8, RewindTypes.ENTITY_DATA_LIST1_7); // Entity data
 
                 handler(getTrackerAndDataHandler(RewindTypes.ENTITY_DATA_LIST1_7, EntityTypes1_8.EntityType.PLAYER));
+                handler(wrapper -> {
+                    final int entityId = wrapper.get(Types.VAR_INT, 0);
+                    final EntityTracker1_8 tracker = tracker(wrapper.user());
+                    tracker.checkNametagVisibility(entityId);
+                });
             }
         });
         protocol.registerClientbound(ClientboundPackets1_8.SET_EQUIPPED_ITEM, new PacketHandlers() {

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/PlayerPacketRewriter1_8.java

@@ -30,6 +30,7 @@ import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPa
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.ChatItemRewriter;
+import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.ChatNewlineRewriter;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.TitleRenderProvider;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.GameProfileStorage;
@@ -46,6 +47,8 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.rewriter.RewriterBase;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.libs.gson.JsonElement;
+import com.viaversion.viaversion.libs.gson.JsonObject;
+import com.viaversion.viaversion.libs.gson.JsonPrimitive;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_8;
 import com.viaversion.viaversion.util.ComponentUtil;
@@ -70,13 +73,27 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
             @Override
             public void register() {
                 map(Types.COMPONENT); // Chat message
+
                 handler(wrapper -> {
                     final JsonElement json = wrapper.get(Types.COMPONENT, 0);
-                    ChatItemRewriter.toClient(protocol, wrapper.user(), json);
-
                     final int position = wrapper.read(Types.BYTE);
+
                     if (position == 2) { // Above hotbar
                         wrapper.cancel();
+                        return;
+                    }
+
+                    ChatItemRewriter.toClient(protocol, wrapper.user(), json);
+                    List<JsonObject> splitComponents = ChatNewlineRewriter.splitChatComponentByNewline(json);
+
+                    if (splitComponents.size() > 1) {
+                        wrapper.cancel();
+
+                        for (JsonObject split : splitComponents) {
+                            PacketWrapper newWrapper = wrapper.create(ClientboundPackets1_7_2_5.CHAT);
+                            newWrapper.write(Types.COMPONENT, split);
+                            newWrapper.send(Protocol1_8To1_7_6_10.class);
+                        }
                     }
                 });
             }
@@ -495,7 +512,13 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                 String username = message.split(" ")[1];
                 final GameProfileStorage storage = wrapper.user().get(GameProfileStorage.class);
 
-                final GameProfileStorage.GameProfile profile = storage.get(username, true);
+                // Multiple players with the same name may exist. This will only represent
+                // fake players so it's fine to just pick the first one.
+                List<GameProfileStorage.GameProfile> profiles = storage.get(username, true);
+                if (profiles.isEmpty()) {
+                    return;
+                }
+                final GameProfileStorage.GameProfile profile = profiles.get(0);
                 if (profile != null && profile.uuid != null) {
                     wrapper.cancel();
 
@@ -513,16 +536,20 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                 map(Types.BYTE, Types.VAR_INT); // Mode
                 handler(wrapper -> {
                     final int mode = wrapper.get(Types.VAR_INT, 1);
+                    final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
+                    final int entityId = tracker.getHologramIdWithExtra(wrapper.get(Types.VAR_INT, 0));
+                    final PlayerSessionStorage position = wrapper.user().get(PlayerSessionStorage.class);
+
+                    if (entityId == -1) {
+                        return;
+                    }
+
+                    wrapper.set(Types.VAR_INT, 0, entityId);
+
                     if (mode != 0) {
                         return;
                     }
-                    final int entityId = wrapper.get(Types.VAR_INT, 0);
-                    final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
-                    final PlayerSessionStorage position = wrapper.user().get(PlayerSessionStorage.class);
 
-                    if (!tracker.getHolograms().containsKey(entityId)) {
-                        return;
-                    }
                     final AABB boundingBox = tracker.getHolograms().get(entityId).getBoundingBox();
 
                     Vector3d pos = new Vector3d(position.getPosX(), position.getPosY() + 1.8, position.getPosZ());
@@ -590,6 +617,16 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
             protected void register() {
                 map(Types.VAR_INT); // Status
                 map(RewindTypes.U_BYTE_POSITION, Types.BLOCK_POSITION1_8); // Position
+                handler(wrapper -> {
+                    // 1.7 uses 255 as "no face"
+                    // 1.8 changed this to only be in the range EnumFacing range (0-5) and uses DOWN when no face is used
+                    // This properly rewrites invalid values to the 1.8 equivalent
+                    int face = wrapper.read(Types.UNSIGNED_BYTE);
+                    if (face > 5) {
+                        face = 0;
+                    }
+                    wrapper.write(Types.UNSIGNED_BYTE, (short) face);
+                });
             }
         });
 
@@ -752,6 +789,8 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
             }
         });
 
+        // 1.7.10 custom payload constructor (String, ByteBuf) uses byteBuf.array(), so it sends the whole backing array capacity, not only the written bytes
+        // After reading the proper packet data we discard the remaining bytes
         protocol.registerServerbound(ServerboundPackets1_7_2_5.CUSTOM_PAYLOAD, new PacketHandlers() {
             @Override
             public void register() {
@@ -762,7 +801,27 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                     switch (channel) {
                         case "MC|TrSel": {
                             wrapper.passthrough(Types.INT);
-                            wrapper.read(Types.REMAINING_BYTES); // unused data ???
+                            wrapper.read(Types.REMAINING_BYTES); // Discard remaining bytes
+                            break;
+                        }
+                        case "MC|AdvCdm": {
+                            final byte commandBlockType = wrapper.passthrough(Types.BYTE);
+                            if (commandBlockType == 0) { // Block
+                                wrapper.passthrough(Types.INT); // X
+                                wrapper.passthrough(Types.INT); // Y
+                                wrapper.passthrough(Types.INT); // Z
+                            } else if (commandBlockType == 1) { // Minecart
+                                wrapper.passthrough(Types.INT); // Entity id
+                            }
+                            wrapper.passthrough(Types.STRING); // Command
+                            wrapper.write(Types.BOOLEAN, true); // Track output, added in 1.8, default to true
+                            wrapper.read(Types.REMAINING_BYTES); // Discard remaining bytes
+                            break;
+                        }
+                        case "MC|Beacon": {
+                            wrapper.passthrough(Types.INT); // Primary effect
+                            wrapper.passthrough(Types.INT); // Secondary effect
+                            wrapper.read(Types.REMAINING_BYTES); // Discard remaining bytes
                             break;
                         }
                         case "MC|ItemName": {
@@ -779,17 +838,28 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                         }
                         case "MC|BEdit":
                         case "MC|BSign": {
+                            final boolean signBook = channel.equals("MC|BSign");
                             final Item book = wrapper.read(RewindTypes.COMPRESSED_NBT_ITEM);
-                            CompoundTag tag = book.tag();
-                            if (tag != null && tag.contains("pages")) {
-                                ListTag<StringTag> pages = tag.getListTag("pages", StringTag.class);
-                                for (int i = 0; i < pages.size(); i++) {
-                                    StringTag page = pages.get(i);
-                                    String value = page.getValue();
-                                    value = ComponentUtil.legacyToJsonString(value);
-                                    page.setValue(value);
+                            wrapper.read(Types.REMAINING_BYTES); // Discard remaining bytes
+
+                            if (book == null) {
+                                wrapper.write(Types.ITEM1_8, null);
+                                break;
+                            }
+
+                            final CompoundTag tag = book.tag();
+                            if (signBook && tag != null && tag.contains("pages")) {
+                                final ListTag<StringTag> pages = tag.getListTag("pages", StringTag.class);
+                                if (pages != null) {
+                                    for (int i = 0; i < pages.size(); i++) {
+                                        final StringTag page = pages.get(i);
+                                        String value = page.getValue();
+                                        value = new JsonPrimitive(value).toString();
+                                        page.setValue(value);
+                                    }
                                 }
                             }
+                            protocol.getItemRewriter().handleItemToServer(wrapper.user(), book);
                             wrapper.write(Types.ITEM1_8, book);
                             break;
                         }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/rewriter/ScoreboardPacketRewriter1_8.java

@@ -19,6 +19,7 @@ package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.rewriter;
 
 import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
+import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.ScoreboardTracker;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -173,6 +174,7 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
             }
 
             final ScoreboardTracker scoreboard = wrapper.user().get(ScoreboardTracker.class);
+            final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
 
             final byte mode = wrapper.passthrough(Types.BYTE);
             if (mode != 0 && !scoreboard.teamExists(team)) {
@@ -190,6 +192,10 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
             if (mode == 0) {
                 scoreboard.addTeam(team);
             } else if (mode == 1) {
+                // Team removed, nametag visibility might have changed
+                for (final String member : scoreboard.getTeamMembers(team)) {
+                    tracker.checkNametagVisbility(member);
+                }
                 scoreboard.removeTeam(team);
             }
 
@@ -198,7 +204,9 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                 wrapper.passthrough(Types.STRING); // Prefix
                 wrapper.passthrough(Types.STRING); // Suffix
                 wrapper.passthrough(Types.BYTE); // Friendly fire
-                wrapper.read(Types.STRING); // Name tag visibility
+                final String nameTagVisibility = wrapper.read(Types.STRING);
+                final String previousVisibility = scoreboard.getTeamNameTagVisibility(team);
+                scoreboard.setTeamNameTagVisibility(team, nameTagVisibility);
                 byte color = wrapper.read(Types.BYTE);
                 if (mode == 2 && scoreboard.getTeamColor(team).get() != color) {
                     final String sidebar = scoreboard.getColorDependentSidebar().get(color);
@@ -209,6 +217,13 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                     sidebarPacket.scheduleSend(Protocol1_8To1_7_6_10.class);
                 }
                 scoreboard.setTeamColor(team, color);
+
+                // Re-evaluate nametag visibility for all team members when visibility changes
+                if (mode == 2 && !nameTagVisibility.equals(previousVisibility)) {
+                    for (final String member : scoreboard.getTeamMembers(team)) {
+                        tracker.checkNametagVisbility(member);
+                    }
+                }
             }
             if (mode == 0 || mode == 3 || mode == 4) {
                 byte color = scoreboard.getTeamColor(team).get();
@@ -223,6 +238,8 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                             continue;
                         }
                         scoreboard.removePlayerFromTeam(entry, team);
+                        // Player left team, nametag visibility may change
+                        tracker.checkNametagVisbility(entry);
                         if (entry.equals(username)) {
                             final PacketWrapper sidebarPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
                             sidebarPacket.write(Types.BYTE, (byte) 1);
@@ -231,6 +248,8 @@ public class ScoreboardPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6
                         }
                     } else {
                         scoreboard.addPlayerToTeam(entry, team);
+                        // Player joined team, nametag visibility may change
+                        tracker.checkNametagVisbility(entry);
                         if (entry.equals(username) && scoreboard.getColorDependentSidebar().containsKey(color)) {
                             final PacketWrapper displayObjective = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_DISPLAY_OBJECTIVE, wrapper.user());
                             displayObjective.write(Types.BYTE, (byte) 1);

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/EntityTracker1_8.java

@@ -22,6 +22,7 @@ import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ServerboundPa
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.VirtualHologramEntity;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.entity.TrackedEntity;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
@@ -37,18 +38,26 @@ import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
 import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Level;
 
+import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
+import com.viaversion.viarewind.api.type.RewindTypes;
+import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.packet.ClientboundPackets1_7_2_5;
+
 public class EntityTracker1_8 extends EntityTrackerBase {
 
     private final Int2ObjectMap<VirtualHologramEntity> holograms = new Int2ObjectArrayMap<>();
+    private final Int2IntMap extraHologramIds = new Int2IntArrayMap();
     private final Int2IntMap vehicles = new Int2IntArrayMap();
     private final Int2ObjectMap<UUID> entityIdToUUID = new Int2ObjectArrayMap<>();
     private final Object2IntMap<UUID> entityUUIDToId = new Object2IntOpenHashMap<>();
+    private final Int2IntMap playerNametagHiderEntities = new Int2IntArrayMap();
 
     private final List<EntityData> entityData = new ArrayList<>();
 
@@ -60,35 +69,41 @@ public class EntityTracker1_8 extends EntityTrackerBase {
     }
 
     @Override
-    public void addEntity(int id, EntityType type) {
-        super.addEntity(id, type);
+    public TrackedEntity addEntity(int id, EntityType type) {
         if (type == EntityTypes1_8.EntityType.ARMOR_STAND) {
             holograms.put(id, new VirtualHologramEntity(user(), id));
         }
+        return super.addEntity(id, type);
     }
 
     @Override
-    public void removeEntity(int entityId) {
-        super.removeEntity(entityId);
-
+    public TrackedEntity removeEntity(int entityId) {
         final VirtualHologramEntity hologram = holograms.get(entityId);
         if (hologram != null) {
             hologram.deleteEntity();
             holograms.remove(entityId);
         }
 
+        if (playerNametagHiderEntities.containsKey(entityId)) {
+            despawnNametagHiderEntity(entityId);
+        }
+
         if (entityIdToUUID.containsKey(entityId)) {
             final UUID playerId = entityIdToUUID.remove(entityId);
 
             entityUUIDToId.removeInt(playerId);
             user().get(PlayerSessionStorage.class).getPlayerEquipment().remove(playerId);
         }
+        return super.removeEntity(entityId);
     }
 
     @Override
     public void clearEntities() {
         super.clearEntities();
+        holograms.clear();
+        extraHologramIds.clear();
         vehicles.clear();
+        playerNametagHiderEntities.clear();
     }
 
     @Override
@@ -155,6 +170,11 @@ public class EntityTracker1_8 extends EntityTrackerBase {
         } else {
             vehicles.put(vehicleId, passengerId);
         }
+
+        // Re-evaluate nametag visibility when a player entity's passenger changes
+        if (vehicleId != -1 && entityIdToUUID.containsKey(vehicleId)) {
+            checkNametagVisibility(vehicleId);
+        }
     }
 
     protected void attachEntity(final int target) {
@@ -185,10 +205,111 @@ public class EntityTracker1_8 extends EntityTrackerBase {
         }
     }
 
+    public void checkNametagVisibility(final int entityId) {
+        if (!entityIdToUUID.containsKey(entityId)) {
+            return;
+        }
+        final boolean shouldHide = isPlayerNametagHidden(entityId);
+        final boolean hasServerPassenger = getPassenger(entityId) != -1;
+        final boolean hasSkull = playerNametagHiderEntities.containsKey(entityId);
+
+        if (shouldHide && !hasServerPassenger && !hasSkull) {
+            spawnNametagHiderEntity(entityId);
+        } else if ((!shouldHide || hasServerPassenger) && hasSkull) {
+            despawnNametagHiderEntity(entityId);
+        }
+    }
+
+    public void checkNametagVisbility(final String username) {
+        final GameProfileStorage profileStorage = user().get(GameProfileStorage.class);
+        final List<GameProfileStorage.GameProfile> profiles = profileStorage.get(username, false);
+
+        for (GameProfileStorage.GameProfile profile : profiles) {
+            final int entityId = getPlayerEntityId(profile.uuid);
+            if (entityId == -1) {
+                return;
+            }
+
+            checkNametagVisibility(entityId);
+        }
+    }
+
+    private boolean isPlayerNametagHidden(final int entityId) {
+        final UUID uuid = entityIdToUUID.get(entityId);
+        if (uuid == null) {
+            return false;
+        }
+        final GameProfileStorage profileStorage = user().get(GameProfileStorage.class);
+        final GameProfileStorage.GameProfile profile = profileStorage.get(uuid);
+        if (profile == null) {
+            return false;
+        }
+        return user().get(ScoreboardTracker.class).isNametagHidden(profile.name);
+    }
+
+    private int getNametagHiderEntityId(final int playerEntityId) {
+        return Integer.MAX_VALUE - 32000 - playerEntityId;
+    }
+
+    private void spawnNametagHiderEntity(final int playerEntityId) {
+        final int entityId = getNametagHiderEntityId(playerEntityId);
+        playerNametagHiderEntities.put(playerEntityId, entityId);
+
+        final List<EntityData> mobData = new ArrayList<>();
+        mobData.add(new EntityData(0, EntityDataTypes1_7_6_10.BYTE, (byte) 0x20));
+        mobData.add(new EntityData(16, EntityDataTypes1_7_6_10.BYTE, (byte) 0));
+
+        final PacketWrapper spawnMob = PacketWrapper.create(ClientboundPackets1_7_2_5.ADD_MOB, user());
+        spawnMob.write(Types.VAR_INT, entityId);
+        spawnMob.write(Types.UNSIGNED_BYTE, (short) EntityTypes1_8.EntityType.MAGMA_CUBE.getId());
+        spawnMob.write(Types.INT, 0); // X
+        spawnMob.write(Types.INT, 0); // Y
+        spawnMob.write(Types.INT, 0); // Z
+        spawnMob.write(Types.BYTE, (byte) 0); // Yaw
+        spawnMob.write(Types.BYTE, (byte) 0); // Pitch
+        spawnMob.write(Types.BYTE, (byte) 0); // Head yaw
+        spawnMob.write(Types.SHORT, (short) 0); // Velocity x
+        spawnMob.write(Types.SHORT, (short) 0); // Velocity y
+        spawnMob.write(Types.SHORT, (short) 0); // Velocity z
+        spawnMob.write(RewindTypes.ENTITY_DATA_LIST1_7, mobData);
+        spawnMob.scheduleSend(Protocol1_8To1_7_6_10.class);
+
+        final PacketWrapper attach = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_ENTITY_LINK, user());
+        attach.write(Types.INT, entityId);
+        attach.write(Types.INT, playerEntityId);
+        attach.write(Types.BOOLEAN, false);
+        attach.scheduleSend(Protocol1_8To1_7_6_10.class);
+    }
+
+    private void despawnNametagHiderEntity(final int playerEntityId) {
+        if (!playerNametagHiderEntities.containsKey(playerEntityId)) return;
+        final int mobId = playerNametagHiderEntities.remove(playerEntityId);
+
+        final PacketWrapper despawn = PacketWrapper.create(ClientboundPackets1_7_2_5.REMOVE_ENTITIES, user());
+        despawn.write(Types.BYTE, (byte) 1);
+        despawn.write(Types.INT, mobId);
+        despawn.scheduleSend(Protocol1_8To1_7_6_10.class);
+    }
+
     public Int2ObjectMap<VirtualHologramEntity> getHolograms() {
         return holograms;
     }
 
+    public void setExtraHologramId(final int entityId, final int extraId) {
+        extraHologramIds.put(extraId, entityId);
+    }
+
+    public void removeExtraHologramId(int extraId) {
+        extraHologramIds.remove(extraId);
+    }
+
+    public int getHologramIdWithExtra(final int id) {
+        if (holograms.containsKey(id)) {
+            return id;
+        }
+        return extraHologramIds.getOrDefault(id, -1);
+    }
+
     public boolean isSpectator() {
         return clientEntityGameMode == 3;
     }

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/GameProfileStorage.java

@@ -17,6 +17,10 @@
  */
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Multimap;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
@@ -34,6 +38,7 @@ import java.util.UUID;
 
 public class GameProfileStorage extends StoredObject {
     private final Map<UUID, GameProfile> properties = new HashMap<>();
+    private final ListMultimap<String, GameProfile> nameToProfile = ArrayListMultimap.create();
 
     public GameProfileStorage(UserConnection user) {
         super(user);
@@ -42,6 +47,7 @@ public class GameProfileStorage extends StoredObject {
     public GameProfile put(UUID uuid, String name, String displayName, int ping, int gamemode) {
         GameProfile gameProfile = new GameProfile(uuid, name, displayName, ping, gamemode);
         properties.put(uuid, gameProfile);
+        nameToProfile.put(name, gameProfile);
         return gameProfile;
     }
 
@@ -49,19 +55,9 @@ public class GameProfileStorage extends StoredObject {
         return properties.get(uuid);
     }
 
-    public GameProfile get(String name, boolean ignoreCase) {
+    public List<GameProfile> get(String name, boolean ignoreCase) {
         if (ignoreCase) name = name.toLowerCase();
-
-        for (GameProfile profile : properties.values()) {
-            if (profile.name == null) continue;
-
-            String n = ignoreCase ? profile.name.toLowerCase() : profile.name;
-
-            if (n.equals(name)) {
-                return profile;
-            }
-        }
-        return null;
+        return nameToProfile.get(name);
     }
 
     public List<GameProfile> getAllWithPrefix(String prefix, boolean ignoreCase) {
@@ -81,7 +77,11 @@ public class GameProfileStorage extends StoredObject {
     }
 
     public GameProfile remove(UUID uuid) {
-        return properties.remove(uuid);
+        GameProfile removedProfile = properties.remove(uuid);
+        if (removedProfile != null) {
+            nameToProfile.get(removedProfile.name).remove(removedProfile);
+        }
+        return removedProfile;
     }
 
 

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/storage/ScoreboardTracker.java

@@ -37,6 +37,7 @@ public class ScoreboardTracker extends StoredObject {
     private final HashMap<String, Byte> teamColors = new HashMap<>();
     private final HashSet<String> scoreTeamNames = new HashSet<>();
     private final HashMap<Byte, String> colorDependentSidebar = new HashMap<>();
+    private final HashMap<String, String> teamNameTagVisibilities = new HashMap<>();
     private String colorIndependentSidebar;
 
     public ScoreboardTracker(UserConnection user) {
@@ -63,6 +64,7 @@ public class ScoreboardTracker extends StoredObject {
         teams.remove(team);
         scoreTeams.remove(team);
         teamColors.remove(team);
+        teamNameTagVisibilities.remove(team);
     }
 
     public boolean teamExists(String team) {
@@ -98,6 +100,27 @@ public class ScoreboardTracker extends StoredObject {
         return Optional.empty();
     }
 
+    public void setTeamNameTagVisibility(String team, String visibility) {
+        teamNameTagVisibilities.put(team, visibility);
+    }
+
+    public String getTeamNameTagVisibility(String team) {
+        return teamNameTagVisibilities.getOrDefault(team, "always");
+    }
+
+    public boolean isNametagHidden(String username) {
+        for (Map.Entry<String, List<String>> entry : teams.entrySet()) {
+            if (entry.getValue().contains(username)) {
+                return "never".equalsIgnoreCase(teamNameTagVisibilities.getOrDefault(entry.getKey(), "always"));
+            }
+        }
+        return false;
+    }
+
+    public List<String> getTeamMembers(String team) {
+        return teams.getOrDefault(team, new ArrayList<>());
+    }
+
     public void addObjective(String name) {
         objectives.add(name);
     }
@@ -117,37 +140,43 @@ public class ScoreboardTracker extends StoredObject {
     public String sendTeamForScore(String score) {
         if (score.length() <= 16) return score;
         if (scoreTeams.containsKey(score)) return scoreTeams.get(score).name;
-        int l = 16;
-        int i = Math.min(16, score.length() - 16);
-        String name = score.substring(i, i + l);
-        while (scoreTeamNames.contains(name) || teams.containsKey(name)) {
-            i--;
-            while (score.length() - l - i > 16) {
-                l--;
-                if (l < 1) return score;
-                i = Math.min(16, score.length() - l);
+
+        // Find the longest window score[i, i+l) that:
+        // - is not already claimed as a team name
+        // - keeps prefix (score[0,i)) at most 16 chars i <= 16
+        // - keeps suffix (score[i+l, end)) at most 16 chars score.length()-l-i <= 16
+        for (int l = 16; l >= 1; l--) {
+            final int iMax = Math.min(16, score.length() - l);
+            final int iMin = Math.max(0, score.length() - l - 16);
+            for (int i = iMax; i >= iMin; i--) {
+                final String name = score.substring(i, i + l);
+                if (scoreTeamNames.contains(name) || teams.containsKey(name)) {
+                    continue;
+                }
+
+                final String prefix = score.substring(0, i);
+                final String suffix = i + l >= score.length() ? "" : score.substring(i + l);
+
+                final ScoreTeam scoreTeam = new ScoreTeam(name, prefix, suffix);
+                scoreTeams.put(score, scoreTeam);
+                scoreTeamNames.add(name);
+
+                final PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
+                teamPacket.write(Types.STRING, name);
+                teamPacket.write(Types.BYTE, (byte) 0);
+                teamPacket.write(Types.STRING, "ViaRewind");
+                teamPacket.write(Types.STRING, prefix);
+                teamPacket.write(Types.STRING, suffix);
+                teamPacket.write(Types.BYTE, (byte) 0);
+                teamPacket.write(Types.SHORT, (short) 1);
+                teamPacket.write(Types.STRING, name);
+                teamPacket.send(Protocol1_8To1_7_6_10.class);
+
+                return name;
             }
-            name = score.substring(i, i + l);
         }
-        String prefix = score.substring(0, i);
-        String suffix = i + l >= score.length() ? "" : score.substring(i + l);
 
-        ScoreTeam scoreTeam = new ScoreTeam(name, prefix, suffix);
-        scoreTeams.put(score, scoreTeam);
-        scoreTeamNames.add(name);
-
-        PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
-        teamPacket.write(Types.STRING, name);
-        teamPacket.write(Types.BYTE, (byte) 0);
-        teamPacket.write(Types.STRING, "ViaRewind");
-        teamPacket.write(Types.STRING, prefix);
-        teamPacket.write(Types.STRING, suffix);
-        teamPacket.write(Types.BYTE, (byte) 0);
-        teamPacket.write(Types.SHORT, (short) 1);
-        teamPacket.write(Types.STRING, name);
-        teamPacket.send(Protocol1_8To1_7_6_10.class);
-
-        return name;
+        return score;
     }
 
     public String removeTeamForScore(String score) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/task/WorldBorderUpdateTask.java

@@ -35,6 +35,9 @@ public class WorldBorderUpdateTask implements Runnable {
     public void run() {
         for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
             final WorldBorderEmulator worldBorderEmulatorTracker = connection.get(WorldBorderEmulator.class);
+            if (worldBorderEmulatorTracker == null) {
+                continue;
+            }
             if (!worldBorderEmulatorTracker.isInit()) continue;
 
             final PlayerSessionStorage playerSession = connection.get(PlayerSessionStorage.class);

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/BlockItemPacketRewriter1_9.java

@@ -19,6 +19,7 @@ package com.viaversion.viarewind.protocol.v1_9to1_8.rewriter;
 
 import com.viaversion.nbt.tag.ByteTag;
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
@@ -194,6 +195,7 @@ public class BlockItemPacketRewriter1_9 extends VRBlockItemRewriter<ClientboundP
     @Override
     public Item handleItemToClient(UserConnection connection, Item item) {
         if (item == null) return null;
+        final int originalId = item.identifier();
         super.handleItemToClient(connection, item);
 
         CompoundTag tag = item.tag();
@@ -280,6 +282,32 @@ public class BlockItemPacketRewriter1_9 extends VRBlockItemRewriter<ClientboundP
             });
         }
 
+        // Colors the fake leather armor for an elytra gray
+        if (originalId == 443) {
+            if (tag == null) {
+                item.setTag(tag = new CompoundTag());
+            }
+            CompoundTag display = tag.getCompoundTag("display");
+            if (display == null) {
+                tag.put("display", display = new CompoundTag());
+            }
+            display.put("color", new IntTag(0x737373)); // Gray
+            tag.put(nbtTagName() + "|noDisplay", new ByteTag(true));
+        }
+
+        // Makes the fake banner for a shield brown if it has no banner patterns
+        if (originalId == 442) {
+            final CompoundTag blockEntityTag = tag == null ? null : tag.getCompoundTag("BlockEntityTag");
+            final ListTag<CompoundTag> patterns = blockEntityTag == null ? null : blockEntityTag.getListTag("Patterns", CompoundTag.class);
+            if (patterns == null || patterns.isEmpty()) {
+                item.setData((short) 3); // Brown
+                if (tag == null) {
+                    item.setTag(tag = new CompoundTag());
+                }
+                tag.put(nbtTagName() + "|noData", new ByteTag(true));
+            }
+        }
+
         return item;
     }
 
@@ -322,6 +350,9 @@ public class BlockItemPacketRewriter1_9 extends VRBlockItemRewriter<ClientboundP
         if (tag == null) {
             return item;
         }
+        if (tag.remove(nbtTagName() + "|noData") != null) {
+            item.setData((short) 0);
+        }
         final Tag noDisplayTag = tag.remove(nbtTagName() + "|noDisplay");
         if (noDisplayTag != null) {
             tag.remove("display");

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/PlayerPacketRewriter1_9.java

@@ -334,7 +334,12 @@ public class PlayerPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
             final PlayerPositionTracker storage = wrapper.user().get(PlayerPositionTracker.class);
             storage.sendAnimations();
             if (storage.getConfirmId() != -1) {
-                if (storage.getPosX() == x && storage.getPosY() == y && storage.getPosZ() == z && storage.getYaw() == yaw && storage.getPitch() == pitch) {
+                // 1.7 uses resynced hitbox minY for y however this can have small floating point error due to the calculations it does to get there on teleport confirm
+                // This Y error gets propagated from 1.7 to 1.8 to 1.9 which causes teleport confirmation to not properly be detected
+                // This fixes it similarly to how anticheats detect teleports: https://github.com/GrimAnticheat/Grim/blob/67aa3a9483a9b2a6987d594092697b4104c781f0/common/src/main/java/ac/grim/grimac/manager/SetbackTeleportUtil.java#L315
+                boolean closeEnoughY = Math.abs(storage.getPosY() - y) <= 1e-7;
+
+                if (storage.getPosX() == x && closeEnoughY && storage.getPosZ() == z && storage.getYaw() == yaw && storage.getPitch() == pitch) {
                     final PacketWrapper confirmTeleport = PacketWrapper.create(ServerboundPackets1_9.ACCEPT_TELEPORTATION, wrapper.user());
                     confirmTeleport.write(Types.VAR_INT, storage.getConfirmId());
                     confirmTeleport.sendToServer(Protocol1_9To1_8.class);
@@ -447,7 +452,7 @@ public class PlayerPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
                 map(Types.BLOCK_POSITION1_8); // Position
                 handler(wrapper -> {
                     for (int i = 0; i < 4; i++) {
-                        final JsonElement json = wrapper.read(RewindTypes.SIGN_COMPONENT);
+                        final JsonElement json = wrapper.read(Types.COMPONENT);
                         if (!json.isJsonPrimitive()) {
                             throw new IllegalStateException("Invalid sign text: " + StringUtil.forLogging(json));
                         }

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/WorldPacketRewriter1_9.java

@@ -92,9 +92,12 @@ public class WorldPacketRewriter1_9 extends RewriterBase<Protocol1_9To1_8> {
                     String name = wrapper.get(Types.STRING, 0);
                     name = protocol.getMappingData().getMappedNamedSound(name);
                     if (name == null) {
-                        wrapper.cancel();
-                    } else {
+                        return;
+                    }
+                    if (!name.isEmpty()) {
                         wrapper.set(Types.STRING, 0, name);
+                    } else {
+                        wrapper.cancel();
                     }
                 });
                 read(Types.VAR_INT); // Sound category

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/storage/EntityTracker1_9.java

@@ -18,6 +18,7 @@
 package com.viaversion.viarewind.protocol.v1_9to1_8.storage;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.entity.TrackedEntity;
 import com.viaversion.viaversion.api.minecraft.Vector;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_9;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -41,14 +42,14 @@ public class EntityTracker1_9 extends EntityTrackerBase {
     }
 
     @Override
-    public void removeEntity(int id) {
+    public TrackedEntity removeEntity(int id) {
         vehicles.remove(id);
         offsets.remove(id);
         status.remove(id);
 
         vehicles.forEach((vehicle, passengers) -> passengers.rem(id));
         vehicles.int2ObjectEntrySet().removeIf(entry -> entry.getValue().isEmpty());
-        super.removeEntity(id);
+        return super.removeEntity(id);
     }
 
     public void resetEntityOffset(final int id) {

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/storage/WindowTracker.java

@@ -52,11 +52,11 @@ public class WindowTracker extends StoredObject {
         openWindow.write(Types.UNSIGNED_BYTE, windowId);
         openWindow.write(Types.STRING, "minecraft:brewing_stand");
 
-        TextComponent title = new StringComponent().
-            append(new TranslationComponent("container.brewing")).
-            append(new StringComponent(": " + TextFormatting.DARK_GRAY)).
-            append(new StringComponent(amount + " " + TextFormatting.DARK_RED)).
-            append(new TranslationComponent("item.blazePowder.name", TextFormatting.DARK_RED));
+        TextComponent title = new StringComponent()
+            .append(new TranslationComponent("container.brewing"))
+            .append(new StringComponent(": ").formatted(TextFormatting.DARK_GRAY))
+            .append(new StringComponent(amount + " ").formatted(TextFormatting.DARK_RED))
+            .append(new TranslationComponent("item.blazePowder.name").formatted(TextFormatting.DARK_RED));
 
         openWindow.write(Types.COMPONENT, TextComponentSerializer.V1_8.serializeJson(title));
         openWindow.write(Types.UNSIGNED_BYTE, (short) 420);

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/CooldownIndicatorTask.java

@@ -26,7 +26,11 @@ public class CooldownIndicatorTask implements Runnable {
     @Override
     public void run() {
         for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
-            connection.get(CooldownStorage.class).tick(connection);
+            final CooldownStorage cooldown = connection.get(CooldownStorage.class);
+            if (cooldown == null) {
+                continue;
+            }
+            cooldown.tick(connection);
         }
     }
 }

common/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/task/LevitationUpdateTask.java

@@ -36,6 +36,9 @@ public class LevitationUpdateTask implements Runnable {
         }
         for (UserConnection connection : Via.getManager().getConnectionManager().getConnections()) {
             final LevitationStorage levitation = connection.get(LevitationStorage.class);
+            if (levitation == null) {
+                continue;
+            }
             if (!levitation.isActive()) {
                 continue;
             }

common/src/main/resources/assets/viarewind/data/item-mappings-1.8.json

@@ -126,6 +126,7 @@
     },
     "180": {
       "id": "128",
+      "data": "-1",
       "name": "1.8 Red Sandstone Stairs"
     },
     "181": {

fabric/src/main/resources/fabric.mod.json

@@ -13,7 +13,7 @@
   "icon": "assets/viarewind/textures/squarelogo.png",
   "environment": "*",
   "authors": [
-    "FlorianMichael/EnZaXD",
+    "Florian Reuth (EnZaXD)",
     "Gerrygames",
     "creeper123123321"
   ],
@@ -24,7 +24,7 @@
   },
   "depends": {
     "viafabric": ">=0.4.14",
-    "viabackwards": ">=5.7.0"
+    "viabackwards": ">=5.11.0"
   },
   "custom": {
     "modmenu:api": true,

gradle.properties

@@ -7,14 +7,14 @@ org.gradle.configuration-cache=true
 project_jvm_version=17
 
 project_group=com.viaversion
-project_version=4.0.13
+project_version=4.1.3
 project_description=ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions.
 
-publishing_dev_id=FlorianMichael
-publishing_dev_name=EnZaXD
-publishing_dev_mail=git@florianmichael.de
+publishing_dev_id=florianreuth
+publishing_dev_name=Florian Reuth
+publishing_dev_mail=git@florianreuth.de
 
 # Modrinth/Hangar Publishing
-minecraft_versions=1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
-minecraft_version_range=1.8-1.21.11
-velocity_version=3.3
+minecraft_versions=26.2, 26.1.2, 26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9, 1.8.8
+minecraft_version_range=1.8-26.2
+velocity_version=3.4-3.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,10 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

settings.gradle.kts

@@ -2,10 +2,11 @@ pluginManagement {
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        maven("https://maven.florianreuth.de/releases")
     }
 
     plugins {
-        id("de.florianmichael.baseproject.BaseProject") version "1.2.6"
+        id("de.florianreuth.baseproject") version "2.0.2"
         id("io.papermc.hangar-publish-plugin") version "0.1.4"
         id("net.raphimc.class-token-replacer") version "1.1.7"
         id("com.modrinth.minotaur") version "2.+"

sponge/src/main/resources/META-INF/sponge_plugins.json

@@ -13,7 +13,7 @@
     },
     "contributors": [
       {
-        "name": "FlorianMichael/EnZaXD",
+        "name": "Florian Reuth (EnZaXD)",
         "description": "Author"
       },
       {
@@ -36,11 +36,11 @@
       },
       {
         "id": "viaversion",
-        "version": "[5.7.0,)"
+        "version": "[5.11.0,)"
       },
       {
         "id": "viabackwards",
-        "version": "[5.7.0,)"
+        "version": "[5.11.0,)"
       }
     ]
   },

velocity/build.gradle.kts

@@ -1,4 +1,4 @@
 dependencies {
     compileOnly(project(":viarewind-common"))
-    compileOnly("com.velocitypowered:velocity-api:3.1.1")?.also { annotationProcessor(it) }
+    compileOnly("com.velocitypowered:velocity-api:3.4.0")?.also { annotationProcessor(it) }
 }

velocity/src/main/java/com/viaversion/viarewind/VelocityPlugin.java

@@ -34,7 +34,7 @@ import java.util.logging.Logger;
 @Plugin(id = "viarewind",
     name = "ViaRewind",
     version = ViaRewindPlatform.VERSION,
-    authors = {"FlorianMichael/EnZaXD", "Gerrygames", "creeper123123321"},
+    authors = {"EnZaXD", "Gerrygames", "creeper123123321"},
     description = "ViaVersion addon to allow 1.8.x and 1.7.x clients on newer server versions.",
     dependencies = {
         @Dependency(id = "viaversion"),
@@ -52,6 +52,7 @@ public class VelocityPlugin implements ViaRewindPlatform {
     @DataDirectory
     private Path configPath;
 
+    @SuppressWarnings("deprecation")
     @Subscribe(order = PostOrder.LATE)
     public void onProxyStart(ProxyInitializeEvent e) {
         this.logger = new LoggerWrapper(loggerSlf4j);