Codebase cleanup

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,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 6.1.0
       - name: Set up JDK 17
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # 5.1.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.0
         with:
           distribution: 'temurin'
           java-version: 17
@@ -24,7 +24,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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # 7.0.0
         with:
           name: Artifacts
           path: build/libs/

.github/workflows/publish.yml

@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
         with:
           persist-credentials: false
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # 5.0.0
+        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 6.1.0
       - name: Set up JDK 17
-        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # 5.1.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # 5.2.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.1")
-        compileOnly("com.viaversion:viabackwards:5.7.1")
+        compileOnly("com.viaversion:viaversion:5.7.2")
+        compileOnly("com.viaversion:viabackwards:5.7.2")
     }
 
     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")

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

@@ -55,8 +55,8 @@ public class ViaRewindConfig extends Config implements com.viaversion.viarewind.
         cooldownIndicator = CooldownIndicator.valueOf(getString("cooldown-indicator", "TITLE").toUpperCase());
         replaceAdventureMode = getBoolean("replace-adventure", false);
         replaceParticles = getBoolean("replace-particles", false);
-        maxBookPages = getInt("max-book-pages", 100);
-        maxBookPageSize = getInt("max-book-page-length", 5000);
+        maxBookPages = getInt("end-book-pages", 100);
+        maxBookPageSize = getInt("end-book-page-length", 5000);
         emulateWorldBorder = getBoolean("emulate-world-border", true);
         alwaysShowOriginalMobName = getBoolean("always-show-original-mob-name", true);
         worldBorderParticle = getString("world-border-particle", "fireworksSpark");

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

@@ -54,14 +54,14 @@ public interface ViaRewindConfig extends Config {
     /**
      * Max amount of pages for written books before a client gets kicked
      *
-     * @return the max amount of pages
+     * @return the end amount of pages
      */
     int getMaxBookPages();
 
     /**
      * Max amount of characters in the json (!) string of a book page before a client gets kicked
      *
-     * @return the max amount of characters
+     * @return the end amount of characters
      */
     int getMaxBookPageSize();
 

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

@@ -22,7 +22,7 @@ import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viarewind.ViaRewind;
 import java.util.logging.Logger;
 
-public class RewindMappingData extends BackwardsMappingData {
+public final class RewindMappingData extends BackwardsMappingData {
 
     public RewindMappingData(String unmappedVersion, String mappedVersion) {
         super(unmappedVersion, mappedVersion);
@@ -37,4 +37,5 @@ public class RewindMappingData extends BackwardsMappingData {
     protected CompoundTag readMappingsFile(String name) {
         return RewindMappingDataLoader.INSTANCE.loadNBTFromDir(name);
     }
+
 }

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

@@ -22,7 +22,7 @@ import com.viaversion.viarewind.ViaRewind;
 import java.io.File;
 import java.util.logging.Logger;
 
-public class RewindMappingDataLoader extends BackwardsMappingDataLoader {
+public final class RewindMappingDataLoader extends BackwardsMappingDataLoader {
 
     public static final RewindMappingDataLoader INSTANCE = new RewindMappingDataLoader();
 
@@ -30,7 +30,6 @@ public class RewindMappingDataLoader extends BackwardsMappingDataLoader {
         super(RewindMappingDataLoader.class, "assets/viarewind/data/");
     }
 
-
     @Override
     public Logger getLogger() {
         return ViaRewind.getPlatform().getLogger();
@@ -40,4 +39,5 @@ public class RewindMappingDataLoader extends BackwardsMappingDataLoader {
     public File getDataFolder() {
         return ViaRewind.getPlatform().getDataFolder();
     }
+
 }

common/src/main/java/com/viaversion/viarewind/api/minecraft/entitydata/EntityDataTypes1_7_6_10.java

@@ -23,6 +23,7 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 
 public enum EntityDataTypes1_7_6_10 implements EntityDataType {
+
     BYTE(0, Types.BYTE),
     SHORT(1, Types.SHORT),
     INT(2, Types.INT),
@@ -34,12 +35,12 @@ public enum EntityDataTypes1_7_6_10 implements EntityDataType {
     private final int typeID;
     private final Type<?> type;
 
-    EntityDataTypes1_7_6_10(int typeID, Type<?> type) {
+    EntityDataTypes1_7_6_10(final int typeID, final Type<?> type) {
         this.typeID = typeID;
         this.type = type;
     }
 
-    public static EntityDataTypes1_7_6_10 byId(int id) {
+    public static EntityDataTypes1_7_6_10 byId(final int id) {
         return values()[id];
     }
 
@@ -52,4 +53,5 @@ public enum EntityDataTypes1_7_6_10 implements EntityDataType {
     public Type<?> type() {
         return this.type;
     }
+
 }

common/src/main/java/com/viaversion/viarewind/api/minecraft/math/Box.java

@@ -17,20 +17,8 @@
  */
 package com.viaversion.viarewind.api.minecraft.math;
 
-public class AABB {
-    Vector3d min;
-    Vector3d max;
+import com.viaversion.viaversion.api.minecraft.Vector3d;
 
-    public AABB(Vector3d min, Vector3d max) {
-        this.min = min;
-        this.max = max;
-    }
+public record Box(Vector3d start, Vector3d end) {
 
-    public Vector3d getMin() {
-        return this.min;
-    }
-
-    public Vector3d getMax() {
-        return this.max;
-    }
 }

common/src/main/java/com/viaversion/viarewind/api/minecraft/math/Ray3d.java

@@ -1,36 +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.math;
-
-public class Ray3d {
-    Vector3d start;
-    Vector3d dir;
-
-    public Ray3d(Vector3d start, Vector3d dir) {
-        this.start = start;
-        this.dir = dir;
-    }
-
-    public Vector3d getStart() {
-        return this.start;
-    }
-
-    public Vector3d getDir() {
-        return this.dir;
-    }
-}

common/src/main/java/com/viaversion/viarewind/api/minecraft/math/RayTracing.java

@@ -17,42 +17,58 @@
  */
 package com.viaversion.viarewind.api.minecraft.math;
 
-public class RayTracing {
+import com.viaversion.viaversion.api.minecraft.Vector3d;
 
-    public static Vector3d trace(Ray3d ray, AABB aabb, double distance) {
-        Vector3d invDir = new Vector3d(1f / ray.dir.x, 1f / ray.dir.y, 1f / ray.dir.z);
+public final class RayTracing {
 
-        boolean signDirX = invDir.x < 0;
-        boolean signDirY = invDir.y < 0;
-        boolean signDirZ = invDir.z < 0;
+    public static Vector3d trace(final Box ray, final Box box, final double distance) {
+        final Vector3d invDir = new Vector3d(1f / ray.end().x(), 1f / ray.end().y(), 1f / ray.end().z());
 
-        Vector3d bbox = signDirX ? aabb.max : aabb.min;
-        double tmin = (bbox.x - ray.start.x) * invDir.x;
-        bbox = signDirX ? aabb.min : aabb.max;
-        double tmax = (bbox.x - ray.start.x) * invDir.x;
-        bbox = signDirY ? aabb.max : aabb.min;
-        double tymin = (bbox.y - ray.start.y) * invDir.y;
-        bbox = signDirY ? aabb.min : aabb.max;
-        double tymax = (bbox.y - ray.start.y) * invDir.y;
+        final boolean signDirX = invDir.x() < 0;
+        final boolean signDirY = invDir.y() < 0;
+        final boolean signDirZ = invDir.z() < 0;
 
-        if (tmin > tymax || tymin > tmax) return null;
+        Vector3d boundingBox = signDirX ? box.end() : box.start();
+        double tmin = (boundingBox.x() - ray.start().x()) * invDir.x();
+        boundingBox = signDirX ? box.start() : box.end();
+        double tmax = (boundingBox.x() - ray.start().x()) * invDir.x();
+        boundingBox = signDirY ? box.end() : box.start();
+        final double tymin = (boundingBox.y() - ray.start().y()) * invDir.y();
+        boundingBox = signDirY ? box.start() : box.end();
+        final double tymax = (boundingBox.y() - ray.start().y()) * invDir.y();
 
-        if (tymin > tmin) tmin = tymin;
+        if (tmin > tymax || tymin > tmax) {
+            return null;
+        }
 
-        if (tymax < tmax) tmax = tymax;
+        if (tymin > tmin) {
+            tmin = tymin;
+        }
+        if (tymax < tmax) {
+            tmax = tymax;
+        }
 
-        bbox = signDirZ ? aabb.max : aabb.min;
-        double tzmin = (bbox.z - ray.start.z) * invDir.z;
-        bbox = signDirZ ? aabb.min : aabb.max;
-        double tzmax = (bbox.z - ray.start.z) * invDir.z;
+        boundingBox = signDirZ ? box.end() : box.start();
+        double tzmin = (boundingBox.z() - ray.start().z()) * invDir.z();
+        boundingBox = signDirZ ? box.start() : box.end();
+        double tzmax = (boundingBox.z() - ray.start().z()) * invDir.z();
 
-        if (tmin > tzmax || tzmin > tmax) return null;
+        if (tmin > tzmax || tzmin > tmax) {
+            return null;
+        }
 
-        if (tzmin > tmin) tmin = tzmin;
+        if (tzmin > tmin) {
+            tmin = tzmin;
+        }
+        if (tzmax < tmax) {
+            tmax = tzmax;
+        }
 
-        if (tzmax < tmax) tmax = tzmax;
+        if (tmin <= distance && tmax > 0) {
+            // ray.start().clone().add(ray.dir().clone().normalize().multiply(tmin))
+        }
 
-        return tmin <= distance && tmax > 0 ? ray.start.clone().add(ray.dir.clone().normalize().multiply(tmin)) : null;
+        return null;
     }
 
 }

common/src/main/java/com/viaversion/viarewind/api/minecraft/math/Vector3d.java

@@ -1,128 +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.math;
-
-import java.util.Objects;
-
-public class Vector3d {
-    double x, y, z;
-
-    public Vector3d(double x, double y, double z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    public Vector3d() {
-    }
-
-    public void set(Vector3d vec) {
-        this.x = vec.x;
-        this.y = vec.y;
-        this.z = vec.z;
-    }
-
-    public Vector3d set(double x, double y, double z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        return this;
-    }
-
-    public Vector3d multiply(double a) {
-        this.x *= a;
-        this.y *= a;
-        this.z *= a;
-        return this;
-    }
-
-    public Vector3d add(Vector3d vec) {
-        this.x += vec.x;
-        this.y += vec.y;
-        this.z += vec.z;
-        return this;
-    }
-
-    public Vector3d substract(Vector3d vec) {
-        this.x -= vec.x;
-        this.y -= vec.y;
-        this.z -= vec.z;
-        return this;
-    }
-
-    public double length() {
-        return Math.sqrt(lengthSquared());
-    }
-
-    public double lengthSquared() {
-        return this.x * this.x + this.y * this.y + this.z * this.z;
-    }
-
-    public Vector3d normalize() {
-        double length = length();
-        multiply(1.0 / length);
-        return this;
-    }
-
-    @Override
-    public Vector3d clone() {
-        return new Vector3d(this.x, this.y, this.z);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Vector3d vector3d = (Vector3d) o;
-        return Double.compare(vector3d.x, x) == 0 && Double.compare(vector3d.y, y) == 0 && Double.compare(vector3d.z, z) == 0;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(x, y, z);
-    }
-
-    @Override
-    public String toString() {
-        return "Vector3d{" + "x=" + x + ", y=" + y + ", z=" + z + '}';
-    }
-
-    public double getX() {
-        return this.x;
-    }
-
-    public void setX(double x) {
-        this.x = x;
-    }
-
-    public double getY() {
-        return this.y;
-    }
-
-    public void setY(double y) {
-        this.y = y;
-    }
-
-    public double getZ() {
-        return this.z;
-    }
-
-    public void setZ(double z) {
-        this.z = z;
-    }
-}

common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/Protocol1_8To1_7_6_10.java

@@ -130,7 +130,6 @@ public class Protocol1_8To1_7_6_10 extends BackwardsProtocol<ClientboundPackets1
         connection.put(new GameProfileStorage(connection));
         connection.put(new ScoreboardTracker(connection));
         connection.put(new CompressionStatusTracker(connection));
-        connection.put(new WorldBorderEmulator(connection));
     }
 
     @Override

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

@@ -0,0 +1,149 @@
+/*
+ * 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 {
+    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()) {
+            for (JsonElement child : element.getAsJsonArray()) {
+                results.addAll(splitChatComponentByNewline(child, inheritedStyle));
+            }
+            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 = inheritedStyle.deepCopy();
+        for (Map.Entry<String, JsonElement> entry : obj.entrySet()) {
+            String key = entry.getKey();
+            if (!"text".equals(key) && !"extra".equals(key)) {
+                currentStyle.add(key, entry.getValue());
+            }
+        }
+
+        // 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()) {
+            results.add(currentStyle);
+            return results;
+        }
+
+        // Build lines by concatenating split pieces
+        List<JsonObject> currentLine = new ArrayList<>();
+        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 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;
+        }
+
+        JsonArray extra = new JsonArray();
+        for (int i = 1; i < lineParts.size(); i++) {
+            extra.add(lineParts.get(i));
+        }
+        first.add("extra", extra);
+        return first;
+    }
+}

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

@@ -18,13 +18,14 @@
 package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
 
 import com.viaversion.viarewind.api.minecraft.entitydata.EntityDataTypes1_7_6_10;
-import com.viaversion.viarewind.api.minecraft.math.AABB;
-import com.viaversion.viarewind.api.minecraft.math.Vector3d;
+import com.viaversion.viarewind.api.minecraft.math.Box;
 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.Vector3d;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_8;
@@ -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;
@@ -308,14 +328,14 @@ public class VirtualHologramEntity {
         }
     }
 
-    public AABB getBoundingBox() {
+    public Box getBoundingBox() {
         final double width = this.small ? 0.25 : 0.5;
         final double height = this.small ? 0.9875 : 1.975;
 
         final Vector3d min = new Vector3d(this.locX - width / 2, this.locY, this.locZ - width / 2);
         final Vector3d max = new Vector3d(this.locX + width / 2, this.locY + height, this.locZ + width / 2);
 
-        return new AABB(min, max);
+        return new Box(min, max);
     }
 
     private int additionalEntityId() {
@@ -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/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

@@ -21,15 +21,14 @@ import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viarewind.ViaRewind;
-import com.viaversion.viarewind.api.minecraft.math.AABB;
-import com.viaversion.viarewind.api.minecraft.math.Ray3d;
+import com.viaversion.viarewind.api.minecraft.math.Box;
 import com.viaversion.viarewind.api.minecraft.math.RayTracing;
-import com.viaversion.viarewind.api.minecraft.math.Vector3d;
 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_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 +45,7 @@ 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.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 +70,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);
+                        }
                     }
                 });
             }
@@ -130,8 +144,8 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                         return;
                     }
 
-                    // On 1.8 clients when the player respawns it keeps all metadata and sets player back to max HP
-                    // 1.7 clients do not copy the metadata but do set the health to max HP
+                    // On 1.8 clients when the player respawns it keeps all metadata and sets player back to end HP
+                    // 1.7 clients do not copy the metadata but do set the health to end HP
                     // to match the same client logic we remove the HP metadata as otherwise the client would be set to their old HP before respawning
                     final List<EntityData> entityDataList = new ArrayList<>(tracker.getEntityData());
                     entityDataList.removeIf(entityData -> entityData.id() == 6);
@@ -516,27 +530,29 @@ public class PlayerPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                     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 int entityId = tracker.getHologramIdWithExtra(wrapper.get(Types.VAR_INT, 0));
                     final PlayerSessionStorage position = wrapper.user().get(PlayerSessionStorage.class);
 
-                    if (!tracker.getHolograms().containsKey(entityId)) {
+                    if (entityId == -1) {
                         return;
                     }
-                    final AABB boundingBox = tracker.getHolograms().get(entityId).getBoundingBox();
+
+                    wrapper.set(Types.VAR_INT, 0, entityId);
+                    final Box boundingBox = tracker.getHolograms().get(entityId).getBoundingBox();
 
                     Vector3d pos = new Vector3d(position.getPosX(), position.getPosY() + 1.8, position.getPosZ());
                     double yaw = Math.toRadians(position.yaw);
                     double pitch = Math.toRadians(position.pitch);
 
                     Vector3d dir = new Vector3d(-Math.cos(pitch) * Math.sin(yaw), -Math.sin(pitch), Math.cos(pitch) * Math.cos(yaw));
-                    Ray3d ray = new Ray3d(pos, dir);
+                    Rotation ray = new Rotation(pos, dir);
                     Vector3d intersection = RayTracing.trace(ray, boundingBox, 5.0);
 
                     if (intersection == null) {
                         return;
                     }
-                    intersection.substract(boundingBox.getMin());
+                    intersection.substract(boundingBox.start());
 
                     wrapper.set(Types.VAR_INT, 1, 2);
                     wrapper.write(Types.FLOAT, (float) intersection.getX());

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/rewriter/WorldPacketRewriter1_8.java

@@ -24,6 +24,7 @@ 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.Particles1_8;
 import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.WorldBorderEmulator;
 import com.viaversion.viarewind.utils.ChatUtil;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
@@ -224,12 +225,7 @@ public class WorldPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                         columnData[i + 3] = data[column + i * columns];
                     }
 
-                    final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_ITEM_DATA, wrapper.user());
-                    mapData.write(Types.VAR_INT, id); // map id
-                    mapData.write(Types.SHORT, (short) columnData.length); // data length
-                    mapData.write(new FixedByteArrayType(columnData.length), columnData); // data
-
-                    mapData.send(Protocol1_8To1_7_6_10.class);
+                    sendMapItemData(wrapper.user(), id, columnData);
                 }
             }
 
@@ -242,12 +238,7 @@ public class WorldPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
                     iconData[i * 3 + 3] = icons[i * 4 + 2];
                 }
 
-                final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_ITEM_DATA, wrapper.user());
-                mapData.write(Types.VAR_INT, id); // map id
-                mapData.write(Types.SHORT, (short) iconData.length); // data length
-                mapData.write(new FixedByteArrayType(iconData.length), iconData); // data
-
-                mapData.send(Protocol1_8To1_7_6_10.class);
+                sendMapItemData(wrapper.user(), id, iconData);
             }
 
             // Update scale
@@ -259,35 +250,55 @@ public class WorldPacketRewriter1_8 extends RewriterBase<Protocol1_8To1_7_6_10>
             mapData.send(Protocol1_8To1_7_6_10.class);
         });
 
-        protocol.registerClientbound(ClientboundPackets1_8.BLOCK_ENTITY_DATA, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.BLOCK_POSITION1_8, RewindTypes.SHORT_POSITION); // position
-                map(Types.UNSIGNED_BYTE); // action
-                map(Types.NAMED_COMPOUND_TAG, RewindTypes.COMPRESSED_NBT); // nbt
-            }
+        protocol.registerClientbound(ClientboundPackets1_8.BLOCK_ENTITY_DATA, wrapper -> {
+            wrapper.passthroughAndMap(Types.BLOCK_POSITION1_8, RewindTypes.SHORT_POSITION); // Position
+            wrapper.passthrough(Types.UNSIGNED_BYTE); // Action
+            wrapper.passthroughAndMap(Types.NAMED_COMPOUND_TAG, RewindTypes.COMPRESSED_NBT); // Tag
         });
 
         protocol.cancelClientbound(ClientboundPackets1_8.CHANGE_DIFFICULTY);
 
         protocol.registerClientbound(ClientboundPackets1_8.SET_BORDER, null, wrapper -> {
-            final WorldBorderEmulator emulator = wrapper.user().get(WorldBorderEmulator.class);
             wrapper.cancel();
-
             final int action = wrapper.read(Types.VAR_INT);
+            if (action == 3) { // initialize
+                final double x = wrapper.read(Types.DOUBLE);
+                final double z = wrapper.read(Types.DOUBLE);
+                final double oldRadius = wrapper.read(Types.DOUBLE);
+                final double newRadius = wrapper.read(Types.DOUBLE);
+                final long speed = wrapper.read(Types.VAR_LONG);
+
+                wrapper.user().put(new WorldBorderEmulator(wrapper.user(), x, z, oldRadius, newRadius, speed));
+            }
+
+            final WorldBorderEmulator emulator = wrapper.user().get(WorldBorderEmulator.class);
+            if (emulator == null) {
+                return;
+            }
+
             if (action == 0) { // set size
-                emulator.setSize(wrapper.read(Types.DOUBLE)); // radius
-            } else if (action == 1) { // lerp size
-                emulator.lerpSize(wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE), wrapper.read(Types.VAR_LONG)); // old radius, new radius, speed
+                final double radius = wrapper.read(Types.DOUBLE);
+                emulator.setSize(radius);
+            } else if (action == 1) { // delta size
+                final double oldRadius = wrapper.read(Types.DOUBLE);
+                final double newRadius = wrapper.read(Types.DOUBLE);
+                final long speed = wrapper.read(Types.VAR_LONG);
+                emulator.updateDeltaTime(oldRadius, newRadius, speed);
             } else if (action == 2) { // set center
-                emulator.setCenter(wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE)); // x, z
-            } else if (action == 3) { // initialize
-                emulator.init(
-                    wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE), // x, z
-                    wrapper.read(Types.DOUBLE), wrapper.read(Types.DOUBLE), // old radius, new radius
-                    wrapper.read(Types.VAR_LONG) // speed
-                );
+                final double x = wrapper.read(Types.DOUBLE);
+                final double z = wrapper.read(Types.DOUBLE);
+                emulator.setCenter(x, z);
             }
         });
     }
+
+    private void sendMapItemData(final UserConnection connection, final int id, final byte[] columnData) {
+        final PacketWrapper mapData = PacketWrapper.create(ClientboundPackets1_8.MAP_ITEM_DATA, connection);
+        mapData.write(Types.VAR_INT, id); // map id
+        mapData.write(Types.SHORT, (short) columnData.length); // data length
+        mapData.write(new FixedByteArrayType(columnData.length), columnData); // data
+
+        mapData.send(Protocol1_8To1_7_6_10.class);
+    }
+
 }

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

@@ -37,18 +37,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<>();
 
@@ -77,6 +85,10 @@ public class EntityTracker1_8 extends EntityTrackerBase {
             holograms.remove(entityId);
         }
 
+        if (playerNametagHiderEntities.containsKey(entityId)) {
+            despawnNametagHiderEntity(entityId);
+        }
+
         if (entityIdToUUID.containsKey(entityId)) {
             final UUID playerId = entityIdToUUID.remove(entityId);
 
@@ -88,7 +100,10 @@ public class EntityTracker1_8 extends EntityTrackerBase {
     @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,112 @@ 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 GameProfileStorage.GameProfile profile = profileStorage.get(username, false);
+        if (profile == null) {
+            return;
+        }
+
+        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/ScoreboardTracker.java

@@ -30,79 +30,101 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public class ScoreboardTracker extends StoredObject {
+public final class ScoreboardTracker extends StoredObject {
+
     private final HashMap<String, List<String>> teams = new HashMap<>();
     private final HashSet<String> objectives = new HashSet<>();
     private final HashMap<String, ScoreTeam> scoreTeams = new HashMap<>();
     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) {
+    public ScoreboardTracker(final UserConnection user) {
         super(user);
     }
 
-    public void addPlayerToTeam(String player, String team) {
+    public void addPlayerToTeam(final String player, final String team) {
         teams.computeIfAbsent(team, key -> new ArrayList<>()).add(player);
     }
 
-    public void setTeamColor(String team, Byte color) {
+    public void setTeamColor(final String team, final Byte color) {
         teamColors.put(team, color);
     }
 
-    public Optional<Byte> getTeamColor(String team) {
+    public Optional<Byte> getTeamColor(final String team) {
         return Optional.ofNullable(teamColors.get(team));
     }
 
-    public void addTeam(String team) {
+    public void addTeam(final String team) {
         teams.computeIfAbsent(team, key -> new ArrayList<>());
     }
 
-    public void removeTeam(String team) {
+    public void removeTeam(final String team) {
         teams.remove(team);
         scoreTeams.remove(team);
         teamColors.remove(team);
+        teamNameTagVisibilities.remove(team);
     }
 
-    public boolean teamExists(String team) {
+    public boolean teamExists(final String team) {
         return teams.containsKey(team);
     }
 
     public void removePlayerFromTeam(String player, String team) {
-        List<String> teamPlayers = teams.get(team);
-        if (teamPlayers != null) teamPlayers.remove(player);
+        final List<String> teamPlayers = teams.get(team);
+        if (teamPlayers != null) {
+            teamPlayers.remove(player);
+        }
     }
 
-    public boolean isPlayerInTeam(String player, String team) {
-        List<String> teamPlayers = teams.get(team);
+    public boolean isPlayerInTeam(final String player, final String team) {
+        final List<String> teamPlayers = teams.get(team);
         return teamPlayers != null && teamPlayers.contains(player);
     }
 
-    public boolean isPlayerInTeam(String player) {
-        for (List<String> teamPlayers : teams.values()) {
-            if (teamPlayers.contains(player)) return true;
+
+    public Optional<Byte> getPlayerTeamColor(final String player) {
+        final Optional<String> team = getTeam(player);
+        return team.flatMap(this::getTeamColor);
+    }
+
+    public Optional<String> getTeam(final String player) {
+        for (Map.Entry<String, List<String>> entry : teams.entrySet()) {
+            if (entry.getValue().contains(player)) {
+                return Optional.of(entry.getKey());
+            }
+        }
+        return Optional.empty();
+    }
+
+    public void setTeamNameTagVisibility(final String team, final String visibility) {
+        teamNameTagVisibilities.put(team, visibility);
+    }
+
+    public String getTeamNameTagVisibility(final String team) {
+        return teamNameTagVisibilities.getOrDefault(team, "always");
+    }
+
+    public boolean isNametagHidden(final String username) {
+        for (final Map.Entry<String, List<String>> entry : teams.entrySet()) {
+            if (entry.getValue().contains(username)) {
+                return "never".equalsIgnoreCase(teamNameTagVisibilities.getOrDefault(entry.getKey(), "always"));
+            }
         }
         return false;
     }
 
-    public Optional<Byte> getPlayerTeamColor(String player) {
-        Optional<String> team = getTeam(player);
-        return team.isPresent() ? getTeamColor(team.get()) : Optional.empty();
+    public List<String> getTeamMembers(final String team) {
+        return teams.getOrDefault(team, new ArrayList<>());
     }
 
-    public Optional<String> getTeam(String player) {
-        for (Map.Entry<String, List<String>> entry : teams.entrySet())
-            if (entry.getValue().contains(player))
-                return Optional.of(entry.getKey());
-        return Optional.empty();
-    }
-
-    public void addObjective(String name) {
+    public void addObjective(final String name) {
         objectives.add(name);
     }
 
-    public void removeObjective(String name) {
+    public void removeObjective(final String name) {
         objectives.remove(name);
         colorDependentSidebar.values().remove(name);
         if (name.equals(colorIndependentSidebar)) {
@@ -110,13 +132,19 @@ public class ScoreboardTracker extends StoredObject {
         }
     }
 
-    public boolean objectiveExists(String name) {
+    public boolean objectiveExists(final String name) {
         return objectives.contains(name);
     }
 
-    public String sendTeamForScore(String score) {
-        if (score.length() <= 16) return score;
-        if (scoreTeams.containsKey(score)) return scoreTeams.get(score).name;
+    public String sendTeamForScore(final 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);
@@ -124,19 +152,21 @@ public class ScoreboardTracker extends StoredObject {
             i--;
             while (score.length() - l - i > 16) {
                 l--;
-                if (l < 1) return score;
+                if (l < 1) {
+                    return score;
+                }
                 i = Math.min(16, score.length() - l);
             }
             name = score.substring(i, i + l);
         }
-        String prefix = score.substring(0, i);
-        String suffix = i + l >= score.length() ? "" : score.substring(i + l);
+        final String prefix = score.substring(0, i);
+        final String suffix = i + l >= score.length() ? "" : score.substring(i + l);
 
-        ScoreTeam scoreTeam = new ScoreTeam(name, prefix, suffix);
+        final 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());
+        PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, user());
         teamPacket.write(Types.STRING, name);
         teamPacket.write(Types.BYTE, (byte) 0);
         teamPacket.write(Types.STRING, "ViaRewind");
@@ -150,12 +180,15 @@ public class ScoreboardTracker extends StoredObject {
         return name;
     }
 
-    public String removeTeamForScore(String score) {
-        ScoreTeam scoreTeam = scoreTeams.remove(score);
-        if (scoreTeam == null) return score;
+    public String removeTeamForScore(final String score) {
+        final ScoreTeam scoreTeam = scoreTeams.remove(score);
+        if (scoreTeam == null) {
+            return score;
+        }
+
         scoreTeamNames.remove(scoreTeam.name);
 
-        PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, getUser());
+        final PacketWrapper teamPacket = PacketWrapper.create(ClientboundPackets1_7_2_5.SET_PLAYER_TEAM, user());
         teamPacket.write(Types.STRING, scoreTeam.name);
         teamPacket.write(Types.BYTE, (byte) 1);
         teamPacket.send(Protocol1_8To1_7_6_10.class);
@@ -167,7 +200,7 @@ public class ScoreboardTracker extends StoredObject {
         return this.colorIndependentSidebar;
     }
 
-    public void setColorIndependentSidebar(String colorIndependentSidebar) {
+    public void setColorIndependentSidebar(final String colorIndependentSidebar) {
         this.colorIndependentSidebar = colorIndependentSidebar;
     }
 
@@ -175,15 +208,6 @@ public class ScoreboardTracker extends StoredObject {
         return this.colorDependentSidebar;
     }
 
-    private static class ScoreTeam {
-        private final String prefix;
-        private final String suffix;
-        private final String name;
-
-        public ScoreTeam(String name, String prefix, String suffix) {
-            this.prefix = prefix;
-            this.suffix = suffix;
-            this.name = name;
-        }
+    private record ScoreTeam(String name, String prefix, String suffix) {
     }
 }

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

@@ -19,63 +19,54 @@ package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage;
 
 import com.viaversion.viaversion.api.connection.StoredObject;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.util.MathUtil;
+
+public final class WorldBorderEmulator extends StoredObject {
 
-public class WorldBorderEmulator extends StoredObject {
     private double x, z;
     private double oldDiameter, newDiameter;
 
-    private long lerpTime;
-    private long lerpStartTime;
+    private long deltaTime;
+    private long deltaStartTime;
 
-    private boolean init = false;
-
-    public WorldBorderEmulator(UserConnection user) {
+    public WorldBorderEmulator(UserConnection user, final double x, final double z, final double oldDiameter, final double newDiameter, final long deltaTime) {
         super(user);
-    }
 
-    public void init(double x, double z, double oldDiameter, double newDiameter, long lerpTime) {
         this.x = x;
         this.z = z;
 
         this.oldDiameter = oldDiameter;
         this.newDiameter = newDiameter;
 
-        this.lerpTime = lerpTime;
-
-        init = true;
+        this.deltaTime = deltaTime;
     }
 
-    public void setCenter(double x, double z) {
+    public void setCenter(final double x, final double z) {
         this.x = x;
         this.z = z;
     }
 
-    public void lerpSize(double oldDiameter, double newDiameter, long lerpTime) {
+    public void updateDeltaTime(final double oldDiameter, final double newDiameter, final long deltaTime) {
         this.oldDiameter = oldDiameter;
         this.newDiameter = newDiameter;
-        this.lerpTime = lerpTime;
-        this.lerpStartTime = System.currentTimeMillis();
+        this.deltaTime = deltaTime;
+        this.deltaStartTime = System.currentTimeMillis();
     }
 
     public double getSize() {
-        if (lerpTime == 0) {
+        if (deltaTime == 0) {
             return newDiameter;
         }
 
-        double percent = ((double) (System.currentTimeMillis() - lerpStartTime) / (double) (lerpTime));
-
-        // Clamp value
-        if (percent > 1.0D) percent = 1.0d;
-        else if (percent < 0.0D) percent = 0.0d;
-
-        return oldDiameter + (newDiameter - oldDiameter) * percent;
+        final double percent = ((double) (System.currentTimeMillis() - deltaStartTime) / (double) (deltaTime));
+        return oldDiameter + (newDiameter - oldDiameter) * MathUtil.clamp(percent, 0D, 1D);
     }
 
-    public void setSize(double size) {
+    public void setSize(final double size) {
         this.oldDiameter = size;
         this.newDiameter = size;
 
-        this.lerpTime = 0;
+        this.deltaTime = 0;
     }
 
     public double getX() {
@@ -86,10 +77,6 @@ public class WorldBorderEmulator extends StoredObject {
         return z;
     }
 
-    public boolean isInit() {
-        return init;
-    }
-
     public enum Side {
         NORTH(0, -1),
         EAST(1, 0),
@@ -105,3 +92,4 @@ public class WorldBorderEmulator extends StoredObject {
         }
     }
 }
+

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.1"
+    "viabackwards": ">=5.7.2"
   },
   "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.14
+project_version=4.1.0-SNAPSHOT
 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.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.1.2
+velocity_version=3.4-3.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=0d585f69da091fc5b2beced877feab55a3064d43b8a1d46aeb07996b0915e0e0
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -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/2d6327017519d23b96af35865dc997fcb544fb40/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/.

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.1,)"
+        "version": "[5.7.2,)"
       },
       {
         "id": "viabackwards",
-        "version": "[5.7.1,)"
+        "version": "[5.7.2,)"
       }
     ]
   },

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);