5.5.0 Release

Prepare for the release later
Write empty tag if no shoulder data is present
2026-11-04 17:00:16 -05:00 · 2025-10-03 13:48:04 +02:00 · 2025-10-03 08:18:06 +02:00 · 2025-10-02 18:13:42 +02:00 · 2025-10-02 14:25:23 +02:00 · 2025-09-30 18:29:04 +02:00
158 changed files with 4815 additions and 570 deletions
@@ -10,13 +10,13 @@ jobs:

    steps:
    - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
      with:
        persist-credentials: false
    - name: Set up Gradle
      uses: gradle/actions/setup-gradle@v4
    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
      with:
        distribution: 'temurin'
        java-version: 17
@@ -12,19 +12,26 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
        with:
          persist-credentials: false
      - name: Set up Gradle
        uses: gradle/actions/setup-gradle@v4
      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin'
          java-version: 17
          check-latest: true
-      - name: Publish
+      - name: Build
+        run: ./gradlew build
+      - name: Publish to Hangar
        env:
          HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
+        run: ./gradlew publishAllPublicationsToHangar --stacktrace
+        continue-on-error: true
+      - name: Publish to Modrinth
+        env:
          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-        run: ./gradlew build modrinth publishAllPublicationsToHangar  --refresh-dependencies --stacktrace
+        run: ./gradlew modrinth --stacktrace
+        continue-on-error: true
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
        with:
          persist-credentials: false
      - name: Update Gradle Wrapper
@@ -1,115 +1,36 @@
-### Java files ###
-*.class
+# Gradle

-# Package Files
-#*.jar
-*.war
-*.ear
+.gradle/
+build/
+out/
+classes/
+.kotlin/

-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# Eclipse

+*.launch

+# Idea

-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-# Ignore project files
-*.iml
-
-# Ignore IDEA directory
-.idea/*
+.idea/
 !.idea/copyright/*
 !.idea/scopes/*
-
-# Include the project's dictionary
-!.idea/dictionaries/
-!.idea/dictionaries/*
-
-# File-based project format:
+*.iml
 *.ipr
 *.iws

-### Plugin-specific files: ###
-# IntelliJ
-/out/
+# VSCode

-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-
-
-### Eclipse ###
-*.pydevproject
-.metadata
-.gradle
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
 .settings/
-.loadpath
-
-# Eclipse Core
+.vscode/
+bin/
+.classpath
 .project

-# External tool builders
-.externalToolBuilders/
+# macOS

-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-
-
-
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-nbactions.xml
-nb-configuration.xml
-.nb-gradle/
-
-### MacOS ###
 .DS_Store

-### Run Folder (ViaProxy) ###
-common/run/
+# Misc
+
+run/
@@ -0,0 +1,10 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you discover a **security vulnerability**, please **do not** open a public issue. Instead, use one of the following **confidential contact methods**:
+
+* **Email:** [security@viaversion.com](mailto:security@viaversion.com)
+* **Discord:** Join our [Discord server](https://discord.gg/viaversion) and visit the [#exploit-report](https://discord.com/channels/316206679014244363/1388847764137316485) channel for further instructions.
+
+If your issue is **not security-related** (e.g., bug reports, feature requests, or usage questions), please use the [GitHub Issues page](https://github.com/ViaVersion/ViaBackwards/issues) or contact us via the [Discord server](https://discord.gg/viaversion).
@@ -8,5 +8,7 @@ repositories {

 dependencies {
    // version must be manually kept in sync with the one in root project settings.gradle.kts
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:9.1.0")
+
+    // A nice no-conflict comment for patching in downgrading
 }
@@ -8,7 +8,7 @@ tasks {
        val ver = project.version.toString()
        val desc = project.description
        filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json")) {
-            expand("version" to ver, "description" to desc)
+            expand(mapOf("version" to ver, "description" to desc))
        }
    }
    javadoc {
@@ -18,6 +18,7 @@ tasks {
    compileJava {
        options.encoding = Charsets.UTF_8.name()
        options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation"))
+        options.isFork = true
    }
 }

@@ -14,6 +14,7 @@ tasks {
        from(project.rootProject.file("LICENSE"))
    }
    val shadowJar = named<ShadowJar>("shadowJar") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
        archiveClassifier.set("")
        configureRelocations()
    }
@@ -30,7 +30,7 @@ java {
 val prepareViaProxyFiles by tasks.registering(Copy::class) {
    dependsOn(project.tasks.shadowJar)

-    from(project.tasks.shadowJar.get().archiveFile.get().asFile)
+    from(project.tasks.shadowJar.map { it.archiveFile.get().asFile })
    into(layout.projectDirectory.dir("run/jars"))

    val projectName = project.name
@@ -17,7 +17,10 @@
 */
 package com.viaversion.viabackwards;

+import com.viaversion.viabackwards.api.DialogStyleConfig;
+import com.viaversion.viaversion.util.ChatColorUtil;
 import com.viaversion.viaversion.util.Config;
+import com.viaversion.viaversion.util.ConfigSection;
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
@@ -41,6 +44,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
    private boolean mapCustomModelData;
    private boolean mapDisplayEntities;
    private boolean suppressEmulationWarnings;
+    private DialogStyleConfig dialogStyleConfig;

    public ViaBackwardsConfig(File configFile, Logger logger) {
        super(configFile, logger);
@@ -66,6 +70,29 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
        mapCustomModelData = getBoolean("map-custom-model-data", true);
        mapDisplayEntities = getBoolean("map-display-entities", true);
        suppressEmulationWarnings = getBoolean("suppress-emulation-warnings", false);
+        dialogStyleConfig = loadDialogStyleConfig(getSection("dialog-style"));
+    }
+
+    private DialogStyleConfig loadDialogStyleConfig(final ConfigSection section) {
+        return new DialogStyleConfig(
+            getString(section, "page-navigation-title", "&9&lPage navigation"),
+            getString(section, "page-navigation-next", "&9Left click: &6Go to next page"),
+            getString(section, "page-navigation-previous", "&9Right click: &6Go to previous page"),
+            getString(section, "increase-value", "&9Left click: &6Increase value by %s"),
+            getString(section, "decrease-value", "&9Right click: &6Decrease value by %s"),
+            getString(section, "value-range", "&7(Value between &a%s &7and &a%s&7)"),
+            getString(section, "next-option", "&9Left click: &6Go to next option"),
+            getString(section, "previous-option", "&9Right click: &6Go to previous option"),
+            getString(section, "current-value", "&7Current value: &a%s"),
+            getString(section, "edit-value", "&9Left click: &6Edit text"),
+            getString(section, "set-text", "&9Left click/close: &6Set text"),
+            getString(section, "close", "&9Left click: &6Close"),
+            getString(section, "toggle-value", "&9Left click: &6Toggle value")
+        );
+    }
+
+    protected String getString(final ConfigSection section, final String key, final String def) {
+        return ChatColorUtil.translateAlternateColorCodes(section.getString(key, def));
    }

    @Override
@@ -133,6 +160,11 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
        return suppressEmulationWarnings;
    }

+    @Override
+    public DialogStyleConfig dialogStyleConfig() {
+        return dialogStyleConfig;
+    }
+
    @Override
    public URL getDefaultConfigURL() {
        return getClass().getClassLoader().getResource("assets/viabackwards/config.yml");
@@ -19,11 +19,13 @@ package com.viaversion.viabackwards.api;

 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.text.TranslatableRewriter;
+import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+import com.viaversion.viaversion.util.ProtocolLogger;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM extends ClientboundPacketType, SM extends ServerboundPacketType, SU extends ServerboundPacketType>
@@ -54,6 +56,11 @@ public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM ext
        }
    }

+    @Override
+    protected ProtocolLogger createLogger() {
+        return new BackwardsProtocolLogger(getClass());
+    }
+
    @Override
    public boolean hasMappingDataToLoad() {
        // Manually load them later, since they depend on VV's mappings
@@ -0,0 +1,25 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2025 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.viabackwards.api;
+
+public record DialogStyleConfig(String pageNavigationTitle, String pageNavigationNext, String pageNavigationPrevious,
+                                String increaseValue, String decreaseValue, String valueRange, String nextOption,
+                                String previousOption, String currentValue, String editValue, String setText,
+                                String close, String toggleValue) {
+
+}
@@ -112,4 +112,11 @@ public interface ViaBackwardsConfig extends Config {
     * @return true if enabled
     */
    boolean suppressEmulationWarnings();
+
+    /**
+     * Returns the dialog style configuration.
+     *
+     * @return the dialog style configuration
+     */
+    DialogStyleConfig dialogStyleConfig();
 }
@@ -21,48 +21,51 @@ package com.viaversion.viabackwards.api;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.ViaBackwardsConfig;
 import com.viaversion.viabackwards.api.data.TranslatableMappings;
-import com.viaversion.viabackwards.protocol.v1_11to1_10.Protocol1_11To1_10;
-import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
+import com.viaversion.viabackwards.protocol.v1_10to1_9_3.Protocol1_10To1_9_3;
 import com.viaversion.viabackwards.protocol.v1_11_1to1_11.Protocol1_11_1To1_11;
-import com.viaversion.viabackwards.protocol.v1_12_2to1_12_1.Protocol1_12_2To1_12_1;
-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2;
+import com.viaversion.viabackwards.protocol.v1_11to1_10.Protocol1_11To1_10;
 import com.viaversion.viabackwards.protocol.v1_12_1to1_12.Protocol1_12_1To1_12;
-import com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.Protocol1_13_2To1_13_1;
-import com.viaversion.viabackwards.protocol.v1_14to1_13_2.Protocol1_14To1_13_2;
+import com.viaversion.viabackwards.protocol.v1_12_2to1_12_1.Protocol1_12_2To1_12_1;
+import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
 import com.viaversion.viabackwards.protocol.v1_13_1to1_13.Protocol1_13_1To1_13;
+import com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.Protocol1_13_2To1_13_1;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2;
+import com.viaversion.viabackwards.protocol.v1_14_1to1_14.Protocol1_14_1To1_14;
 import com.viaversion.viabackwards.protocol.v1_14_2to1_14_1.Protocol1_14_2To1_14_1;
 import com.viaversion.viabackwards.protocol.v1_14_3to1_14_2.Protocol1_14_3To1_14_2;
 import com.viaversion.viabackwards.protocol.v1_14_4to1_14_3.Protocol1_14_4To1_14_3;
-import com.viaversion.viabackwards.protocol.v1_15to1_14_4.Protocol1_15To1_14_4;
-import com.viaversion.viabackwards.protocol.v1_14_1to1_14.Protocol1_14_1To1_14;
-import com.viaversion.viabackwards.protocol.v1_15_2to1_15_1.Protocol1_15_2To1_15_1;
-import com.viaversion.viabackwards.protocol.v1_16to1_15_2.Protocol1_16To1_15_2;
+import com.viaversion.viabackwards.protocol.v1_14to1_13_2.Protocol1_14To1_13_2;
 import com.viaversion.viabackwards.protocol.v1_15_1to1_15.Protocol1_15_1To1_15;
+import com.viaversion.viabackwards.protocol.v1_15_2to1_15_1.Protocol1_15_2To1_15_1;
+import com.viaversion.viabackwards.protocol.v1_15to1_14_4.Protocol1_15To1_14_4;
+import com.viaversion.viabackwards.protocol.v1_16_1to1_16.Protocol1_16_1To1_16;
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.Protocol1_16_2To1_16_1;
 import com.viaversion.viabackwards.protocol.v1_16_3to1_16_2.Protocol1_16_3To1_16_2;
 import com.viaversion.viabackwards.protocol.v1_16_4to1_16_3.Protocol1_16_4To1_16_3;
-import com.viaversion.viabackwards.protocol.v1_17to1_16_4.Protocol1_17To1_16_4;
-import com.viaversion.viabackwards.protocol.v1_16_1to1_16.Protocol1_16_1To1_16;
-import com.viaversion.viabackwards.protocol.v1_18to1_17_1.Protocol1_18To1_17_1;
+import com.viaversion.viabackwards.protocol.v1_16to1_15_2.Protocol1_16To1_15_2;
 import com.viaversion.viabackwards.protocol.v1_17_1to1_17.Protocol1_17_1To1_17;
-import com.viaversion.viabackwards.protocol.v1_19to1_18_2.Protocol1_19To1_18_2;
+import com.viaversion.viabackwards.protocol.v1_17to1_16_4.Protocol1_17To1_16_4;
 import com.viaversion.viabackwards.protocol.v1_18_2to1_18.Protocol1_18_2To1_18;
+import com.viaversion.viabackwards.protocol.v1_18to1_17_1.Protocol1_18To1_17_1;
+import com.viaversion.viabackwards.protocol.v1_19_1to1_19.Protocol1_19_1To1_19;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.Protocol1_19_3To1_19_1;
 import com.viaversion.viabackwards.protocol.v1_19_4to1_19_3.Protocol1_19_4To1_19_3;
-import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.Protocol1_21_4To1_21_2;
-import com.viaversion.viabackwards.protocol.v1_20to1_19_4.Protocol1_20To1_19_4;
-import com.viaversion.viabackwards.protocol.v1_19_1to1_19.Protocol1_19_1To1_19;
+import com.viaversion.viabackwards.protocol.v1_19to1_18_2.Protocol1_19To1_18_2;
+import com.viaversion.viabackwards.protocol.v1_20_2to1_20.Protocol1_20_2To1_20;
 import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.Protocol1_20_3To1_20_2;
 import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.Protocol1_20_5To1_20_3;
-import com.viaversion.viabackwards.protocol.v1_20_2to1_20.Protocol1_20_2To1_20;
+import com.viaversion.viabackwards.protocol.v1_20to1_19_4.Protocol1_20To1_19_4;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.task.PlayerPacketsTickTask;
+import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.Protocol1_21_4To1_21_2;
 import com.viaversion.viabackwards.protocol.v1_21_5to1_21_4.Protocol1_21_5To1_21_4;
-import com.viaversion.viabackwards.protocol.v1_21to1_20_5.Protocol1_21To1_20_5;
 import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.Protocol1_21_6To1_21_5;
-import com.viaversion.viabackwards.protocol.v1_9_3to1_9_1.Protocol1_9_3To1_9_1;
-import com.viaversion.viabackwards.protocol.v1_10to1_9_3.Protocol1_10To1_9_3;
+import com.viaversion.viabackwards.protocol.v1_21_6to1_21_5.task.ChestDialogViewTask;
+import com.viaversion.viabackwards.protocol.v1_21_7to1_21_6.Protocol1_21_7To1_21_6;
+import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.Protocol1_21_9To1_21_7;
+import com.viaversion.viabackwards.protocol.v1_21to1_20_5.Protocol1_21To1_20_5;
 import com.viaversion.viabackwards.protocol.v1_9_1to1_9.Protocol1_9_1To1_9;
+import com.viaversion.viabackwards.protocol.v1_9_3to1_9_1.Protocol1_9_3To1_9_1;
 import com.viaversion.viabackwards.utils.VersionInfo;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
@@ -74,7 +77,7 @@ import java.util.logging.Logger;

 public interface ViaBackwardsPlatform {

-    String MINIMUM_VV_VERSION = "5.4.0";
+    String MINIMUM_VV_VERSION = "5.5.0";

    /**
     * Initialize ViaBackwards.
@@ -151,6 +154,8 @@ public interface ViaBackwardsPlatform {
        protocolManager.registerProtocol(new Protocol1_21_5To1_21_4(), ProtocolVersion.v1_21_4, ProtocolVersion.v1_21_5);

        protocolManager.registerProtocol(new Protocol1_21_6To1_21_5(), ProtocolVersion.v1_21_5, ProtocolVersion.v1_21_6);
+        protocolManager.registerProtocol(new Protocol1_21_7To1_21_6(), ProtocolVersion.v1_21_6, ProtocolVersion.v1_21_7);
+        protocolManager.registerProtocol(new Protocol1_21_9To1_21_7(), ProtocolVersion.v1_21_7, ProtocolVersion.v1_21_9);
    }

    default void enable() {
@@ -158,6 +163,10 @@ public interface ViaBackwardsPlatform {
        if (protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_21_2)) {
            Via.getPlatform().runRepeatingSync(new PlayerPacketsTickTask(), 1L);
        }
+
+        if (protocolVersion.newerThanOrEqualTo(ProtocolVersion.v1_21_6)) {
+            Via.getPlatform().runRepeatingSync(new ChestDialogViewTask(), 20L);
+        }
    }

    /**
@@ -18,6 +18,10 @@
 package com.viaversion.viabackwards.api.data;

 import com.google.common.base.Preconditions;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.NumberTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.Via;
@@ -30,10 +34,6 @@ import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectArrayMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.NumberTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,10 +17,10 @@
 */
 package com.viaversion.viabackwards.api.data;

-import com.viaversion.viabackwards.ViaBackwards;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viabackwards.ViaBackwards;
+import com.viaversion.viaversion.api.data.MappingDataLoader;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
@@ -47,7 +47,10 @@ public class EntityPositionHandler {
    }

    public void cacheEntityPosition(PacketWrapper wrapper, double x, double y, double z, boolean create, boolean relative) {
-        int entityId = wrapper.get(Types.VAR_INT, 0);
+        cacheEntityPosition(wrapper, wrapper.get(Types.VAR_INT, 0), x, y, z, create, relative);
+    }
+
+    public void cacheEntityPosition(PacketWrapper wrapper, int entityId, double x, double y, double z, boolean create, boolean relative) {
        StoredEntityData storedEntity = entityRewriter.tracker(wrapper.user()).entityData(entityId);
        if (storedEntity == null) {
            if (Via.getManager().isDebug()) { // There is too many plugins violating this out there, and reading seems to be hard! :>
@@ -18,9 +18,9 @@

 package com.viaversion.viabackwards.api.entities.storage;

+import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viaversion.util.ComponentUtil;
 import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -26,11 +26,14 @@ import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.MappedItem;
+import com.viaversion.viabackwards.item.DataItemWithExtras;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.libs.gson.JsonElement;
+import java.util.List;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public class BackwardsItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
@@ -52,29 +55,45 @@ public class BackwardsItemRewriter<C extends ClientboundPacketType, S extends Se

        CompoundTag display = item.tag() != null ? item.tag().getCompoundTag("display") : null;
        if (protocol.getComponentRewriter() != null && display != null) {
-            // Handle name and lore components
-            StringTag name = display.getStringTag("Name");
-            if (name != null) {
-                String newValue = protocol.getComponentRewriter().processText(connection, name.getValue()).toString();
-                if (!newValue.equals(name.getValue())) {
-                    saveStringTag(display, name, "Name");
-                }
-
-                name.setValue(newValue);
+            final DataItemWithExtras fullItem;
+            if (item instanceof DataItemWithExtras) {
+                fullItem = (DataItemWithExtras) item;
+            } else {
+                item = fullItem = new DataItemWithExtras(item);
            }

-            ListTag<StringTag> lore = display.getListTag("Lore", StringTag.class);
+            // Handle name and lore components
+            final JsonElement name = fullItem.name();
+            if (name != null) {
+                final JsonElement updatedName = name.deepCopy();
+                protocol.getComponentRewriter().processText(connection, updatedName);
+                if (!updatedName.equals(name)) {
+                    final StringTag rawName = fullItem.rawName();
+                    saveStringTag(display, rawName, "Name");
+                    rawName.setValue(updatedName.toString());
+                }
+            }
+
+            final List<JsonElement> lore = fullItem.lore();
            if (lore != null) {
                boolean changed = false;
-                for (StringTag loreEntry : lore) {
-                    String newValue = protocol.getComponentRewriter().processText(connection, loreEntry.getValue()).toString();
-                    if (!changed && !newValue.equals(loreEntry.getValue())) {
-                        // Backup original lore before doing any modifications
-                        changed = true;
-                        saveListTag(display, lore, "Lore");
+                final ListTag<StringTag> rawLore = fullItem.rawLore();
+                for (int i = 0; i < lore.size(); i++) {
+                    final JsonElement loreEntry = lore.get(i);
+                    final JsonElement updatedLoreEntry = loreEntry.deepCopy();
+                    protocol.getComponentRewriter().processText(connection, updatedLoreEntry);
+                    if (updatedLoreEntry.equals(loreEntry)) {
+                        continue;
                    }

-                    loreEntry.setValue(newValue);
+                    if (!changed) {
+                        // Backup original lore before doing any modifications
+                        changed = true;
+                        saveListTag(display, rawLore, "Lore");
+                    }
+
+                    final StringTag rawLoreEntry = rawLore.get(i);
+                    rawLoreEntry.setValue(updatedLoreEntry.toString());
                }
            }
        }
@@ -113,7 +132,7 @@ public class BackwardsItemRewriter<C extends ClientboundPacketType, S extends Se
    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
        if (item == null) return null;

-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
        if (item.tag() != null) {
            Tag originalId = item.tag().remove(nbtTagName("id"));
            if (originalId instanceof IntTag) {
@@ -17,19 +17,17 @@
 */
 package com.viaversion.viabackwards.api.rewriters;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.rewriter.ItemRewriter;
-import java.util.ArrayList;
-import java.util.List;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public abstract class BackwardsItemRewriterBase<C extends ClientboundPacketType, S extends ServerboundPacketType,
@@ -49,7 +47,7 @@ public abstract class BackwardsItemRewriterBase<C extends ClientboundPacketType,
    @Override
    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
        if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        restoreDisplayTag(item);
        return item;
@@ -18,10 +18,11 @@
 package com.viaversion.viabackwards.api.rewriters;

 import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
+import com.viaversion.viaversion.util.Key;

 public class BackwardsRegistryRewriter extends RegistryDataRewriter {

@@ -32,6 +33,22 @@ public class BackwardsRegistryRewriter extends RegistryDataRewriter {
        this.protocol = protocol;
    }

+    @Override
+    public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
+        if (Key.stripMinecraftNamespace(key).equals("worldgen/biome")) {
+            for (final RegistryEntry entry : entries) {
+                final CompoundTag biome = (CompoundTag) entry.tag();
+                if (biome == null) {
+                    continue;
+                }
+
+                final CompoundTag effects = biome.getCompoundTag("effects");
+                updateBiomeEffects(effects);
+            }
+        }
+        return super.handle(connection, key, entries);
+    }
+
    @Override
    public void updateJukeboxSongs(final RegistryEntry[] entries) {
        for (final RegistryEntry entry : entries) {
@@ -39,13 +56,36 @@ public class BackwardsRegistryRewriter extends RegistryDataRewriter {
                continue;
            }

-            final StringTag soundEvent = ((CompoundTag) entry.tag()).getStringTag("sound_event");
-            if (soundEvent != null) {
-                final String mappedNamedSound = protocol.getMappingData().getMappedNamedSound(soundEvent.getValue());
-                if (mappedNamedSound != null) {
-                    soundEvent.setValue(mappedNamedSound);
-                }
-            }
+            updateSound((CompoundTag) entry.tag(), "sound_event");
+        }
+    }
+
+    private void updateBiomeEffects(final CompoundTag effects) {
+        updateSound(effects.getCompoundTag("mood_sound"), "sound");
+        updateSound(effects.getCompoundTag("additions_sound"), "sound");
+        updateSound(effects.getCompoundTag("music"), "sound");
+        updateSound(effects, "ambient_sound");
+    }
+
+    private void updateSound(final CompoundTag tag, final String name) {
+        if (tag == null) {
+            return;
+        }
+
+        final String sound = tag.getString(name);
+        if (sound == null) {
+            return;
+        }
+
+        final String mappedSound = protocol.getMappingData().getMappedNamedSound(sound);
+        if (mappedSound == null) {
+            return;
+        }
+
+        if (mappedSound.isEmpty()) {
+            tag.putString(name, "minecraft:intentionally_empty");
+        } else {
+            tag.putString(name, mappedSound);
        }
    }
 }
@@ -17,12 +17,12 @@
 */
 package com.viaversion.viabackwards.api.rewriters;

-import com.viaversion.viabackwards.utils.ChatUtil;
-import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viabackwards.utils.ChatUtil;
+import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.util.Key;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -175,7 +175,7 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
        filter().handler((event, data) -> {
            EntityDataType type = data.dataType();
            if (type == itemType) {
-                protocol.getItemRewriter().handleItemToClient(event.user(), data.value());
+                data.setValue(protocol.getItemRewriter().handleItemToClient(event.user(), data.value()));
            } else if (type == blockStateType) {
                int value = data.value();
                data.setValue(protocol.getMappingData().getNewBlockStateId(value));
@@ -208,9 +208,9 @@ public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S
    }

    @Override
-    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable final Item item) {
+    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
        if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
        if (item.tag() != null) {
            Tag originalId = item.tag().remove(nbtTagName("id"));
            if (originalId instanceof IntTag) {
@@ -17,7 +17,6 @@
 */
 package com.viaversion.viabackwards.api.rewriters;

-import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.nbt.tag.ByteTag;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.IntTag;
@@ -25,6 +24,7 @@ import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.api.minecraft.item.Item;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -86,7 +86,7 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex
                    clientWorld.setEnvironment(wrapper.get(Types.INT, 1));

                    final int entityId = wrapper.get(Types.INT, 0);
-                    addTrackedEntity(wrapper, entityId, playerType);
+                    tracker(wrapper.user()).addEntity(entityId, playerType);
                    tracker(wrapper.user()).setClientEntityId(entityId);
                });
            }
@@ -131,13 +131,13 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex
                return;
            }

-            addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), type);
+            tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), type);
        };
    }

    protected PacketHandler getTrackerAndDataHandler(Type<List<EntityData>> dataType, EntityType entityType) {
        return wrapper -> {
-            addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), entityType);
+            tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
            List<EntityData> entityDataList = wrapper.get(dataType, 0);
            handleEntityData(wrapper.get(Types.VAR_INT, 0), entityDataList, wrapper.user());
        };
@@ -162,11 +162,6 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex
        };
    }

-    @Deprecated
-    protected void addTrackedEntity(PacketWrapper wrapper, int entityId, EntityType type) {
-        tracker(wrapper.user()).addEntity(entityId, type);
-    }
-
    @FunctionalInterface
    protected interface IdSetter {

@@ -64,12 +64,11 @@ public class SoundRewriter<C extends ClientboundPacketType> extends com.viaversi
    public PacketHandler getStopSoundHandler() {
        return wrapper -> {
            final byte flags = wrapper.passthrough(Types.BYTE);
-            if ((flags & 0x02) == 0) return; // No sound specified
-
            if ((flags & 0x01) != 0) {
                wrapper.passthrough(Types.VAR_INT); // Source
            }

+            if ((flags & 0x02) == 0) return; // No sound specified
            final String soundId = wrapper.read(Types.STRING);
            final String mappedId = protocol.getMappingData().getMappedNamedSound(soundId);
            if (mappedId == null) {
@@ -0,0 +1,103 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2025 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.viabackwards.item;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viaversion.api.minecraft.item.DataItem;
+import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.libs.gson.JsonElement;
+import com.viaversion.viaversion.libs.gson.JsonParser;
+import com.viaversion.viaversion.libs.gson.JsonPrimitive;
+import com.viaversion.viaversion.libs.gson.JsonSyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+/**
+ * Prevent expensive parsing/toString by checking against cached JsonElement instances, used from 1.14 to 1.20.5.
+ * <p>
+ * When using this, be careful not to break caching by modifying the display tag directly.
+ */
+public final class DataItemWithExtras extends DataItem {
+
+    private JsonElement name;
+    private List<JsonElement> lore;
+
+    public DataItemWithExtras(final Item from) {
+        setIdentifier(from.identifier());
+        setAmount(from.amount());
+        setData(from.data());
+        setTag(from.tag());
+
+        if (tag() == null) {
+            return;
+        }
+
+        final CompoundTag display = tag().getCompoundTag("display");
+        if (display == null) {
+            return;
+        }
+
+        final StringTag name = display.getStringTag("Name");
+        if (name != null) {
+            this.name = parse(name.getValue());
+        }
+
+        final ListTag<StringTag> lore = display.getListTag("Lore", StringTag.class);
+        if (lore != null) {
+            this.lore = new ArrayList<>(lore.size());
+            for (int i = 0; i < lore.size(); i++) {
+                this.lore.add(parse(lore.get(i).getValue()));
+            }
+        }
+    }
+
+    public @Nullable JsonElement name() {
+        return name;
+    }
+
+    public @Nullable StringTag rawName() {
+        if (tag() == null) {
+            return null;
+        }
+        final CompoundTag display = tag().getCompoundTag("display");
+        return display != null ? display.getStringTag("Name") : null;
+    }
+
+    public @Nullable List<JsonElement> lore() {
+        return lore;
+    }
+
+    public @Nullable ListTag<StringTag> rawLore() {
+        if (tag() == null) {
+            return null;
+        }
+        final CompoundTag display = tag().getCompoundTag("display");
+        return display != null ? display.getListTag("Lore", StringTag.class) : null;
+    }
+
+    private JsonElement parse(final String value) {
+        try {
+            return JsonParser.parseString(value);
+        } catch (final JsonSyntaxException e) {
+            return new JsonPrimitive(value);
+        }
+    }
+}
@@ -38,7 +38,7 @@ final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_2

    @Override
    public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
+        registerTrackerWithData1_21_9(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA);
        registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);
        registerPlayerAbilities(ClientboundPackets1_21_2.PLAYER_ABILITIES);
@@ -52,7 +52,6 @@ import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 //   ServerboundConfigurationPackets1_20_5
 //   EntityTypes1_21_4 (UNMAPPED type)
 //   VersionedTypes.V1_21_5
-//   SerializerVersion.V1_21_5
 //   1.99, 1.98
 final class Protocol1_99To1_98 extends BackwardsProtocol<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_4, ServerboundPacket1_21_4> {

@@ -100,13 +99,13 @@ final class Protocol1_99To1_98 extends BackwardsProtocol<ClientboundPacket1_21_2

        // If needed for any particle, item, or block changes. Extend ParticleRewriter for particle serializer changes
        particleRewriter.registerLevelParticles1_21_4(ClientboundPackets1_21_2.LEVEL_PARTICLES);
-        particleRewriter.registerExplode1_21_2(ClientboundPackets1_21_2.EXPLODE);
+        particleRewriter.registerExplode1_21_9(ClientboundPackets1_21_2.EXPLODE);
    }

    @Override
    public void init(final UserConnection connection) {
        addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_4.PLAYER));
-        addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_5, SerializerVersion.V1_21_5));
+        addItemHasher(connection, new ItemHasherBase(this, connection));
    }

    @Override
@@ -157,6 +157,9 @@ public class EntityPacketRewriter1_10 extends LegacyEntityRewriter<ClientboundPa
            }
        });

+        // Added index from incorrect entity data hierarchy, where potions add to item entities
+        filter().type(EntityTypes1_10.EntityType.POTION).addIndex(6);
+
        // Handle the missing NoGravity tag for every entity data
        filter().removeIndex(5);
    }
@@ -23,8 +23,6 @@ import com.viaversion.viabackwards.api.rewriters.LegacyEnchantmentRewriter;
 import com.viaversion.viabackwards.protocol.v1_11_1to1_11.Protocol1_11_1To1_11;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
@@ -73,7 +71,7 @@ public class ItemPacketRewriter1_11_1 extends LegacyBlockItemRewriter<Clientboun
    @Override
    public Item handleItemToServer(UserConnection connection, Item item) {
        if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        enchantmentRewriter.handleToServer(item);
        return item;
@@ -18,6 +18,8 @@

 package com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.api.data.MappedLegacyBlockItem;
 import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter;
 import com.viaversion.viabackwards.api.rewriters.LegacyEnchantmentRewriter;
@@ -35,8 +37,6 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viaversion.protocols.v1_10to1_11.data.EntityMappings1_11;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
@@ -280,7 +280,7 @@ public class BlockItemPacketRewriter1_11 extends LegacyBlockItemRewriter<Clientb
    @Override
    public Item handleItemToServer(UserConnection connection, Item item) {
        if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        CompoundTag tag = item.tag();
        if (tag == null) return item;
@@ -20,11 +20,11 @@ package com.viaversion.viabackwards.protocol.v1_12to1_11_1;

 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.protocol.v1_12to1_11_1.storage.ShoulderTracker;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter.BlockItemPacketRewriter1_12;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter.ComponentRewriter1_12;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter.EntityPacketRewriter1_12;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter.SoundPacketRewriter1_12;
+import com.viaversion.viabackwards.protocol.v1_12to1_11_1.storage.ShoulderTracker;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12;
@@ -18,7 +18,11 @@

 package com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntArrayTag;
+import com.viaversion.nbt.tag.LongArrayTag;
 import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.data.MapColorMappings1_11_1;
@@ -30,18 +34,14 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.IntArrayTag;
-import com.viaversion.nbt.tag.LongArrayTag;
-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ServerboundPackets1_12;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
-import java.util.Iterator;
-import java.util.Map;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.SerializerVersion;
+import java.util.Iterator;
+import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public class BlockItemPacketRewriter1_12 extends LegacyBlockItemRewriter<ClientboundPackets1_12, ServerboundPackets1_9_3, Protocol1_12To1_11_1> {
@@ -238,7 +238,7 @@ public class BlockItemPacketRewriter1_12 extends LegacyBlockItemRewriter<Clientb
    @Override
    public @Nullable Item handleItemToServer(UserConnection connection, Item item) {
        if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        if (item.tag() != null) {
            if (item.tag().remove("Via|LongArrayTags") instanceof CompoundTag tag) {
@@ -21,7 +21,6 @@ package com.viaversion.viabackwards.protocol.v1_12to1_11_1.rewriter;
 import com.viaversion.viabackwards.api.rewriters.LegacySoundRewriter;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;

@@ -40,10 +40,10 @@ import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_13to1_13_1.Protocol1_13To1_13_1;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ComponentUtil;

 public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_13, ClientboundPackets1_13, ServerboundPackets1_13, ServerboundPackets1_13> {
@@ -90,16 +90,11 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
            }
        });

-        registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.ITEM1_13);
-                map(Types.BOOLEAN);
-                handler(wrapper -> {
-                    itemRewriter.handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_13, 0));
-                    wrapper.write(Types.VAR_INT, 0);
-                });
-            }
+        registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> {
+            final Item item = itemRewriter.handleItemToServer(wrapper.user(), wrapper.read(Types.ITEM1_13));
+            wrapper.write(Types.ITEM1_13, item);
+            wrapper.passthrough(Types.BOOLEAN);
+            wrapper.write(Types.VAR_INT, 0);
        });

        registerClientbound(ClientboundPackets1_13.OPEN_SCREEN, new PacketHandlers() {
@@ -181,8 +176,8 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
                if (wrapper.passthrough(Types.BOOLEAN)) {
                    wrapper.passthrough(Types.COMPONENT); // Title
                    wrapper.passthrough(Types.COMPONENT); // Description
-                    Item icon = wrapper.passthrough(Types.ITEM1_13);
-                    itemRewriter.handleItemToClient(wrapper.user(), icon);
+                    Item icon = itemRewriter.handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_13));
+                    wrapper.write(Types.ITEM1_13, icon);
                    wrapper.passthrough(Types.VAR_INT); // Frame type
                    int flags = wrapper.passthrough(Types.INT); // Flags
                    if ((flags & 1) != 0)
@@ -201,7 +196,9 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
        });

        tagRewriter.register(ClientboundPackets1_13.UPDATE_TAGS, RegistryType.ITEM);
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_13.AWARD_STATS);
+        new StatisticsRewriter<>(this).
+
+            register(ClientboundPackets1_13.AWARD_STATS);
    }

    @Override
@@ -131,7 +131,7 @@ public class EntityPacketRewriter1_13_1 extends LegacyEntityRewriter<Clientbound
        // Rewrite items & blocks
        filter().handler((event, data) -> {
            if (data.dataType() == Types1_13.ENTITY_DATA_TYPES.itemType) {
-                protocol.getItemRewriter().handleItemToClient(event.user(), (Item) data.getValue());
+                data.setValue(protocol.getItemRewriter().handleItemToClient(event.user(), (Item) data.getValue()));
            } else if (data.dataType() == Types1_13.ENTITY_DATA_TYPES.optionalBlockStateType) {
                // Convert to new block id
                int value = (int) data.getValue();
@@ -43,18 +43,12 @@ public class ItemPacketRewriter1_13_1 extends ItemRewriter<ClientboundPackets1_1

                int size = wrapper.passthrough(Types.UNSIGNED_BYTE);
                for (int i = 0; i < size; i++) {
-                    //Input Item
-                    Item input = wrapper.passthrough(Types.ITEM1_13);
-                    handleItemToClient(wrapper.user(), input);
-                    //Output Item
-                    Item output = wrapper.passthrough(Types.ITEM1_13);
-                    handleItemToClient(wrapper.user(), output);
+                    passthroughClientboundItem(wrapper); // Input
+                    passthroughClientboundItem(wrapper); // Output

                    boolean secondItem = wrapper.passthrough(Types.BOOLEAN); //Has second item
                    if (secondItem) {
-                        //Second Item
-                        Item second = wrapper.passthrough(Types.ITEM1_13);
-                        handleItemToClient(wrapper.user(), second);
+                        passthroughClientboundItem(wrapper); // Second item
                    }

                    wrapper.passthrough(Types.BOOLEAN); //Trade disabled
@@ -19,8 +19,8 @@ package com.viaversion.viabackwards.protocol.v1_13_1to1_13.rewriter;

 import com.viaversion.viabackwards.protocol.v1_13_1to1_13.Protocol1_13_1To1_13;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
-import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
@@ -23,7 +23,6 @@ import com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.rewriter.ItemPacketR
 import com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.rewriter.WorldPacketRewriter1_13_2;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.rewriter;

 import com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.Protocol1_13_2To1_13_1;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.rewriter;

 import com.viaversion.viabackwards.protocol.v1_13_2to1_13_1.Protocol1_13_2To1_13_1;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;

@@ -32,6 +32,7 @@ import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.BackwardsBlock
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.NoteBlockStorage;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.PlayerPositionStorage1_13;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.TabCompleteStorage;
+import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
@@ -40,11 +41,11 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.libs.gson.JsonParser;
+import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1;
-import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.ProtocolLogger;
@@ -53,7 +54,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_13, ClientboundPackets1_12_1, ServerboundPackets1_13, ServerboundPackets1_12_1> {

    public static final BackwardsMappingData1_13 MAPPINGS = new BackwardsMappingData1_13();
-    public static final ProtocolLogger LOGGER = new ProtocolLogger(Protocol1_13To1_12_2.class);
+    public static final ProtocolLogger LOGGER = new BackwardsProtocolLogger(Protocol1_13To1_12_2.class);
    private final EntityPacketRewriter1_13 entityRewriter = new EntityPacketRewriter1_13(this);
    private final BlockItemPacketRewriter1_13 blockItemPackets = new BlockItemPacketRewriter1_13(this);
    private final JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON) {
@@ -18,11 +18,11 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers;

-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2;
-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.NumberTag;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;

 public class BannerHandler implements BackwardsBlockEntityHandler {
    private static final int WALL_BANNER_START = 7110; // 4 each
@@ -18,8 +18,8 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers;

-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;

 public class BedHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {

@@ -18,10 +18,10 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.util.Pair;

 public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
@@ -17,16 +17,16 @@
 */
 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.MappingDataLoader;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.blockconnections.ConnectionData;
 import java.util.Map;
 import java.util.StringJoiner;
@@ -18,8 +18,8 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers;

-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider.BackwardsBlockEntityHandler;

 public class SkullHandler implements BackwardsBlockEntityHandler {
    private static final int SKULL_START = 5447;
@@ -18,10 +18,10 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers;

-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.data.EntityNameMappings1_12_2;
-import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.data.EntityNameMappings1_12_2;
+import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;

 public class SpawnerHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {

@@ -18,10 +18,10 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.data;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.StatisticMappings1_13;
 import java.util.HashMap;
@@ -18,6 +18,8 @@

 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers.BannerHandler;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers.BedHandler;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers.FlowerPotHandler;
@@ -28,8 +30,6 @@ import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.BackwardsBlock
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.platform.providers.Provider;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +19,13 @@
 package com.viaversion.viabackwards.protocol.v1_13to1_12_2.rewriter;

 import com.google.common.primitives.Ints;
+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.NumberTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter;
 import com.viaversion.viabackwards.api.rewriters.EnchantmentRewriter;
@@ -30,8 +37,8 @@ import com.viaversion.viabackwards.protocol.v1_13to1_12_2.storage.NoteBlockStora
 import com.viaversion.viaversion.api.Via;
 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.BlockPosition;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
@@ -42,19 +49,12 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3;
-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.NumberTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
+import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.BlockIdData;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.SpawnEggMappings1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1;
-import com.viaversion.viaversion.protocols.v1_12_2to1_13.Protocol1_12_2To1_13;
-import com.viaversion.viaversion.protocols.v1_12_2to1_13.data.BlockIdData;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.IdAndData;
 import com.viaversion.viaversion.util.Key;
@@ -260,8 +260,8 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou

                handler(wrapper -> {
                    final Item[] items = wrapper.get(Types.ITEM1_8_SHORT_ARRAY, 0);
-                    for (Item item : items) {
-                        handleItemToClient(wrapper.user(), item);
+                    for (int i = 0; i < items.length; i++) {
+                        items[i] = handleItemToClient(wrapper.user(), items[i]);
                    }
                });
            }
@@ -272,9 +272,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
            public void register() {
                map(Types.BYTE);
                map(Types.SHORT);
-                map(Types.ITEM1_13, Types.ITEM1_8);
-
-                handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
+                handler(wrapper -> passthroughClientboundItem(wrapper));
            }
        });

@@ -427,9 +425,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
            public void register() {
                map(Types.VAR_INT);
                map(Types.VAR_INT);
-                map(Types.ITEM1_13, Types.ITEM1_8);
-
-                handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
+                handler(wrapper -> passthroughClientboundItem(wrapper));
            }
        });

@@ -505,7 +501,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou

        if (rawId == null) {
            // Look for custom mappings
-            super.handleItemToClient(connection, item);
+            item = super.handleItemToClient(connection, item);

            // Handle one-way special case
            if (item.identifier() == -1) {
@@ -798,7 +794,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
        // Handle custom mappings
        int identifier = item.identifier();
        item.setIdentifier(rawId);
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        // Mapped with original data, we can return here
        if (item.identifier() != rawId && item.identifier() != -1) return item;
@@ -34,11 +34,11 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
+import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
+import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.rewriter.ItemPacketRewriter1_13;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1;
-import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
-import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.util.Key;
 import java.nio.charset.StandardCharsets;
@@ -18,7 +18,6 @@
 package com.viaversion.viabackwards.protocol.v1_14_3to1_14_2;

 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
@@ -19,7 +19,6 @@ package com.viaversion.viabackwards.protocol.v1_14_4to1_14_3;

 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPackets1_14;
@@ -24,6 +24,7 @@ import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.api.data.TranslatableMappings;
 import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter;
 import com.viaversion.viabackwards.api.rewriters.EnchantmentRewriter;
+import com.viaversion.viabackwards.item.DataItemWithExtras;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.Protocol1_14To1_13_2;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.ChunkLightStorage;
 import com.viaversion.viaversion.api.Via;
@@ -39,6 +40,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
+import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
@@ -61,7 +63,6 @@ import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.SerializerVersion;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;

@@ -222,9 +223,8 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
            public void register() {
                map(Types.VAR_INT); // 0 - Entity ID
                map(Types.VAR_INT); // 1 - Slot ID
-                map(Types.ITEM1_13_2); // 2 - Item

-                handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_13_2, 0)));
+                handler(wrapper -> passthroughClientboundItem(wrapper));

                handler(wrapper -> {
                    int entityId = wrapper.get(Types.VAR_INT, 0);
@@ -459,34 +459,37 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
    @Override
    public Item handleItemToClient(UserConnection connection, Item item) {
        if (item == null) return null;
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);

        // Lore now uses JSON
-        CompoundTag tag = item.tag();
-        CompoundTag display;
-        if (tag != null && (display = tag.getCompoundTag("display")) != null) {
-            ListTag<StringTag> lore = display.getListTag("Lore", StringTag.class);
-            if (lore != null) {
-                saveListTag(display, lore, "Lore");
+        final CompoundTag display = item.tag() != null ? item.tag().getCompoundTag("display") : null;
+        if (display != null && item instanceof DataItemWithExtras fullItem && fullItem.lore() != null) {
+            final List<JsonElement> lore = fullItem.lore();
+            final ListTag<StringTag> loreTag = fullItem.rawLore();
+            saveListTag(display, loreTag, "Lore");

-                try {
-                    final Iterator<StringTag> each = lore.iterator();
-                    while (each.hasNext()) {
-                        final StringTag loreEntry = each.next();
-                        final var component = SerializerVersion.V1_12.toComponent(loreEntry.getValue());
-                        if (component == null) {
-                            each.remove();
-                            continue;
-                        }
-                        TextUtils.setTranslator(component, s -> Protocol1_12_2To1_13.MAPPINGS.getMojangTranslation().
-                            getOrDefault(s, TranslatableMappings.getTranslatableMappings("1.14").get(s)));
-                        loreEntry.setValue(component.asLegacyFormatString());
+            try {
+                for (int i = 0; i < lore.size(); i++) {
+                    final JsonElement loreEntry = lore.get(i);
+                    final var component = SerializerVersion.V1_12.toComponent(loreEntry);
+                    if (component == null) {
+                        lore.remove(i);
+                        loreTag.remove(i);
+                        i--;
+                        continue;
                    }
-                } catch (final JsonParseException e) {
-                    display.remove("Lore");
+
+                    TextUtils.setTranslator(component, s -> Protocol1_12_2To1_13.MAPPINGS.getMojangTranslation()
+                        .getOrDefault(s, TranslatableMappings.getTranslatableMappings("1.14").get(s)));
+                    loreTag.get(i).setValue(component.asLegacyFormatString());
                }
+            } catch (final JsonParseException e) {
+                display.remove("Lore");
            }
        }
+        if (item instanceof DataItemWithExtras) {
+            item = new DataItem(item.identifier(), (byte) item.amount(), item.data(), item.tag()); // back to a normal DataItem
+        }

        enchantmentRewriter.handleToClient(item);
        return item;
@@ -512,7 +515,7 @@ public class BlockItemPacketRewriter1_14 extends BackwardsItemRewriter<Clientbou
        enchantmentRewriter.handleToServer(item);

        // Call this last to check for the backup lore above
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
        return item;
    }
 }
@@ -25,6 +25,7 @@ import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.ChunkLightStor
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.DifficultyStorage;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.EntityPositionStorage1_14;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Particle;
@@ -34,11 +35,13 @@ import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ClientboundPackets1_13;
+import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ClientboundPackets1_14;
 import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandler;

@@ -50,20 +53,6 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
        super(protocol, Types1_13_2.ENTITY_DATA_TYPES.optionalComponentType, Types1_13_2.ENTITY_DATA_TYPES.booleanType);
    }

-    //TODO work the method into this class alone
-    @Override
-    protected void addTrackedEntity(PacketWrapper wrapper, int entityId, EntityType type) {
-        super.addTrackedEntity(wrapper, entityId, type);
-
-        // Cache the position for every newly tracked entity
-        if (type == EntityTypes1_14.PAINTING) {
-            final BlockPosition position = wrapper.get(Types.BLOCK_POSITION1_8, 0);
-            positionHandler.cacheEntityPosition(wrapper, position.x(), position.y(), position.z(), true, false);
-        } else if (wrapper.getId() != ClientboundPackets1_14.LOGIN.getId()) { // ignore join game
-            positionHandler.cacheEntityPosition(wrapper, true, false);
-        }
-    }
-
    @Override
    protected void registerPackets() {
        positionHandler = new EntityPositionHandler(this, EntityPositionStorage1_14.class, EntityPositionStorage1_14::new);
@@ -133,7 +122,17 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                map(Types.SHORT); // 10 - Velocity Y
                map(Types.SHORT); // 11 - Velocity Z

-                handler(getObjectTrackerHandler());
+                handler(wrapper -> {
+                    final int type = wrapper.get(Types.BYTE, 0);
+                    final int data = wrapper.get(Types.INT, 0);
+
+                    final EntityType entityType = objectTypeFromId(type, data);
+                    if (entityType == null) {
+                        return;
+                    }
+
+                    trackAndCacheEntityPosition(wrapper, entityType);
+                });

                handler(wrapper -> {
                    int id = wrapper.get(Types.BYTE, 0);
@@ -224,7 +223,7 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                handler(wrapper -> {
                    int type = wrapper.get(Types.VAR_INT, 1);
                    EntityType entityType = EntityTypes1_14.getTypeFromId(type);
-                    addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), entityType);
+                    trackAndCacheEntityPosition(wrapper, entityType);

                    int oldId = newEntityId(type);
                    if (oldId == -1) {
@@ -252,7 +251,7 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                map(Types.DOUBLE); // Needs to be mapped for the position cache
                map(Types.DOUBLE);
                map(Types.DOUBLE);
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), EntityTypes1_14.EXPERIENCE_ORB));
+                handler(wrapper -> trackAndCacheEntityPosition(wrapper, EntityTypes1_14.EXPERIENCE_ORB));
            }
        });

@@ -264,7 +263,7 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                map(Types.DOUBLE); // Needs to be mapped for the position cache
                map(Types.DOUBLE);
                map(Types.DOUBLE);
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), EntityTypes1_14.LIGHTNING_BOLT));
+                handler(wrapper -> trackAndCacheEntityPosition(wrapper, EntityTypes1_14.LIGHTNING_BOLT));
            }
        });

@@ -278,7 +277,7 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                map(Types.BYTE);

                // Track entity
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), EntityTypes1_14.PAINTING));
+                handler(wrapper -> trackAndCacheEntityPosition(wrapper, EntityTypes1_14.PAINTING));
            }
        });

@@ -319,11 +318,10 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                    wrapper.passthrough(Types.STRING); // Level Type
                    wrapper.read(Types.VAR_INT); // Read View Distance

-                    //TODO Track client position
-                    // Manually add position storage
-                    /*int entitiyId = wrapper.get(Type.INT, 0);
-                    StoredEntityData storedEntity = protocol.getEntityRewriter().tracker(wrapper.user()).entityData(entitiyId);
-                    storedEntity.put(new EntityPositionStorage1_14());*/
+                    final int entityId = wrapper.get(Types.INT, 0);
+
+                    final StoredEntityData storedEntity = tracker(wrapper.user()).entityData(entityId);
+                    storedEntity.put(new EntityPositionStorage1_14());
                });
            }
        });
@@ -338,8 +336,10 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                    int dimensionId = wrapper.get(Types.INT, 0);

                    if (clientWorld.setEnvironment(dimensionId)) {
-                        tracker(wrapper.user()).clearEntities();
+                        EntityTracker tracker = tracker(wrapper.user());
+                        tracker.clearEntities();
                        wrapper.user().get(ChunkLightStorage.class).clear();
+                        tracker.entityData(tracker.clientEntityId()).put(new EntityPositionStorage1_14());
                    }

                    short difficulty = wrapper.user().get(DifficultyStorage.class).getDifficulty();
@@ -347,6 +347,27 @@ public class EntityPacketRewriter1_14 extends LegacyEntityRewriter<ClientboundPa
                });
            }
        });
+
+        PacketHandler absoluteMoveHandler = wrapper -> {
+            final double x = wrapper.passthrough(Types.DOUBLE);
+            final double y = wrapper.passthrough(Types.DOUBLE);
+            final double z = wrapper.passthrough(Types.DOUBLE);
+            positionHandler.cacheEntityPosition(wrapper, tracker(wrapper.user()).clientEntityId(), x, y, z, false, false);
+        };
+        protocol.registerServerbound(ServerboundPackets1_13.MOVE_PLAYER_POS, absoluteMoveHandler);
+        protocol.registerServerbound(ServerboundPackets1_13.MOVE_PLAYER_POS_ROT, absoluteMoveHandler);
+    }
+
+    private void trackAndCacheEntityPosition(PacketWrapper wrapper, EntityType type) {
+        // Tracks the entity + cache the position for the entity
+        tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), type);
+
+        if (type == EntityTypes1_14.PAINTING) {
+            final BlockPosition position = wrapper.get(Types.BLOCK_POSITION1_8, 0);
+            positionHandler.cacheEntityPosition(wrapper, position.x(), position.y(), position.z(), true, false);
+        } else {
+            positionHandler.cacheEntityPosition(wrapper, true, false);
+        }
    }

    @Override
@@ -17,7 +17,6 @@
 */
 package com.viaversion.viabackwards.protocol.v1_14to1_13_2.rewriter;

-import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.Protocol1_14To1_13_2;
 import com.viaversion.viabackwards.protocol.v1_14to1_13_2.storage.EntityPositionStorage1_14;
@@ -36,10 +36,10 @@ import com.viaversion.viaversion.protocols.v1_13_2to1_14.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_14_3to1_14_4.packet.ClientboundPackets1_14_4;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.Protocol1_14_4To1_15;
 import com.viaversion.viaversion.protocols.v1_14_4to1_15.packet.ClientboundPackets1_15;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;

 public class Protocol1_15To1_14_4 extends BackwardsProtocol<ClientboundPackets1_15, ClientboundPackets1_14_4, ServerboundPackets1_14, ServerboundPackets1_14> {

@@ -25,6 +25,7 @@ import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.BlockItemPa
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.CommandRewriter1_16_2;
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.rewriter.EntityPacketRewriter1_16_2;
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.storage.BiomeStorage;
+import com.viaversion.viabackwards.utils.BackwardsProtocolLogger;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
@@ -37,16 +38,16 @@ import com.viaversion.viaversion.protocols.v1_15_2to1_16.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.Protocol1_16_1To1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ProtocolLogger;

 public class Protocol1_16_2To1_16_1 extends BackwardsProtocol<ClientboundPackets1_16_2, ClientboundPackets1_16, ServerboundPackets1_16_2, ServerboundPackets1_16> {

    public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.16.2", "1.16", Protocol1_16_1To1_16_2.class);
-    public static final ProtocolLogger LOGGER = new ProtocolLogger(Protocol1_16_2To1_16_1.class);
+    public static final ProtocolLogger LOGGER = new BackwardsProtocolLogger(Protocol1_16_2To1_16_1.class);
    private final EntityPacketRewriter1_16_2 entityRewriter = new EntityPacketRewriter1_16_2(this);
    private final BlockItemPacketRewriter1_16_2 blockItemPackets = new BlockItemPacketRewriter1_16_2(this);
    private final ParticleRewriter<ClientboundPackets1_16_2> particleRewriter = new ParticleRewriter<>(this);
@@ -17,7 +17,6 @@
 */
 package com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.data;

-import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.data.BackwardsMappingDataLoader;
 import com.viaversion.viabackwards.protocol.v1_16_2to1_16_1.Protocol1_16_2To1_16_1;
 import com.viaversion.viaversion.api.Via;
@@ -21,7 +21,6 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.protocol.v1_16_4to1_16_3.storage.PlayerHandStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
@@ -262,7 +262,7 @@ public class BlockItemPacketRewriter1_16 extends BackwardsItemRewriter<Clientbou
    public Item handleItemToClient(UserConnection connection, Item item) {
        if (item == null) return null;

-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);

        CompoundTag tag = item.tag();
        if (item.identifier() == 771 && tag != null) {
@@ -297,7 +297,7 @@ public class BlockItemPacketRewriter1_16 extends BackwardsItemRewriter<Clientbou
        if (item == null) return null;

        int identifier = item.identifier();
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        CompoundTag tag = item.tag();
        if (identifier == 771 && tag != null) {
@@ -17,18 +17,16 @@
 */
 package com.viaversion.viabackwards.protocol.v1_17_1to1_17;

-import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.protocol.v1_17to1_16_4.storage.PlayerLastCursorItem;
-import com.viaversion.viabackwards.protocol.v1_17_1to1_17.storage.InventoryStateIds;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.protocol.v1_17_1to1_17.storage.InventoryStateIds;
+import com.viaversion.viabackwards.protocol.v1_17to1_16_4.storage.PlayerLastCursorItem;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1;
@@ -40,11 +40,11 @@ import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.Protocol1_16_4To1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.IdRewriteFunction;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.Key;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17,7 +17,9 @@
 */
 package com.viaversion.viabackwards.protocol.v1_18_2to1_18;

-import com.viaversion.viabackwards.ViaBackwards;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.protocol.v1_18_2to1_18.rewriter.CommandRewriter1_18_2;
 import com.viaversion.viaversion.api.Via;
@@ -25,9 +27,6 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18;
 import com.viaversion.viaversion.util.TagUtil;

@@ -33,9 +33,9 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18;
 import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;

 public final class Protocol1_18To1_17_1 extends BackwardsProtocol<ClientboundPackets1_18, ClientboundPackets1_17_1, ServerboundPackets1_17, ServerboundPackets1_17> {

@@ -17,11 +17,11 @@
 */
 package com.viaversion.viabackwards.protocol.v1_18to1_17_1.data;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.Protocol1_17_1To1_18;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.data.BlockEntities1_18;

@@ -17,6 +17,7 @@
 */
 package com.viaversion.viabackwards.protocol.v1_18to1_17_1.rewriter;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.rewriters.BackwardsItemRewriter;
 import com.viaversion.viabackwards.protocol.v1_18to1_17_1.Protocol1_18To1_17_1;
 import com.viaversion.viabackwards.protocol.v1_18to1_17_1.data.BlockEntityMappings1_17_1;
@@ -35,7 +36,6 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18;
 import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
@@ -112,7 +112,7 @@ public final class BlockItemPacketRewriter1_18 extends BackwardsItemRewriter<Cli
                        int data = wrapper.passthrough(Types.VAR_INT);
                        wrapper.set(Types.VAR_INT, 0, protocol.getMappingData().getNewBlockStateId(data));
                    } else if (mappings.isItemParticle(id)) {
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2));
+                        passthroughClientboundItem(wrapper);
                    }

                    int newId = protocol.getMappingData().getNewParticleId(id);
@@ -17,6 +17,9 @@
 */
 package com.viaversion.viabackwards.protocol.v1_19_1to1_19;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_19_1to1_19.rewriter.EntityPacketRewriter1_19_1;
@@ -40,17 +43,14 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
+import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPackets1_19;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.Protocol1_19To1_19_1;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1;
-import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19;
 import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.CipherUtil;
 import com.viaversion.viaversion.util.ComponentUtil;
@@ -17,10 +17,10 @@
 */
 package com.viaversion.viabackwards.protocol.v1_19_1to1_19.storage;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.Protocol1_18_2To1_19;
 import org.checkerframework.checker.nullness.qual.Nullable;

@@ -39,9 +39,4 @@ public abstract class ChatRegistryStorage implements StorableObject {
    public void clear() {
        chatTypes.clear();
    }
-
-    @Override
-    public boolean clearOnServerSwitch() {
-        return false;
-    }
 }
@@ -54,10 +54,10 @@ import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPac
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.CipherUtil;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.Pair;
@@ -17,13 +17,13 @@
 */
 package com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.data;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.data.BackwardsMappingDataLoader;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntMap;
 import com.viaversion.viaversion.libs.fastutil.objects.Object2IntOpenHashMap;
 import com.viaversion.viaversion.libs.gson.JsonArray;
 import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.Protocol1_19_1To1_19_3;
 import com.viaversion.viaversion.util.Key;

@@ -77,11 +77,11 @@ public final class BlockItemPacketRewriter1_19_3 extends BackwardsItemRewriter<C
                        final int ingredients = wrapper.passthrough(Types.VAR_INT);
                        for (int j = 0; j < ingredients; j++) {
                            final Item[] items = wrapper.passthrough(Types.ITEM1_13_2_ARRAY); // Ingredients
-                            for (final Item item : items) {
-                                handleItemToClient(wrapper.user(), item);
+                            for (int k = 0; k < items.length; k++) {
+                                items[k] = handleItemToClient(wrapper.user(), items[k]);
                            }
                        }
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // Result
                    }
                    case "crafting_shaped" -> {
                        final int ingredients = wrapper.passthrough(Types.VAR_INT) * wrapper.passthrough(Types.VAR_INT);
@@ -89,20 +89,20 @@ public final class BlockItemPacketRewriter1_19_3 extends BackwardsItemRewriter<C
                        wrapper.read(Types.VAR_INT); // Crafting book category
                        for (int j = 0; j < ingredients; j++) {
                            final Item[] items = wrapper.passthrough(Types.ITEM1_13_2_ARRAY); // Ingredients
-                            for (final Item item : items) {
-                                handleItemToClient(wrapper.user(), item);
+                            for (int k = 0; k < items.length; k++) {
+                                items[k] = handleItemToClient(wrapper.user(), items[k]);
                            }
                        }
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // Result
                    }
                    case "smelting", "campfire_cooking", "blasting", "smoking" -> {
                        wrapper.passthrough(Types.STRING); // Group
                        wrapper.read(Types.VAR_INT); // Crafting book category
                        final Item[] items = wrapper.passthrough(Types.ITEM1_13_2_ARRAY); // Ingredients
-                        for (final Item item : items) {
-                            handleItemToClient(wrapper.user(), item);
+                        for (int j = 0; j < items.length; j++) {
+                            items[j] = handleItemToClient(wrapper.user(), items[j]);
                        }
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // Result
                        wrapper.passthrough(Types.FLOAT); // EXP
                        wrapper.passthrough(Types.VAR_INT); // Cooking time
                    }
@@ -17,6 +17,9 @@
 */
 package com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.rewriter;

+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.Protocol1_19_3To1_19_1;
 import com.viaversion.viabackwards.protocol.v1_19_3to1_19_1.storage.ChatTypeStorage1_19_3;
@@ -31,9 +34,6 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_3;
 import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.NumberTag;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ClientboundPackets1_19_1;
@@ -34,10 +34,10 @@ import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;

@@ -268,7 +268,7 @@ public final class EntityPacketRewriter1_19_4 extends EntityRewriter<Clientbound

            final PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_19_3.SET_PASSENGERS, event.user());
            wrapper.write(Types.VAR_INT, event.entityId()); // Entity id
-            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[] { linkedEntity }); // Passenger entity ids
+            wrapper.write(Types.VAR_INT_ARRAY_PRIMITIVE, new int[]{linkedEntity}); // Passenger entity ids
            wrapper.send(Protocol1_19_4To1_19_3.class);
        });
        filter().type(EntityTypes1_19_4.ITEM_DISPLAY).index(22).handler((event, data) -> {
@@ -50,10 +50,10 @@ import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ServerboundPacke
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.Protocol1_19To1_19_1;
 import com.viaversion.viaversion.protocols.v1_19to1_19_1.data.ChatDecorationResult;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.Pair;
 import java.security.SignatureException;
 import java.time.Instant;
@@ -77,12 +77,12 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
                    final int size = wrapper.read(Types.VAR_INT);
                    wrapper.write(Types.UNSIGNED_BYTE, (short) size);
                    for (int i = 0; i < size; i++) {
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // First item
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // First item
+                        passthroughClientboundItem(wrapper); // Result

-                        final Item secondItem = wrapper.read(Types.ITEM1_13_2);
+                        Item secondItem = wrapper.read(Types.ITEM1_13_2);
                        if (secondItem != null) {
-                            handleItemToClient(wrapper.user(), secondItem);
+                            secondItem = handleItemToClient(wrapper.user(), secondItem);
                            wrapper.write(Types.BOOLEAN, true);
                            wrapper.write(Types.ITEM1_13_2, secondItem);
                        } else {
@@ -217,11 +217,11 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
    }

    @Override
-    public Item handleItemToClient(final UserConnection connection, final Item item) {
+    public Item handleItemToClient(final UserConnection connection, Item item) {
        if (item == null) return null;

        final int identifier = item.identifier();
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);

        if (identifier != 834) {
            return item;
@@ -246,10 +246,10 @@ public final class BlockItemPacketRewriter1_19 extends BackwardsItemRewriter<Cli
    }

    @Override
-    public Item handleItemToServer(final UserConnection connection, final Item item) {
+    public Item handleItemToServer(final UserConnection connection, Item item) {
        if (item == null) return null;

-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        CompoundTag tag = item.tag();
        if (item.identifier() == 834 && tag != null) {
@@ -190,7 +190,7 @@ public final class EntityPacketRewriter1_19 extends EntityRewriter<ClientboundPa
                        }
                    }
                    if (!found) {
-                        throw new IllegalStateException("Could not find dimension " + dimensionKey + " in dimension registry");
+                        throw new IllegalArgumentException("Could not find dimension " + dimensionKey + " in dimension registry");
                    }

                    // Add biome category and track biomes
@@ -17,14 +17,14 @@
 */
 package com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.Protocol1_19To1_18_2;
 import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
-import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.util.Key;
 import java.util.HashMap;
 import java.util.Map;
-import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public final class DimensionRegistryStorage implements StorableObject {
@@ -53,9 +53,4 @@ public final class DimensionRegistryStorage implements StorableObject {
        dimensions.clear();
        chatTypes.clear();
    }
-
-    @Override
-    public boolean clearOnServerSwitch() {
-        return false;
-    }
 }
@@ -161,7 +161,7 @@ public final class BlockItemPacketRewriter1_20_2 extends BackwardsItemRewriter<C
                if (wrapper.passthrough(Types.BOOLEAN)) {
                    wrapper.passthrough(Types.COMPONENT); // Title
                    wrapper.passthrough(Types.COMPONENT); // Description
-                    wrapper.write(Types.ITEM1_13_2, handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2))); // Icon
+                    passthroughClientboundItem(wrapper); // Icon
                    wrapper.passthrough(Types.VAR_INT); // Frame type
                    final int flags = wrapper.passthrough(Types.INT); // Flags
                    if ((flags & 1) != 0) {
@@ -17,6 +17,7 @@
 */
 package com.viaversion.viabackwards.protocol.v1_20_2to1_20.rewriter;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.Protocol1_20_2To1_20;
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.storage.ConfigurationPacketStorage;
@@ -29,7 +30,6 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_20;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_2;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_20to1_20_2.packet.ClientboundPackets1_20_2;

 public final class EntityPacketRewriter1_20_2 extends EntityRewriter<ClientboundPackets1_20_2, Protocol1_20_2To1_20> {
@@ -29,6 +29,7 @@ import com.viaversion.viabackwards.protocol.v1_20_3to1_20_2.storage.SpawnPositio
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_3;
+import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
@@ -151,7 +152,8 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol<ClientboundP
                if (wrapper.passthrough(Types.BOOLEAN)) {
                    convertComponent(wrapper); // Title
                    convertComponent(wrapper); // Description
-                    itemRewriter.handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_20_2)); // Icon
+                    final Item icon = itemRewriter.handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2));
+                    wrapper.write(Types.ITEM1_20_2, icon);
                    wrapper.passthrough(Types.VAR_INT); // Frame type
                    final int flags = wrapper.passthrough(Types.INT);
                    if ((flags & 1) != 0) {
@@ -21,9 +21,4 @@ import com.viaversion.viaversion.api.connection.StorableObject;
 import java.util.UUID;

 public record ResourcepackIDStorage(UUID uuid) implements StorableObject {
-
-    @Override
-    public boolean clearOnServerSwitch() {
-        return false;
-    }
 }
@@ -348,7 +348,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
    }

    @Override
-    public @Nullable Item handleItemToClient(final UserConnection connection, final Item item) {
+    public @Nullable Item handleItemToClient(final UserConnection connection, Item item) {
        if (item.isEmpty()) {
            // Back to null for the older protocols
            return null;
@@ -358,7 +358,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
        item.dataContainer().setIdLookup(protocol, true);
        enchantmentRewriter.handleToClient(item);

-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);

        // Text components since we skip the usual rewrite method
        updateTextComponent(connection, item, StructuredDataKey.ITEM_NAME, "item_name");
@@ -28,9 +28,4 @@ public final class CookieStorage implements StorableObject {
    public Map<String, byte[]> cookies() {
        return cookies;
    }
-
-    @Override
-    public boolean clearOnServerSwitch() {
-        return false;
-    }
 }
@@ -30,10 +30,10 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
-import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ArrayUtil;

 public final class Protocol1_20To1_19_4 extends BackwardsProtocol<ClientboundPackets1_19_4, ClientboundPackets1_19_4, ServerboundPackets1_19_4, ServerboundPackets1_19_4> {
@@ -17,9 +17,9 @@
 */
 package com.viaversion.viabackwards.protocol.v1_20to1_19_4.data;

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.data.BackwardsMappingDataLoader;
-import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viaversion.protocols.v1_19_4to1_20.Protocol1_19_4To1_20;

 public class BackwardsMappingData1_20 extends BackwardsMappingData {
@@ -112,7 +112,7 @@ public final class BlockItemPacketRewriter1_20 extends BackwardsItemRewriter<Cli
                if (wrapper.passthrough(Types.BOOLEAN)) {
                    wrapper.passthrough(Types.COMPONENT); // Title
                    wrapper.passthrough(Types.COMPONENT); // Description
-                    handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Icon
+                    passthroughClientboundItem(wrapper); // Icon
                    wrapper.passthrough(Types.VAR_INT); // Frame type
                    int flags = wrapper.passthrough(Types.INT); // Flags
                    if ((flags & 1) != 0) {
@@ -153,12 +153,12 @@ public final class BlockItemPacketRewriter1_20 extends BackwardsItemRewriter<Cli
    }

    @Override
-    public @Nullable Item handleItemToClient(UserConnection connection, @Nullable final Item item) {
+    public @Nullable Item handleItemToClient(UserConnection connection, @Nullable Item item) {
        if (item == null) {
            return null;
        }

-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);

        // Remove new trim tags
        final CompoundTag trimTag;
@@ -177,12 +177,12 @@ public final class BlockItemPacketRewriter1_20 extends BackwardsItemRewriter<Cli
    }

    @Override
-    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable final Item item) {
+    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
        if (item == null) {
            return null;
        }

-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);

        // Add back original trim tag
        final Tag trimTag;
@@ -18,6 +18,9 @@
 package com.viaversion.viabackwards.protocol.v1_20to1_19_4.rewriter;

 import com.google.common.collect.Sets;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_20to1_19_4.Protocol1_20To1_19_4;
 import com.viaversion.viaversion.api.minecraft.Quaternion;
@@ -29,9 +32,6 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_4;
 import com.viaversion.viaversion.api.type.types.version.Types1_20;
 import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.ListTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viaversion.util.Key;
 import java.util.Set;

@@ -42,6 +42,7 @@ import com.viaversion.viaversion.api.minecraft.item.data.Enchantments;
 import com.viaversion.viaversion.api.minecraft.item.data.Equippable;
 import com.viaversion.viaversion.api.minecraft.item.data.FoodProperties1_20_5;
 import com.viaversion.viaversion.api.minecraft.item.data.Instrument1_21_2;
+import com.viaversion.viaversion.api.minecraft.item.data.ItemModel;
 import com.viaversion.viaversion.api.minecraft.item.data.PotionEffect;
 import com.viaversion.viaversion.api.minecraft.item.data.PotionEffectData;
 import com.viaversion.viaversion.api.minecraft.item.data.UseCooldown;
@@ -296,16 +297,16 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
    }

    @Override
-    public Item handleItemToClient(final UserConnection connection, final Item item) {
+    public Item handleItemToClient(final UserConnection connection, Item item) {
        backupInconvertibleData(item);
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);
        downgradeItemData(item);
        return item;
    }

    @Override
-    public Item handleItemToServer(final UserConnection connection, final Item item) {
-        super.handleItemToServer(connection, item);
+    public Item handleItemToServer(final UserConnection connection, Item item) {
+        item = super.handleItemToServer(connection, item);

        // Handle food properties item manually here - the only protocol that has it
        // The other way around it's handled by the super handleItemToClient method
@@ -367,9 +368,9 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
            backupTag.put("use_cooldown", tag);
        }

-        final Key itemModel = data.get(StructuredDataKey.ITEM_MODEL);
+        final ItemModel itemModel = data.get(StructuredDataKey.ITEM_MODEL);
        if (itemModel != null) {
-            backupTag.putString("item_model", itemModel.original());
+            backupTag.putString("item_model", itemModel.key().original());
        }

        final Equippable equippable = data.get(StructuredDataKey.EQUIPPABLE1_21_2);
@@ -539,7 +540,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem

        final String itemModel = backupTag.getString("item_model");
        if (itemModel != null) {
-            data.set(StructuredDataKey.ITEM_MODEL, Key.of(itemModel));
+            data.set(StructuredDataKey.ITEM_MODEL, new ItemModel(Key.of(itemModel)));
        }

        final CompoundTag equippable = backupTag.getCompoundTag("equippable");
@@ -23,6 +23,7 @@ import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.ViaBackwards;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.PlayerStorage;
@@ -102,7 +103,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
            }
        });

-        final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter(protocol);
+        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol);
        registryDataRewriter.addEnchantmentEffectRewriter("change_item_damage", tag -> tag.putString("type", "damage_item"));
        protocol.registerClientbound(ClientboundConfigurationPackets1_21.REGISTRY_DATA, wrapper -> {
            final String registryKey = Key.stripMinecraftNamespace(wrapper.passthrough(Types.STRING));
@@ -316,14 +317,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound

            // Player input no longer sets the sneaking state on the server
            // Send the change separately if needed (= when in a vehicle and player commands aren't sent by the old client)
-            final PlayerStorage sneakingStorage = wrapper.user().get(PlayerStorage.class);
-            if (sneakingStorage.setSneaking(sneaking)) {
-                final PacketWrapper playerCommandPacket = wrapper.create(ServerboundPackets1_21_2.PLAYER_COMMAND);
-                playerCommandPacket.write(Types.VAR_INT, tracker(wrapper.user()).clientEntityId());
-                playerCommandPacket.write(Types.VAR_INT, sneaking ? 0 : 1); // Start/stop sneaking
-                playerCommandPacket.write(Types.VAR_INT, 0); // Data
-                playerCommandPacket.sendToServer(Protocol1_21_2To1_21.class);
-            }
+            sendSneakingPlayerCommand(wrapper, sneaking);
        });

        protocol.registerServerbound(ServerboundPackets1_20_5.MOVE_PLAYER_POS, wrapper -> {
@@ -416,6 +410,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
            final ClientVehicleStorage storage = wrapper.user().get(ClientVehicleStorage.class);
            if (storage != null && vehicleId == storage.vehicleId()) {
                wrapper.user().remove(ClientVehicleStorage.class);
+                sendSneakingPlayerCommand(wrapper, false);
            }

            final int clientEntityId = tracker(wrapper.user()).clientEntityId();
@@ -436,6 +431,7 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
            for (final int entityId : entityIds) {
                if (entityId == vehicleStorage.vehicleId()) {
                    wrapper.user().remove(ClientVehicleStorage.class);
+                    sendSneakingPlayerCommand(wrapper, false);
                    break;
                }
            }
@@ -561,6 +557,17 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
        }
    }

+    private void sendSneakingPlayerCommand(final PacketWrapper wrapper, final boolean sneaking) {
+        final PlayerStorage sneakingStorage = wrapper.user().get(PlayerStorage.class);
+        if (sneakingStorage.setSneaking(sneaking)) {
+            final PacketWrapper playerCommandPacket = wrapper.create(ServerboundPackets1_21_2.PLAYER_COMMAND);
+            playerCommandPacket.write(Types.VAR_INT, tracker(wrapper.user()).clientEntityId());
+            playerCommandPacket.write(Types.VAR_INT, sneaking ? 0 : 1); // Start/stop sneaking
+            playerCommandPacket.write(Types.VAR_INT, 0); // Data
+            playerCommandPacket.sendToServer(Protocol1_21_2To1_21.class);
+        }
+    }
+
    private int boatTypeFromEntityType(final EntityType type) {
        if (type == EntityTypes1_21_2.OAK_BOAT) {
            return 0;
@@ -168,7 +168,7 @@ public final class RecipeStorage implements StorableObject {
        final String[] recipeKeys = new String[recipes.size()];
        final List<String> highlightRecipes = new ArrayList<>();
        for (int i = 0; i < recipes.size(); i++) {
-            recipeKeys[i] = identifier(i);
+            recipeKeys[i] = identifier(recipes.get(i).index);
            if (recipes.get(i).highlight) {
                highlightRecipes.add(recipeKeys[i]);
            }
@@ -286,8 +286,7 @@ public final class RecipeStorage implements StorableObject {
                yield new Item[]{new StructuredItem(rewriteItemId(id), 1)};
            }
            case 3 -> {
-                final Item item = wrapper.read(VersionedTypes.V1_21_2.item());
-                protocol.getItemRewriter().handleItemToClient(wrapper.user(), item);
+                final Item item = protocol.getItemRewriter().handleItemToClient(wrapper.user(), wrapper.read(VersionedTypes.V1_21_2.item()));
                if (item.isEmpty()) {
                    protocol.getLogger().warning("Empty item in recipe");
                    yield new Item[0];
@@ -22,46 +22,45 @@ import com.viaversion.viabackwards.protocol.v1_21_2to1_21.Protocol1_21_2To1_21;
 import com.viaversion.viabackwards.protocol.v1_21_2to1_21.storage.PlayerStorage;
 import com.viaversion.viaversion.api.connection.ProtocolInfo;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
-import com.viaversion.viaversion.protocol.ProtocolRunnable;
+import com.viaversion.viaversion.connection.StorableObjectTask;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.storage.ClientVehicleStorage;
-import io.netty.channel.Channel;
 import java.util.logging.Level;

-public final class PlayerPacketsTickTask extends ProtocolRunnable {
+public final class PlayerPacketsTickTask extends StorableObjectTask<PlayerStorage> {

    public PlayerPacketsTickTask() {
-        super(Protocol1_21_2To1_21.class);
+        super(PlayerStorage.class);
    }

    @Override
-    public void run(final UserConnection connection) {
+    public void run(final UserConnection connection, final PlayerStorage storableObject) {
        final ProtocolInfo protocolInfo = connection.getProtocolInfo();
        if (protocolInfo.getClientState() != State.PLAY || protocolInfo.getServerState() != State.PLAY) {
            return;
        }

-        final Channel channel = connection.getChannel();
-        channel.eventLoop().submit(() -> {
-            if (!channel.isActive() || protocolInfo.getClientState() != State.PLAY || protocolInfo.getServerState() != State.PLAY) {
-                return;
+        final EntityTracker entityTracker = connection.getEntityTracker(Protocol1_21_2To1_21.class);
+        if (!entityTracker.hasClientEntityId()) {
+            return;
+        }
+
+        try {
+            if (!connection.has(ClientVehicleStorage.class)) {
+                storableObject.tick(connection);
            }
-            try {
-                if (!connection.has(ClientVehicleStorage.class)) {
-                    final PlayerStorage playerStorage = connection.get(PlayerStorage.class);
-                    playerStorage.tick(connection);
-                }
-            } catch (final Throwable t) {
-                ViaBackwards.getPlatform().getLogger().log(Level.SEVERE, "Error while sending player input packet.", t);
-            }
-            try {
-                final PacketWrapper clientTickEndPacket = PacketWrapper.create(ServerboundPackets1_21_2.CLIENT_TICK_END, connection);
-                clientTickEndPacket.sendToServer(Protocol1_21_2To1_21.class);
-            } catch (final Throwable t) {
-                ViaBackwards.getPlatform().getLogger().log(Level.SEVERE, "Error while sending client tick end packet.", t);
-            }
-        });
+        } catch (final Throwable t) {
+            ViaBackwards.getPlatform().getLogger().log(Level.SEVERE, "Error while sending player input packet.", t);
+        }
+
+        try {
+            final PacketWrapper clientTickEndPacket = PacketWrapper.create(ServerboundPackets1_21_2.CLIENT_TICK_END, connection);
+            clientTickEndPacket.sendToServer(Protocol1_21_2To1_21.class);
+        } catch (final Throwable t) {
+            ViaBackwards.getPlatform().getLogger().log(Level.SEVERE, "Error while sending client tick end packet.", t);
+        }
    }
 }
@@ -84,8 +84,8 @@ public final class BlockItemPacketRewriter1_21_4 extends BackwardsStructuredItem


    @Override
-    public Item handleItemToClient(final UserConnection connection, final Item item) {
-        super.handleItemToClient(connection, item);
+    public Item handleItemToClient(final UserConnection connection, Item item) {
+        item = super.handleItemToClient(connection, item);

        final StructuredDataContainer dataContainer = item.dataContainer();
        final CustomModelData1_21_4 modelData = dataContainer.get(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4);
@@ -103,8 +103,8 @@ public final class BlockItemPacketRewriter1_21_4 extends BackwardsStructuredItem
    }

    @Override
-    public Item handleItemToServer(final UserConnection connection, final Item item) {
-        super.handleItemToServer(connection, item);
+    public Item handleItemToServer(final UserConnection connection, Item item) {
+        item = super.handleItemToServer(connection, item);

        final StructuredDataContainer dataContainer = item.dataContainer();
        final CompoundTag customData = dataContainer.get(StructuredDataKey.CUSTOM_DATA);
@@ -19,6 +19,7 @@ package com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.rewriter;

 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
+import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_4to1_21_2.Protocol1_21_4To1_21_2;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -48,7 +49,7 @@ public final class EntityPacketRewriter1_21_4 extends EntityRewriter<Clientbound
        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA);
        registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);

-        final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter(protocol) {
+        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol) {
            @Override
            public RegistryEntry[] handle(final UserConnection connection, final String key, final RegistryEntry[] entries) {
                final String strippedKey = Key.stripMinecraftNamespace(key);
@@ -55,6 +55,7 @@ import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.Key;
+import com.viaversion.viaversion.util.Limit;

 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;

@@ -160,7 +161,7 @@ public final class Protocol1_21_5To1_21_4 extends BackwardsProtocol<ClientboundP
            wrapper.passthrough(Types.STRING); // Command
            wrapper.passthrough(Types.LONG); // Timestamp
            wrapper.passthrough(Types.LONG); // Salt
-            final int signatures = wrapper.passthrough(Types.VAR_INT);
+            final int signatures = Limit.max(wrapper.passthrough(Types.VAR_INT), 8);
            for (int i = 0; i < signatures; i++) {
                wrapper.passthrough(Types.STRING); // Argument name
                wrapper.passthrough(Types.SIGNATURE_BYTES); // Signature
@@ -78,6 +78,7 @@ import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.util.Either;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.Limit;
+import com.viaversion.viaversion.util.SerializerVersion;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -91,7 +92,7 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
    private static final int SIGN_BOCK_ENTITY_ID = 7;
    private static final int HANGING_SIGN_BOCK_ENTITY_ID = 8;
    private static final int SADDLE_EQUIPMENT_SLOT = 7;
-    private static final byte SADDLED_FLAG = 4;
+    static final byte SADDLED_FLAG = 4;

    public BlockItemPacketRewriter1_21_5(final Protocol1_21_5To1_21_4 protocol) {
        super(protocol);
@@ -187,7 +188,8 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
                final int equipmentSlot = value & 0x7F;
                if (equipmentSlot == SADDLE_EQUIPMENT_SLOT) {
                    if (trackedEntity != null && trackedEntity.entityType().isOrHasParent(EntityTypes1_21_5.ABSTRACT_HORSE)) {
-                        sendSaddledEntityData(wrapper.user(), trackedEntity, entityId);
+                        final Item item = wrapper.read(itemType());
+                        sendSaddledEntityData(wrapper.user(), trackedEntity, entityId, item.identifier() == 800);
                    }
                    wrapper.cancel();
                    return;
@@ -268,16 +270,24 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem
        wrapper.write(Types.STRING, namespace + ":textures/" + path + ".png");
    }

-    private void sendSaddledEntityData(final UserConnection connection, final TrackedEntity trackedEntity, final int entityId) {
+    private void sendSaddledEntityData(final UserConnection connection, final TrackedEntity trackedEntity, final int entityId, final boolean saddled) {
        byte data = 0;
        if (trackedEntity.hasData()) {
            final HorseDataStorage horseDataStorage = trackedEntity.data().get(HorseDataStorage.class);
            if (horseDataStorage != null) {
+                if (horseDataStorage.saddled() == saddled) {
+                    return;
+                }
+
                data = horseDataStorage.data();
            }
        }
-        trackedEntity.data().put(new HorseDataStorage(data, true));
-        data = (byte) (data | SADDLED_FLAG);
+
+        trackedEntity.data().put(new HorseDataStorage(data, saddled));
+
+        if (saddled) {
+            data = (byte) (data | SADDLED_FLAG);
+        }

        final PacketWrapper entityDataPacket = PacketWrapper.create(ClientboundPackets1_21_2.SET_ENTITY_DATA, connection);
        final List<EntityData> entityDataList = new ArrayList<>();
@@ -289,10 +299,19 @@ public final class BlockItemPacketRewriter1_21_5 extends BackwardsStructuredItem

    private void handleBlockEntity(final UserConnection connection, final BlockEntity blockEntity) {
        final CompoundTag tag = blockEntity.tag();
-        if (tag != null && (blockEntity.typeId() == SIGN_BOCK_ENTITY_ID || blockEntity.typeId() == HANGING_SIGN_BOCK_ENTITY_ID)) {
+        if (tag == null) {
+            return;
+        }
+
+        if (blockEntity.typeId() == SIGN_BOCK_ENTITY_ID || blockEntity.typeId() == HANGING_SIGN_BOCK_ENTITY_ID) {
            updateSignMessages(connection, tag.getCompoundTag("front_text"));
            updateSignMessages(connection, tag.getCompoundTag("back_text"));
        }
+
+        final Tag customName = tag.get("CustomName");
+        if (customName != null) {
+            tag.putString("CustomName", protocol.getComponentRewriter().toUglyJson(connection, customName));
+        }
    }

    private void updateSignMessages(final UserConnection connection, final CompoundTag tag) {
Author	SHA1	Message	Date
Nassim Jahnke	917427c940	5.5.0 Release	2025-10-03 13:48:04 +02:00
Nassim Jahnke	b7ddc108f5	Prepare for the release later	2025-10-03 08:18:06 +02:00
FlorianMichael	db65302112	Write empty tag if no shoulder data is present	2025-10-02 18:13:42 +02:00
FlorianMichael	795b195690	Use translation keys for code of conduct dialog	2025-10-02 14:25:23 +02:00
Nassim Jahnke	b7c42f9b2e	Cancel mannequin data from unknown entities	2025-09-30 18:29:04 +02:00
Nassim Jahnke	1a0c79c46a	Add 1.21.9 translations	2025-09-30 18:05:04 +02:00
Nassim Jahnke	95d809f53a	Update item_model use	2025-09-30 14:37:36 +02:00
FlorianMichael	f8c249f2c2	Only register open screen translatable rewriter	2025-09-26 20:41:01 +02:00
FlorianMichael	fe890fa59e	Handle relative player rotations	2025-09-25 17:03:31 +02:00
Nassim Jahnke	9806afed99	Handle SET_DEFAULT_SPAW_POSITION change	2025-09-25 16:59:57 +02:00
Nassim Jahnke	432c669daf	1.21.9-pre1	2025-09-25 16:59:57 +02:00
Nassim Jahnke	838d83897b	Start emulating mannequins via players	2025-09-25 16:59:57 +02:00
Nassim Jahnke	e10c73138d	25w37a	2025-09-25 16:59:57 +02:00
FlorianMichael	e0892faf13	Show server code of conduct as dialog screen	2025-09-25 16:59:57 +02:00
Nassim Jahnke	c03cb66bbd	wip 25w36a/b	2025-09-25 16:59:56 +02:00
Nassim Jahnke	ea1d86642e	25w35a	2025-09-25 16:59:56 +02:00
Nassim Jahnke	6c9c7288c4	25w34b	2025-09-25 16:59:56 +02:00
Nassim Jahnke	8dab7f7284	25w33a	2025-09-25 16:59:56 +02:00
Nassim Jahnke	f0c16003e0	25w32a	2025-09-25 16:59:56 +02:00
Nassim Jahnke	4d4b18b80e	25w31a	2025-09-25 16:59:56 +02:00
Nassim Jahnke	99abab0d62	Update dependencies	2025-09-20 22:39:48 +02:00
EnZaXD	f7656fb45f	Always remap show_dialog/custom click events (#1104 )	2025-09-18 20:03:13 +02:00
EnZaXD	6a440aaeda	Handle signed chat commands as well for custom click events (#1103 )	2025-09-18 20:02:42 +02:00
EnZaXD	075ca7044d	Make some functions protected in ChestDialogViewProvider (#1101 )	2025-09-16 21:31:56 +02:00
EnZaXD	a8cd653a7a	Remove serialize versions from item hasher (#1102 )	2025-09-16 21:31:51 +02:00
EnZaXD	191dd24117	Add missing sound name handlers for biomes (#1098 )	2025-09-13 10:08:02 +02:00
EnZaXD	6ad05d8bc2	Null check chest dialog storage in ChestDialogViewProvider#closeDialog (#1097 )	2025-09-12 21:14:54 +02:00
Nassim Jahnke	c5a2a6ae6e	Reset player position storage on respawn	2025-09-03 17:11:41 +02:00
EnZaXD	31f7f4edc1	Rename ProtocolRunnable, always submit tick logic into event loop (#1093 )	2025-09-03 17:08:08 +02:00
purpurcof	b2a2712949	Fix reading any NBT type for SERVER_LINKS (#1092 )	2025-09-01 17:31:05 +02:00
EnZaXD	7bd6a849a3	Fix SOUND_ENTITY remap not working for the player in 1.14->1.13.2 (#1086 )	2025-09-01 16:30:33 +02:00
riku6460	473b4af0d0	Add missing check whether the player is set in client tick emulation 1.21.2->1.21 (#1090 )	2025-08-29 17:16:07 +02:00
dependabot[bot]	b7c8891497	Bump actions/setup-java from 4 to 5 (#1089 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-26 15:36:00 +02:00
Nassim Jahnke	be5344b3e4	Reassign item on handleItemToClient calls Needed in rewriters before 1.20 with a recent change; the rest weren't technically necessary	2025-08-22 20:10:10 +02:00
Nassim Jahnke	cc4ea71722	Fix custom name in banners etc. in 1.21.5->1.21.4	2025-08-17 16:37:16 +02:00
EnZaXD	f288f2d716	Add dialog styling options (#1072 )	2025-08-17 08:16:42 +02:00
dependabot[bot]	61a4cead72	[ci skip] Bump actions/checkout from 4 to 5 (#1080 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-08-12 08:22:46 +02:00
EnZaXDandNassim Jahnke	b9ead8109f	[ci skip] Gradle & Shadow 9.0.0; Rewrite .gitignore file (#1075 ) Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>	2025-08-09 14:17:40 +02:00
EnZaXD	12cde18a3d	Use ViaBackwardsPlatform#getLogger for protocol logger creation (#1078 )	2025-08-08 16:03:40 +02:00
EnZaXD	b8adbde876	Add statistic mappings for 1.21.6->1.21.5 (#1077 )	2025-08-03 09:34:06 +02:00
EnZaXD	6faf407cc9	Use SerializerVersion.V1_21_6 in 1.21.6->1.21.5 (#1073 )	2025-07-31 13:05:01 +02:00
EnZaXD	f3f19dfd4e	Pass dialog title through component conversion in 1.21.6->.5 (#1074 )	2025-07-31 13:04:53 +02:00
EnZaXD	80ed7e1e75	Handle HIDE_ADDITIONAL_TOOLTIP in chat items in 1.21.5->1.21.4 (#1068 )	2025-07-31 13:04:42 +02:00
Nassim Jahnke	6363cd38ab	5.4.2 Release	2025-07-23 18:41:56 +02:00
Nassim Jahnke	5ca359b287	Fix hidden tooltip in emulated dialog item widgets	2025-07-23 18:38:07 +02:00
Nassim Jahnke	c18c670bdb	Fix 1.10->1.9 potion entity data	2025-07-22 00:04:13 +02:00
Nassim Jahnke	345406ecae	Back up custom attribute modifier ids	2025-07-18 11:06:44 +02:00
Nassim Jahnke	4a159bf16a	[ci skip] Split up publishing steps Putting them into the same step meant if one publish action failed, the second one wouldn't run. Before this change, Modrinth would often block Hangar from publishing	2025-07-17 16:10:46 +02:00
Pantera (Mad_Daniel)	6a2482f42f	Fix ADD_ENTITY velocity for non-living entities on 1.21.6+ servers (#1066 )	2025-07-15 15:28:43 +02:00
Pantera (Mad_Daniel)	8075d49ad2	Fix sendUnlockedRecipes (#1067 )	2025-07-14 22:31:14 +02:00
Nassim Jahnke	36aecf3444	[ci skip] Clean up imports	2025-07-14 12:42:13 +02:00
Nassim Jahnke	f0aa7d9dae	Fix minecarts losing type in 1.21.5->1.21.4 Fixes #1057	2025-07-13 09:31:04 +02:00
Nassim Jahnke	b63e031662	[ci skip] Remove clearOnServerSwitch overrides	2025-07-12 10:37:06 +02:00
EnZaXD	8825ef0f44	[ci skip] Add Java resolving plugin (#1059 )	2025-07-12 10:28:37 +02:00
Pantera (Mad_Daniel)	eea2687e66	Add limit (#1063 )	2025-07-11 10:18:46 +02:00
EnZaXD	712f656a3a	Remap UI sound source to master in 1.21.6->1.21.5 (#1056 )	2025-07-06 21:17:58 +02:00
Nassim Jahnke	181a0cb7c1	Cache parsed item name and lore in older protocols	2025-07-05 13:04:55 +02:00
Nassim Jahnke	b367037cef	Bump version to 5.4.2-SNAPSHOT	2025-07-04 13:37:59 +02:00
Nassim Jahnke	b90b573f1d	5.4.1 Release	2025-06-30 16:04:55 +02:00
Nassim Jahnke	74aeadd688	1.21.7-rc1/2	2025-06-30 16:04:53 +02:00
riku6460	6f27988cf6	Ensure run_command click events start with '/' in 1.21.5->1.21.4 (#1051 )	2025-06-30 16:03:42 +02:00
Nassim Jahnke	81aad86d9f	Map waterlogged light to water Fixes #1038	2025-06-30 12:32:05 +02:00
FlorianMichael	1e7dbf38fd	[ci skip] Add SECURITY.md (#1031 )	2025-06-29 15:37:05 +02:00
riku6460andFlorianMichael	0404184e15	Use correct tag type to write custom click actions in 1.21.6->.5 (#1050 ) Co-authored-by: FlorianMichael <florian.michael07@gmail.com>	2025-06-29 09:45:13 +02:00
FlorianMichael	64a7d9f8bd	Strip default namespace when reading types (#1049 )	2025-06-28 13:06:10 +02:00
FlorianMichael	924346882c	Fix style and remap translations for item description in 1.21.6->.5 dialogs (#1048 )	2025-06-28 12:34:32 +02:00
FlorianMichael	1d7332101f	Fix run_command and custom click events (#1046 )	2025-06-25 09:08:45 +02:00
FlorianMichael	30e63ebc3b	Improve multiple text widgets follow one another in dialogs (#1044 )	2025-06-24 13:36:19 +02:00
FlorianMichael	217c9459f5	Emulate dialog screens using chest inventories (#1041 )	2025-06-23 22:53:59 +02:00
Nassim Jahnke	ead2c6f330	Send sneaking command on vehicle exit in 1.21.2->1.21.1 Fixes #1001	2025-06-23 12:26:04 +02:00
Nassim Jahnke	1a972da613	Fix horse saddle handling in 1.21.5->1.21.4	2025-06-23 11:10:47 +02:00
Nassim Jahnke	44dbbf37e2	Remove saddle slot group from enchantments in 1.21.5->1.21.4 Fixes #1033	2025-06-22 22:14:47 +02:00
RK_01	def010c2bf	Remap difficulty data type (#1040 )	2025-06-21 10:08:55 +02:00
Nassim Jahnke	75744d5525	Bump version to 5.4.1-SNAPSHOT	2025-06-21 09:46:31 +02:00