5.3.0 Release

Remove missing new registries
Also check for hanging sign block entities
2026-11-05 09:20:16 -05:00 · 2025-03-28 18:57:40 +01:00 · 2025-03-28 17:59:47 +01:00 · 2025-03-28 17:05:50 +01:00 · 2025-03-28 15:19:33 +01:00 · 2025-03-27 16:23:22 +01:00
265 changed files with 3319 additions and 701 deletions
@@ -1,2 +1,3 @@
 github: kennytv
 patreon: kennytv
+custom: ['https://florianmichael.de/donate']
@@ -19,10 +19,11 @@ body:

  - type: textarea
    attributes:
-      label: Console Error
+      label: Server/Client Error
      description: |
        If you encounter warnings/errors in your console, **paste them with https://mclo.gs/ and put the paste link here**.
        If the error is small/less than 10 lines, you may put it directly into this field.
+        **Important**: If you are kicked for `Network Protocol Error` or an encoder/decoder exception, please click the `Open Report Directory` button on your client and paste the newest disconnect file contents.
      value: |
        ```
        Put the mclo.gs link or text here.
@@ -38,7 +39,7 @@ body:
        Describe the unexpected behavior.
        If you want to attach screenshots, use the comment field at the bottom of the page.
      placeholder: |
-        Example: "Placing signs on 1.13.2 causes text to disappear."
+        Example: "Placing signs on 1.16.5 causes text to disappear."
    validations:
      required: true

@@ -49,7 +50,7 @@ body:
        List the steps on how we can reproduce the issue. Make sure we can easily understand what you mean with each step.
      placeholder: |
        Example:
-        1. Login with a 1.13.2 client
+        1. Login with a 1.16.5 client
        2. Place a sign
        3. The sign text is displayed wrong
    validations:
@@ -11,8 +11,10 @@ jobs:
    steps:
    - name: Checkout Repository
      uses: actions/checkout@v4
-    - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@v4
+      with:
+        persist-credentials: false
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
    - name: Set up JDK 17
      uses: actions/setup-java@v4
      with:
@@ -12,8 +12,10 @@ jobs:
    steps:
      - name: Checkout Repository
        uses: actions/checkout@v4
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        with:
+          persist-credentials: false
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
      - name: Set up JDK 17
        uses: actions/setup-java@v4
        with:
@@ -10,5 +10,7 @@ jobs:
    steps:
      - name: Checkout Repository
        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: Update Gradle Wrapper
        uses: gradle-update/update-gradle-wrapper-action@v2
@@ -108,5 +108,8 @@ nbactions.xml
 nb-configuration.xml
 .nb-gradle/

+### MacOS ###
+.DS_Store
+
 ### Run Folder (ViaProxy) ###
 common/run/
@@ -6,7 +6,7 @@

 **Allows the connection of older clients to newer server versions for Minecraft servers.**

-Requires [ViaVersion](https://hangar.papermc.io/ViaVersion/ViaVersion) to be installed..
+Requires [ViaVersion](https://hangar.papermc.io/ViaVersion/ViaVersion) to be installed.

 Supported Versions
 -
@@ -16,6 +16,13 @@ As a plugin, ViaBackwards runs on servers on releases 1.10-latest. You can also

 See [HERE](https://viaversion.com) for an overview of the different Via* projects.

+Snapshot support
+--------
+**ViaBackwards will only be released a few days *after* a Minecraft update** unless the protocol changes of the update were trivial. If you want early-access, usually days or even weeks before the final release, you can subscribe to either:
+- [GitHub Sponsors](https://github.com/sponsors/kennytv/sponsorships?sponsor=kennytv&tier_id=385613&preview=false) (preferred option. Use the `/verify` command on this Discord after), or alternatively
+- [Patreon](https://www.patreon.com/kennytv/membership) (see the highest tier and make sure to link Patreon to your Discord account under Settings->Connections)
+  This also includes access to a private repository with the code, which will be pushed to the public repository after the given delay on a Minecraft update.
+
 Releases/Dev Builds
 -
 You can find releases in the following places:
@@ -35,7 +42,7 @@ Known issues
  1.17 will not be able to see or interact with blocks below y=0 and above y=255
 * <1.17 clients on 1.17+ servers might experience inventory desyncs on certain inventory click actions
 * Sound mappings are incomplete ([see here](https://github.com/ViaVersion/ViaBackwards/issues/326))
-* <1.19.4 clients on 1.20+ servers won't be able to use the smithing table, this can be fixed by
+* <1.19.4 clients on 1.20+ servers won't be able to use the smithing table. This can be fixed by
  installing [AxSmithing](https://github.com/ViaVersionAddons/AxSmithing)

 Other Links
@@ -8,5 +8,5 @@ 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.0")
+    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")
 }
@@ -5,8 +5,10 @@ plugins {
 tasks {
    // Variable replacements
    processResources {
+        val ver = project.version.toString()
+        val desc = project.description
        filesMatching(listOf("plugin.yml", "META-INF/sponge_plugins.json", "fabric.mod.json")) {
-            expand("version" to project.version, "description" to project.description, "url" to "https://viaversion.com/backwards")
+            expand("version" to ver, "description" to desc)
        }
    }
    javadoc {
@@ -14,7 +14,6 @@ val main = setOf(
    projects.viabackwardsCommon,
    projects.viabackwardsBukkit,
    projects.viabackwardsVelocity,
-    projects.viabackwardsSponge,
    projects.viabackwardsFabric
 ).map { it.path }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,7 +1,7 @@

 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -6,6 +6,6 @@ api-version: 1.13
 folia-supported: true

 authors: [Matsv, kennytv, Gerrygames, creeper123123321, ForceUpdate1, EnZaXD]
-website: ${url}
+website: "https://viaversion.com/backwards"

 depend: [ViaVersion]
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -37,6 +37,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
    private boolean bedrockAtY0;
    private boolean sculkShriekersToCryingObsidian;
    private boolean mapDarknessEffect;
+    private boolean mapCustomModelData;
    private boolean suppressEmulationWarnings;

    public ViaBackwardsConfig(File configFile, Logger logger) {
@@ -59,6 +60,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
        bedrockAtY0 = getBoolean("bedrock-at-y-0", false);
        sculkShriekersToCryingObsidian = getBoolean("sculk-shriekers-to-crying-obsidian", false);
        mapDarknessEffect = getBoolean("map-darkness-effect", true);
+        mapCustomModelData = getBoolean("map-custom-model-data", true);
        suppressEmulationWarnings = getBoolean("suppress-emulation-warnings", false);
    }

@@ -107,6 +109,11 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
        return mapDarknessEffect;
    }

+    @Override
+    public boolean mapCustomModelData() {
+        return mapCustomModelData;
+    }
+
    @Override
    public boolean suppressEmulationWarnings() {
        return suppressEmulationWarnings;
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -18,7 +18,7 @@
 package com.viaversion.viabackwards.api;

 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.TranslatableRewriter;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
 import com.viaversion.viaversion.api.protocol.Protocol;
@@ -66,7 +66,7 @@ public abstract class BackwardsProtocol<CU extends ClientboundPacketType, CM ext
    }

    @Override
-    public @Nullable TranslatableRewriter<CU> getComponentRewriter() {
+    public @Nullable TranslatableRewriter getComponentRewriter() {
        return null;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -85,6 +85,13 @@ public interface ViaBackwardsConfig extends Config {
     */
    boolean mapDarknessEffect();

+    /**
+     * If enabled, 1.21.3 clients will receive the first float of 1.21.4+ custom model data as int. Disable if you handle this change yourself.
+     *
+     * @return true if enabled
+     */
+    boolean mapCustomModelData();
+
    /**
     * Suppresses warnings of missing emulations for certain features that are not supported (e.g. world height in 1.17+).
     *
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -20,7 +20,7 @@ package com.viaversion.viabackwards.api;

 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.ViaBackwardsConfig;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+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_11_1to1_11.Protocol1_11_1To1_11;
@@ -49,6 +49,7 @@ import com.viaversion.viabackwards.protocol.v1_19to1_18_2.Protocol1_19To1_18_2;
 import com.viaversion.viabackwards.protocol.v1_18_2to1_18.Protocol1_18_2To1_18;
 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_20_3to1_20_2.Protocol1_20_3To1_20_2;
@@ -56,6 +57,7 @@ import com.viaversion.viabackwards.protocol.v1_20_5to1_20_3.Protocol1_20_5To1_20
 import com.viaversion.viabackwards.protocol.v1_20_2to1_20.Protocol1_20_2To1_20;
 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_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_9_3to1_9_1.Protocol1_9_3To1_9_1;
 import com.viaversion.viabackwards.protocol.v1_10to1_9_3.Protocol1_10To1_9_3;
@@ -71,7 +73,7 @@ import java.util.logging.Logger;

 public interface ViaBackwardsPlatform {

-    String MINIMUM_VV_VERSION = "5.1.2";
+    String MINIMUM_VV_VERSION = "5.3.0";

    /**
     * Initialize ViaBackwards.
@@ -91,7 +93,7 @@ public interface ViaBackwardsPlatform {
        Via.getManager().getSubPlatforms().add(VersionInfo.getImplementationVersion());

        getLogger().info("Loading translations...");
-        TranslatableRewriter.loadTranslatables();
+        TranslatableMappings.loadTranslatables();

        getLogger().info("Registering protocols...");
        final ProtocolManager protocolManager = Via.getManager().getProtocolManager();
@@ -144,6 +146,8 @@ public interface ViaBackwardsPlatform {

        protocolManager.registerProtocol(new Protocol1_21To1_20_5(), ProtocolVersion.v1_20_5, ProtocolVersion.v1_21);
        protocolManager.registerProtocol(new Protocol1_21_2To1_21(), ProtocolVersion.v1_21, ProtocolVersion.v1_21_2);
+        protocolManager.registerProtocol(new Protocol1_21_4To1_21_2(), ProtocolVersion.v1_21_2, ProtocolVersion.v1_21_4);
+        protocolManager.registerProtocol(new Protocol1_21_5To1_21_4(), ProtocolVersion.v1_21_4, ProtocolVersion.v1_21_5);
    }

    default void enable() {
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -15,26 +15,19 @@
 * 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.rewriters;
+package com.viaversion.viabackwards.api.data;

-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.StringTag;
 import com.viaversion.viabackwards.ViaBackwards;
-import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.api.data.BackwardsMappingDataLoader;
-import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.Protocol;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import java.util.HashMap;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;

-public class TranslatableRewriter<C extends ClientboundPacketType> extends ComponentRewriter<C> {
+public final class TranslatableMappings {

    private static final Map<String, Map<String, String>> TRANSLATABLES = new HashMap<>();
-    private final Map<String, String> translatables;

    public static void loadTranslatables() {
        if (!TRANSLATABLES.isEmpty()) {
@@ -53,42 +46,24 @@ public class TranslatableRewriter<C extends ClientboundPacketType> extends Compo
        }
    }

-    public TranslatableRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final ReadType type) {
-        this(protocol, type, protocol.getClass().getSimpleName().replace("Protocol", "").split("To")[0].replace("_", "."));
+    public static Map<String, String> translatablesFor(final Protocol<?, ?, ?, ?> protocol) {
+        final String version = protocol.getClass().getSimpleName()
+            .replace("Protocol", "")
+            .split("To")[0]
+            .replace("_", ".");
+        return translatablesFor(version);
    }

-    public TranslatableRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final ReadType type, final String version) {
-        super(protocol, type);
+    public static Map<String, String> translatablesFor(final String version) {
        final Map<String, String> translatableMappings = getTranslatableMappings(version);
        if (translatableMappings == null) {
            ViaBackwards.getPlatform().getLogger().warning("Missing " + version + " translatables!");
-            this.translatables = new HashMap<>();
-        } else {
-            this.translatables = translatableMappings;
+            return new HashMap<>();
        }
+        return translatableMappings;
    }

-    @Override
-    protected void handleTranslate(final JsonObject root, final String translate) {
-        final String newTranslate = mappedTranslationKey(translate);
-        if (newTranslate != null) {
-            root.addProperty("translate", newTranslate);
-        }
-    }
-
-    @Override
-    protected void handleTranslate(final UserConnection connection, final CompoundTag parentTag, final StringTag translateTag) {
-        final String newTranslate = mappedTranslationKey(translateTag.getValue());
-        if (newTranslate != null) {
-            parentTag.put("translate", new StringTag(newTranslate));
-        }
-    }
-
-    public @Nullable String mappedTranslationKey(final String translationKey) {
-        return translatables.get(translationKey);
-    }
-
-    public static Map<String, String> getTranslatableMappings(final String sectionIdentifier) {
+    public static @Nullable Map<String, String> getTranslatableMappings(final String sectionIdentifier) {
        return TRANSLATABLES.get(sectionIdentifier);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -18,6 +18,7 @@
 package com.viaversion.viabackwards.api.rewriters;

 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.FloatTag;
 import com.viaversion.nbt.tag.IntArrayTag;
 import com.viaversion.nbt.tag.IntTag;
 import com.viaversion.nbt.tag.ListTag;
@@ -27,13 +28,16 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.data.MappedItem;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.EitherHolder;
 import com.viaversion.viaversion.api.minecraft.Holder;
 import com.viaversion.viaversion.api.minecraft.HolderSet;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
 import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.minecraft.item.data.CustomModelData1_21_4;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
 import java.util.ArrayList;
@@ -45,6 +49,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
    T extends BackwardsProtocol<C, ?, ?, S>> extends StructuredItemRewriter<C, S, T> {

+    private static final int[] EMPTY_INT_ARRAY = new int[0];
+
    public BackwardsStructuredItemRewriter(
        T protocol,
        Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType,
@@ -88,8 +94,19 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
        item.setIdentifier(mappedItem.id());

        // Add custom model data
-        if (mappedItem.customModelData() != null && !dataContainer.has(StructuredDataKey.CUSTOM_MODEL_DATA)) {
-            dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA, mappedItem.customModelData());
+        if (mappedItem.customModelData() != null) {
+            if (connection.getProtocolInfo().protocolVersion().newerThanOrEqualTo(ProtocolVersion.v1_21_4)) {
+                if (!dataContainer.has(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4)) {
+                    dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA1_21_4, new CustomModelData1_21_4(
+                        new float[]{mappedItem.customModelData().floatValue()},
+                        new boolean[0],
+                        new String[0],
+                        EMPTY_INT_ARRAY
+                    ));
+                }
+            } else if (!dataContainer.has(StructuredDataKey.CUSTOM_MODEL_DATA1_20_5)) {
+                dataContainer.set(StructuredDataKey.CUSTOM_MODEL_DATA1_20_5, mappedItem.customModelData());
+            }
        }

        // Set custom name - only done if there is no original one
@@ -182,7 +199,7 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
    protected HolderSet restoreHolderSet(final CompoundTag tag, final String key) {
        final Tag savedTag = tag.get(key);
        if (savedTag == null) {
-            return HolderSet.of(new int[0]);
+            return HolderSet.of(EMPTY_INT_ARRAY);
        }

        if (savedTag instanceof StringTag tagKey) {
@@ -190,7 +207,7 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
        } else if (savedTag instanceof IntArrayTag idsTag) {
            return HolderSet.of(idsTag.getValue());
        } else {
-            return HolderSet.of(new int[0]);
+            return HolderSet.of(EMPTY_INT_ARRAY);
        }
    }

@@ -204,6 +221,28 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
        }
    }

+    protected <V> Tag eitherHolderToTag(final EitherHolder<V> holder, final BiConsumer<V, CompoundTag> valueSaveFunction) {
+        if (holder.hasKey()) {
+            return new StringTag(holder.key());
+        } else {
+            return holderToTag(holder.holder(), valueSaveFunction);
+        }
+    }
+
+    protected <V> void saveEitherHolderData(final StructuredDataKey<EitherHolder<V>> key, final StructuredDataContainer data, final CompoundTag backupTag, final BiConsumer<V, CompoundTag> valueSaveFunction) {
+        final EitherHolder<V> holder = data.get(key);
+        if (holder != null) {
+            backupTag.put(key.identifier(), eitherHolderToTag(holder, valueSaveFunction));
+        }
+    }
+
+    protected <V> void saveHolderData(final StructuredDataKey<Holder<V>> key, final StructuredDataContainer data, final CompoundTag backupTag, final BiConsumer<V, CompoundTag> valueSaveFunction) {
+        final Holder<V> holder = data.get(key);
+        if (holder != null) {
+            backupTag.put(key.identifier(), holderToTag(holder, valueSaveFunction));
+        }
+    }
+
    protected <V> Holder<V> restoreHolder(final CompoundTag tag, final String key, final Function<CompoundTag, V> valueRestoreFunction) {
        final Tag savedTag = tag.get(key);
        if (savedTag == null) {
@@ -219,6 +258,67 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
        }
    }

+    protected <V> EitherHolder<V> restoreEitherHolder(final CompoundTag tag, final String key, final Function<CompoundTag, V> valueRestoreFunction) {
+        final Tag savedTag = tag.get(key);
+        if (savedTag == null) {
+            return EitherHolder.of(Holder.of(0));
+        }
+
+        if (savedTag instanceof StringTag keyTag) {
+            return EitherHolder.of(keyTag.getValue());
+        } else {
+            return EitherHolder.of(restoreHolder(tag, key, valueRestoreFunction));
+        }
+    }
+
+    protected <V> void restoreHolderData(final StructuredDataKey<Holder<V>> key, final StructuredDataContainer data, final CompoundTag backupTag, final Function<CompoundTag, V> valueRestoreFunction) {
+        if (backupTag.contains(key.identifier())) {
+            data.set(key, restoreHolder(backupTag, key.identifier(), valueRestoreFunction));
+        }
+    }
+
+    protected void saveStringData(final StructuredDataKey<String> key, final StructuredDataContainer data, final CompoundTag backupTag) {
+        final String value = data.get(key);
+        if (value != null) {
+            backupTag.putString(key.identifier(), value);
+        }
+    }
+
+    protected void restoreStringData(final StructuredDataKey<String> key, final StructuredDataContainer data, final CompoundTag backupTag) {
+        final String value = backupTag.getString(key.identifier());
+        if (value != null) {
+            data.set(key, value);
+        }
+    }
+
+    protected void saveIntData(final StructuredDataKey<Integer> key, final StructuredDataContainer data, final CompoundTag backupTag) {
+        final Integer variant = data.get(key);
+        if (variant != null) {
+            backupTag.putInt(key.identifier(), variant);
+        }
+    }
+
+    protected void restoreIntData(final StructuredDataKey<Integer> key, final StructuredDataContainer data, final CompoundTag backupTag) {
+        final IntTag variant = backupTag.getIntTag(key.identifier());
+        if (variant != null) {
+            data.set(key, variant.asInt());
+        }
+    }
+
+    protected void saveFloatData(final StructuredDataKey<Float> key, final StructuredDataContainer data, final CompoundTag backupTag) {
+        final Float variant = data.get(key);
+        if (variant != null) {
+            backupTag.putFloat(key.identifier(), variant);
+        }
+    }
+
+    protected void restoreFloatData(final StructuredDataKey<Float> key, final StructuredDataContainer data, final CompoundTag backupTag) {
+        final FloatTag variant = backupTag.getFloatTag(key.identifier());
+        if (variant != null) {
+            data.set(key, variant.asFloat());
+        }
+    }
+
    @Override
    public String nbtTagName() {
        return "VB|" + protocol.getClass().getSimpleName();
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -24,7 +24,6 @@ import com.viaversion.viaversion.api.minecraft.entitydata.EntityDataType;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 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_14;

@@ -40,40 +39,34 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends

    @Override
    public void registerTrackerWithData(C packetType, EntityType fallingBlockType) {
-        protocol.registerClientbound(packetType, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.VAR_INT); // 0 - Entity id
-                map(Types.UUID); // 1 - Entity UUID
-                map(Types.VAR_INT); // 2 - Entity Type
-                map(Types.DOUBLE); // 3 - X
-                map(Types.DOUBLE); // 4 - Y
-                map(Types.DOUBLE); // 5 - Z
-                map(Types.BYTE); // 6 - Pitch
-                map(Types.BYTE); // 7 - Yaw
-                map(Types.INT); // 8 - Data
-                handler(getSpawnTrackerWithDataHandler(fallingBlockType));
-            }
+        protocol.registerClientbound(packetType, wrapper -> {
+            wrapper.passthrough(Types.VAR_INT); // Entity ID
+            wrapper.passthrough(Types.UUID); // Entity UUID
+            wrapper.passthrough(Types.VAR_INT); // Entity Type
+            wrapper.passthrough(Types.DOUBLE); // X
+            wrapper.passthrough(Types.DOUBLE); // Y
+            wrapper.passthrough(Types.DOUBLE); // Z
+            wrapper.passthrough(Types.BYTE); // Pitch
+            wrapper.passthrough(Types.BYTE); // Yaw
+            wrapper.passthrough(Types.INT); // Data
+            getSpawnTrackerWithDataHandler(fallingBlockType).handle(wrapper);
        });
    }

    @Override
    public void registerTrackerWithData1_19(C packetType, EntityType fallingBlockType) {
-        protocol.registerClientbound(packetType, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.VAR_INT); // Entity id
-                map(Types.UUID); // Entity UUID
-                map(Types.VAR_INT); // Entity type
-                map(Types.DOUBLE); // X
-                map(Types.DOUBLE); // Y
-                map(Types.DOUBLE); // Z
-                map(Types.BYTE); // Pitch
-                map(Types.BYTE); // Yaw
-                map(Types.BYTE); // Head yaw
-                map(Types.VAR_INT); // Data
-                handler(getSpawnTrackerWithDataHandler1_19(fallingBlockType));
-            }
+        protocol.registerClientbound(packetType, wrapper -> {
+            wrapper.passthrough(Types.VAR_INT); // Entity id
+            wrapper.passthrough(Types.UUID); // Entity UUID
+            wrapper.passthrough(Types.VAR_INT); // Entity type
+            wrapper.passthrough(Types.DOUBLE); // X
+            wrapper.passthrough(Types.DOUBLE); // Y
+            wrapper.passthrough(Types.DOUBLE); // Z
+            wrapper.passthrough(Types.BYTE); // Pitch
+            wrapper.passthrough(Types.BYTE); // Yaw
+            wrapper.passthrough(Types.BYTE); // Head yaw
+            wrapper.passthrough(Types.VAR_INT); // Data
+            getSpawnTrackerWithDataHandler1_19(fallingBlockType).handle(wrapper);
        });
    }

@@ -137,6 +130,10 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
    protected EntityType trackAndMapEntity(PacketWrapper wrapper) {
        int typeId = wrapper.get(Types.VAR_INT, 1);
        EntityType entityType = typeFromId(typeId);
+        if (entityType == null) {
+            return null;
+        }
+
        tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);

        int mappedTypeId = newEntityId(entityType.getId());
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -231,7 +231,10 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
    protected PacketHandler getTrackerHandler(Type<? extends Number> intType, int typeIndex) {
        return wrapper -> {
            Number id = wrapper.get(intType, typeIndex);
-            tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), typeFromId(id.intValue()));
+            EntityType entityType = typeFromId(id.intValue());
+            if (entityType != null) {
+                tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
+            }
        };
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -18,9 +18,16 @@

 package com.viaversion.viabackwards.api.rewriters;

+import com.viaversion.nbt.tag.ByteTag;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.IntTag;
+import com.viaversion.nbt.tag.NumberTag;
+import com.viaversion.nbt.tag.ShortTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.api.data.MappedLegacyBlockItem;
 import com.viaversion.viabackwards.api.data.BackwardsMappingDataLoader;
+import com.viaversion.viabackwards.api.data.MappedLegacyBlockItem;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.data.BlockColors1_11_1;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
@@ -41,17 +48,10 @@ import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.libs.gson.JsonPrimitive;
-import com.viaversion.nbt.tag.ByteTag;
-import com.viaversion.nbt.tag.CompoundTag;
-import com.viaversion.nbt.tag.IntTag;
-import com.viaversion.nbt.tag.NumberTag;
-import com.viaversion.nbt.tag.ShortTag;
-import com.viaversion.nbt.tag.StringTag;
-import com.viaversion.nbt.tag.Tag;
 import com.viaversion.viaversion.util.ComponentUtil;
+import com.viaversion.viaversion.util.IdAndData;
 import java.util.HashMap;
 import java.util.Map;
-import com.viaversion.viaversion.util.IdAndData;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S extends ServerboundPacketType,
@@ -226,10 +226,9 @@ public abstract class LegacyBlockItemRewriter<C extends ClientboundPacketType, S

    public PacketHandler getFallingBlockHandler() {
        return wrapper -> {
-            final EntityTypes1_12.ObjectType type = EntityTypes1_12.ObjectType.findById(wrapper.get(Types.BYTE, 0));
+            final int objectData = wrapper.get(Types.INT, 0);
+            final EntityTypes1_12.ObjectType type = EntityTypes1_12.ObjectType.findById(wrapper.get(Types.BYTE, 0), objectData);
            if (type == EntityTypes1_12.ObjectType.FALLING_BLOCK) {
-                final int objectData = wrapper.get(Types.INT, 0);
-
                final IdAndData block = handleBlock(objectData & 4095, objectData >> 12 & 15);
                if (block == null) return;

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -36,7 +36,6 @@ import com.viaversion.viaversion.api.type.Types;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import org.checkerframework.checker.nullness.qual.Nullable;

 public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T extends BackwardsProtocol<C, ?, ?, ?>> extends EntityRewriterBase<C, T> {
@@ -98,6 +97,9 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex
        return wrapper -> {
            int entityId = wrapper.get(Types.VAR_INT, 0);
            EntityType type = tracker(wrapper.user()).entityType(entityId);
+            if (type == null) {
+                return;
+            }

            List<EntityData> entityDataList = wrapper.get(dataType, 0);
            handleEntityData(entityId, entityDataList, wrapper.user());
@@ -121,7 +123,16 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex
    }

    protected PacketHandler getObjectTrackerHandler() {
-        return wrapper -> addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), objectTypeFromId(wrapper.get(Types.BYTE, 0)));
+        return wrapper -> {
+            int id = wrapper.get(Types.BYTE, 0);
+            int data = wrapper.get(Types.INT, 0);
+            EntityType type = objectTypeFromId(id, data);
+            if (type == null) {
+                return;
+            }
+
+            addTrackedEntity(wrapper, wrapper.get(Types.VAR_INT, 0), type);
+        };
    }

    protected PacketHandler getTrackerAndDataHandler(Type<List<EntityData>> dataType, EntityType entityType) {
@@ -132,19 +143,20 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex
        };
    }

-    protected PacketHandler getObjectRewriter(Function<Byte, ObjectType> objectGetter) {
+    protected PacketHandler getObjectRewriter(ObjectTypeGetter objectGetter) {
        return wrapper -> {
-            ObjectType type = objectGetter.apply(wrapper.get(Types.BYTE, 0));
+            int id = wrapper.get(Types.BYTE, 0);
+            int data = wrapper.get(Types.INT, 0);
+            ObjectType type = objectGetter.get(id, data);
            if (type == null) {
-                protocol.getLogger().warning("Could not find entity type " + wrapper.get(Types.BYTE, 0));
                return;
            }

-            EntityReplacement data = getObjectData(type);
-            if (data != null) {
-                wrapper.set(Types.BYTE, 0, (byte) data.replacementId());
-                if (data.objectData() != -1) {
-                    wrapper.set(Types.INT, 0, data.objectData());
+            EntityReplacement replacement = getObjectData(type);
+            if (replacement != null) {
+                wrapper.set(Types.BYTE, 0, (byte) replacement.replacementId());
+                if (replacement.objectData() != -1) {
+                    wrapper.set(Types.INT, 0, replacement.objectData());
                }
            }
        };
@@ -160,4 +172,10 @@ public abstract class LegacyEntityRewriter<C extends ClientboundPacketType, T ex

        void setId(PacketWrapper wrapper, int id);
    }
+
+    @FunctionalInterface
+    protected interface ObjectTypeGetter {
+
+        ObjectType get(int id, int data);
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -17,13 +17,47 @@
 */
 package com.viaversion.viabackwards.api.rewriters;

+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.rewriter.IdRewriteFunction;

 public final class MapColorRewriter {

+    /**
+     * Rewrite map colors using the provided id rewriter.
+     *
+     * @param wrapper   packet wrapper
+     * @param rewriter  id rewriter returning mapped colors, or -1 if unmapped
+     * @param iconCount number of icons to read
+     */
+    public static void rewriteMapColors(PacketWrapper wrapper, IdRewriteFunction rewriter, int iconCount) {
+        for (int i = 0; i < iconCount; i++) {
+            wrapper.passthrough(Types.VAR_INT); // Type
+            wrapper.passthrough(Types.BYTE); // X
+            wrapper.passthrough(Types.BYTE); // Z
+            wrapper.passthrough(Types.BYTE); // Direction
+            wrapper.passthrough(Types.OPTIONAL_COMPONENT); // Display Name
+        }
+
+        short columns = wrapper.passthrough(Types.UNSIGNED_BYTE);
+        if (columns < 1) {
+            return;
+        }
+
+        wrapper.passthrough(Types.UNSIGNED_BYTE); // Rows
+        wrapper.passthrough(Types.UNSIGNED_BYTE); // X
+        wrapper.passthrough(Types.UNSIGNED_BYTE); // Z
+        byte[] data = wrapper.passthrough(Types.BYTE_ARRAY_PRIMITIVE);
+        for (int i = 0; i < data.length; i++) {
+            int color = data[i] & 0xFF;
+            int mappedColor = rewriter.rewrite(color);
+            if (mappedColor != -1) {
+                data[i] = (byte) mappedColor;
+            }
+        }
+    }
+
    /**
     * Returns a packethandler to rewrite map data color ids. Reading starts from the icon count.
     *
@@ -31,30 +65,6 @@ public final class MapColorRewriter {
     * @return packethandler to rewrite map data color ids
     */
    public static PacketHandler getRewriteHandler(IdRewriteFunction rewriter) {
-        return wrapper -> {
-            int iconCount = wrapper.passthrough(Types.VAR_INT);
-            for (int i = 0; i < iconCount; i++) {
-                wrapper.passthrough(Types.VAR_INT); // Type
-                wrapper.passthrough(Types.BYTE); // X
-                wrapper.passthrough(Types.BYTE); // Z
-                wrapper.passthrough(Types.BYTE); // Direction
-                wrapper.passthrough(Types.OPTIONAL_COMPONENT); // Display Name
-            }
-
-            short columns = wrapper.passthrough(Types.UNSIGNED_BYTE);
-            if (columns < 1) return;
-
-            wrapper.passthrough(Types.UNSIGNED_BYTE); // Rows
-            wrapper.passthrough(Types.UNSIGNED_BYTE); // X
-            wrapper.passthrough(Types.UNSIGNED_BYTE); // Z
-            byte[] data = wrapper.passthrough(Types.BYTE_ARRAY_PRIMITIVE);
-            for (int i = 0; i < data.length; i++) {
-                int color = data[i] & 0xFF;
-                int mappedColor = rewriter.rewrite(color);
-                if (mappedColor != -1) {
-                    data[i] = (byte) mappedColor;
-                }
-            }
-        };
+        return wrapper -> rewriteMapColors(wrapper, rewriter, wrapper.passthrough(Types.VAR_INT));
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -59,16 +59,16 @@ public class StructuredEnchantmentRewriter {
            final String remappedName = mappingData.mappedEnchantmentName(id);
            return ComponentUtil.jsonStringToTag(ChatUtil.legacyToJsonString("§7" + remappedName, ENCHANTMENT_LEVEL_TRANSLATION.formatted(level), true));
        };
-        rewriteEnchantmentsToClient(data, StructuredDataKey.ENCHANTMENTS, idRewriteFunction, descriptionSupplier, false);
-        rewriteEnchantmentsToClient(data, StructuredDataKey.STORED_ENCHANTMENTS, idRewriteFunction, descriptionSupplier, true);
+        rewriteEnchantmentsToClient(data, StructuredDataKey.ENCHANTMENTS1_20_5, idRewriteFunction, descriptionSupplier, false);
+        rewriteEnchantmentsToClient(data, StructuredDataKey.STORED_ENCHANTMENTS1_20_5, idRewriteFunction, descriptionSupplier, true);
    }

    public void handleToServer(final Item item) {
        final StructuredDataContainer data = item.dataContainer();
        final CompoundTag customData = data.get(StructuredDataKey.CUSTOM_DATA);
        if (customData != null) {
-            rewriteEnchantmentsToServer(data, customData, StructuredDataKey.ENCHANTMENTS);
-            rewriteEnchantmentsToServer(data, customData, StructuredDataKey.STORED_ENCHANTMENTS);
+            rewriteEnchantmentsToServer(data, customData, StructuredDataKey.ENCHANTMENTS1_20_5);
+            rewriteEnchantmentsToServer(data, customData, StructuredDataKey.STORED_ENCHANTMENTS1_20_5);
        }
    }

@@ -0,0 +1,64 @@
+/*
+ * 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.rewriters.text;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.data.TranslatableMappings;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.libs.gson.JsonObject;
+import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class JsonNBTComponentRewriter<C extends ClientboundPacketType> extends com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter<C> implements TranslatableRewriter {
+
+    private final Map<String, String> translatables;
+
+    public JsonNBTComponentRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final ReadType type) {
+        super(protocol, type);
+        this.translatables = TranslatableMappings.translatablesFor(protocol);
+    }
+
+    public JsonNBTComponentRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final ReadType type, final String version) {
+        super(protocol, type);
+        this.translatables = TranslatableMappings.translatablesFor(version);
+    }
+
+    @Override
+    protected void handleTranslate(final JsonObject root, final String translate) {
+        final String newTranslate = mappedTranslationKey(translate);
+        if (newTranslate != null) {
+            root.addProperty("translate", newTranslate);
+        }
+    }
+
+    @Override
+    protected void handleTranslate(final UserConnection connection, final CompoundTag parentTag, final StringTag translateTag) {
+        final String newTranslate = mappedTranslationKey(translateTag.getValue());
+        if (newTranslate != null) {
+            parentTag.put("translate", new StringTag(newTranslate));
+        }
+    }
+
+    @Override
+    public @Nullable String mappedTranslationKey(final String translationKey) {
+        return translatables.get(translationKey);
+    }
+}
@@ -0,0 +1,64 @@
+/*
+ * 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.rewriters.text;
+
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.StringTag;
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.data.TranslatableMappings;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.libs.gson.JsonObject;
+import java.util.Map;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public class NBTComponentRewriter<C extends ClientboundPacketType> extends com.viaversion.viaversion.rewriter.text.NBTComponentRewriter<C> implements TranslatableRewriter {
+
+    private final Map<String, String> translatables;
+
+    public NBTComponentRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol) {
+        super(protocol);
+        this.translatables = TranslatableMappings.translatablesFor(protocol);
+    }
+
+    public NBTComponentRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final String version) {
+        super(protocol);
+        this.translatables = TranslatableMappings.translatablesFor(version);
+    }
+
+    @Override
+    protected void handleTranslate(final JsonObject root, final String translate) {
+        final String newTranslate = mappedTranslationKey(translate);
+        if (newTranslate != null) {
+            root.addProperty("translate", newTranslate);
+        }
+    }
+
+    @Override
+    protected void handleTranslate(final UserConnection connection, final CompoundTag parentTag, final StringTag translateTag) {
+        final String newTranslate = mappedTranslationKey(translateTag.getValue());
+        if (newTranslate != null) {
+            parentTag.put("translate", new StringTag(newTranslate));
+        }
+    }
+
+    @Override
+    public @Nullable String mappedTranslationKey(final String translationKey) {
+        return translatables.get(translationKey);
+    }
+}
@@ -0,0 +1,27 @@
+/*
+ * 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.rewriters.text;
+
+import com.viaversion.viaversion.api.rewriter.ComponentRewriter;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface TranslatableRewriter extends ComponentRewriter {
+
+    @Nullable
+    String mappedTranslationKey(String translationKey);
+}
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -18,27 +18,28 @@
 package com.viaversion.viabackwards.protocol.template;

 import com.viaversion.viabackwards.api.rewriters.BackwardsStructuredItemRewriter;
-import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
-import com.viaversion.viaversion.api.type.types.version.Types1_21_2;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
+import com.viaversion.viaversion.api.type.types.version.Types1_21_4;
+import com.viaversion.viaversion.api.type.types.version.Types1_21_5;
+import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPacket1_21_4;
+import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
+import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPacket1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;

 // To replace if needed:
-//   ChunkType1_20_2
-//   RecipeRewriter1_20_3
-//   Types1_21
-final class BlockItemPacketRewriter1_99 extends BackwardsStructuredItemRewriter<ClientboundPacket1_21_2, ServerboundPacket1_21_2, Protocol1_98To1_99> {
+//   ChunkType1_21_5
+//   RecipeDisplayRewriter
+//   Types1_21_4
+final class BlockItemPacketRewriter1_99 extends BackwardsStructuredItemRewriter<ClientboundPacket1_21_2, ServerboundPacket1_21_4, Protocol1_98To1_99> {

    public BlockItemPacketRewriter1_99(final Protocol1_98To1_99 protocol) {
-        super(protocol, Types1_21_2.ITEM, Types1_21_2.ITEM_ARRAY);
+        super(protocol, Types1_21_4.ITEM, Types1_21_4.ITEM_ARRAY);
        /*super(protocol,
-            Types1_21.ITEM, Types1_21.ITEM_ARRAY, Types1_OLD.ITEM, Types1_OLD.ITEM_ARRAY,
-            Types1_21.ITEM_COST, Types1_21.OPTIONAL_ITEM_COST, Types1_OLD.ITEM_COST, Types1_OLD.OPTIONAL_ITEM_COST,
-            Types1_21.PARTICLE, Types1_OLD.PARTICLE
+            Types1_21_4.ITEM, Types1_21_4.ITEM_ARRAY, Types1_OLD.ITEM, Types1_OLD.ITEM_ARRAY,
+            Types1_21_4.ITEM_COST, Types1_21_4.OPTIONAL_ITEM_COST, Types1_OLD.ITEM_COST, Types1_OLD.OPTIONAL_ITEM_COST
        );*/
    }

@@ -49,22 +50,22 @@ final class BlockItemPacketRewriter1_99 extends BackwardsStructuredItemRewriter<
        blockRewriter.registerBlockUpdate(ClientboundPackets1_21_2.BLOCK_UPDATE);
        blockRewriter.registerSectionBlocksUpdate1_20(ClientboundPackets1_21_2.SECTION_BLOCKS_UPDATE);
        blockRewriter.registerLevelEvent1_21(ClientboundPackets1_21_2.LEVEL_EVENT, 2001);
-        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_20_2::new);
+        blockRewriter.registerLevelChunk1_19(ClientboundPackets1_21_2.LEVEL_CHUNK_WITH_LIGHT, ChunkType1_21_5::new);
        blockRewriter.registerBlockEntityData(ClientboundPackets1_21_2.BLOCK_ENTITY_DATA);

        // registerOpenScreen(ClientboundPackets1_21_2.OPEN_SCREEN);
        protocol.registerClientbound(ClientboundPackets1_21_2.SET_CURSOR_ITEM, this::passthroughClientboundItem);
+        registerSetPlayerInventory(ClientboundPackets1_21_2.SET_PLAYER_INVENTORY);
        registerCooldown1_21_2(ClientboundPackets1_21_2.COOLDOWN);
        registerSetContent1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT);
        registerSetSlot1_21_2(ClientboundPackets1_21_2.CONTAINER_SET_SLOT);
        registerAdvancements1_20_3(ClientboundPackets1_21_2.UPDATE_ADVANCEMENTS);
        registerSetEquipment(ClientboundPackets1_21_2.SET_EQUIPMENT);
        registerMerchantOffers1_20_5(ClientboundPackets1_21_2.MERCHANT_OFFERS);
-        registerContainerSetData(ClientboundPackets1_21_2.CONTAINER_SET_DATA);
-        registerContainerClick1_21_2(ServerboundPackets1_21_2.CONTAINER_CLICK);
-        registerSetCreativeModeSlot(ServerboundPackets1_21_2.SET_CREATIVE_MODE_SLOT);
+        registerContainerClick1_21_5(ServerboundPackets1_21_4.CONTAINER_CLICK);
+        registerSetCreativeModeSlot1_21_5(ServerboundPackets1_21_4.SET_CREATIVE_MODE_SLOT, Types1_21_5.LENGTH_PREFIXED_ITEM, Types1_21_5.LENGTH_PREFIXED_ITEM); // Change this

-        final RecipeDisplayRewriter<ClientboundPacket1_21_2> recipeRewriter = new RecipeDisplayRewriter<>(protocol);
+        final RecipeDisplayRewriter<ClientboundPacket1_21_2> recipeRewriter = new RecipeDisplayRewriter1_21_5<>(protocol);
        recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_2.UPDATE_RECIPES);
        recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_2.RECIPE_BOOK_ADD);
        recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_2.PLACE_GHOST_RECIPE);
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -19,15 +19,14 @@ package com.viaversion.viabackwards.protocol.template;

 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
-import com.viaversion.viaversion.util.SerializerVersion;

-public class ComponentRewriter1_99 extends TranslatableRewriter<ClientboundPacket1_21_2> {
+final class ComponentRewriter1_99 extends NBTComponentRewriter<ClientboundPacket1_21_2> {

    public ComponentRewriter1_99(final BackwardsProtocol<ClientboundPacket1_21_2, ?, ?, ?> protocol) {
-        super(protocol, ReadType.NBT);
+        super(protocol);
    }

    @Override
@@ -38,11 +37,6 @@ public class ComponentRewriter1_99 extends TranslatableRewriter<ClientboundPacke
        }

        // Remove or update data from componentsTag
-        // New added data which is not handled otherwise needs to be removed to prevent errors on the client
-    }
-
-    @Override
-    protected SerializerVersion inputSerializerVersion() {
-        return SerializerVersion.V1_20_5;
+        // Newly added data which is not handled otherwise needs to be removed to prevent errors on the client
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -19,9 +19,9 @@ package com.viaversion.viabackwards.protocol.template;

 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
+import com.viaversion.viaversion.api.type.types.version.Types1_21_4;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
@@ -29,17 +29,17 @@ import com.viaversion.viaversion.rewriter.RegistryDataRewriter;

 // Replace if needed
 //  Types1_OLD
-//  Types1_21
+//  Types1_21_4
 final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_21_2, Protocol1_98To1_99> {

    public EntityPacketRewriter1_99(final Protocol1_98To1_99 protocol) {
-        super(protocol, Types1_20_5.ENTITY_DATA_TYPES.optionalComponentType, Types1_20_5.ENTITY_DATA_TYPES.booleanType);
+        super(protocol, Types1_21_4.ENTITY_DATA_TYPES.optionalComponentType, Types1_21_4.ENTITY_DATA_TYPES.booleanType);
    }

    @Override
    public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_20_5.FALLING_BLOCK);
-        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA, /*Types1_OLD.ENTITY_DATA_LIST, */Types1_20_5.ENTITY_DATA_LIST); // Specify old and new entity data list if changed
+        registerTrackerWithData1_19(ClientboundPackets1_21_2.ADD_ENTITY, EntityTypes1_21_4.FALLING_BLOCK);
+        registerSetEntityData(ClientboundPackets1_21_2.SET_ENTITY_DATA, /*Types1_OLD.ENTITY_DATA_LIST, */Types1_21_4.ENTITY_DATA_LIST); // Specify old and new entity data list if changed
        registerRemoveEntities(ClientboundPackets1_21_2.REMOVE_ENTITIES);

        final RegistryDataRewriter registryDataRewriter = new RegistryDataRewriter(protocol);
@@ -78,22 +78,21 @@ final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_2
                id--;
            }

-            data.setDataType(Types1_21.ENTITY_DATA_TYPES.byId(id));
+            data.setDataType(Types1_21_4.ENTITY_DATA_TYPES.byId(id));
        });*/

        registerEntityDataTypeHandler1_20_3(
-            Types1_20_5.ENTITY_DATA_TYPES.itemType,
-            Types1_20_5.ENTITY_DATA_TYPES.blockStateType,
-            Types1_20_5.ENTITY_DATA_TYPES.optionalBlockStateType,
-            Types1_20_5.ENTITY_DATA_TYPES.particleType,
-            Types1_20_5.ENTITY_DATA_TYPES.particlesType,
-            Types1_20_5.ENTITY_DATA_TYPES.componentType,
-            Types1_20_5.ENTITY_DATA_TYPES.optionalComponentType
+            Types1_21_4.ENTITY_DATA_TYPES.itemType,
+            Types1_21_4.ENTITY_DATA_TYPES.blockStateType,
+            Types1_21_4.ENTITY_DATA_TYPES.optionalBlockStateType,
+            Types1_21_4.ENTITY_DATA_TYPES.particleType,
+            Types1_21_4.ENTITY_DATA_TYPES.particlesType,
+            Types1_21_4.ENTITY_DATA_TYPES.componentType,
+            Types1_21_4.ENTITY_DATA_TYPES.optionalComponentType
        );
-        registerBlockStateHandler(EntityTypes1_20_5.ABSTRACT_MINECART, 11);

        // Remove entity data of new entity type
-        // filter().type(EntityTypes1_20_5.SNIFFER).removeIndex(newIndex);
+        // filter().type(EntityTypes1_21_4.SNIFFER).removeIndex(newIndex);
    }

    @Override
@@ -101,11 +100,11 @@ final class EntityPacketRewriter1_99 extends EntityRewriter<ClientboundPacket1_2
        // If types changed, uncomment to map them
        // mapTypes();

-        // mapEntityTypeWithData(EntityTypes1_20_5.SNIFFER, EntityTypes1_20_5.RAVAGER).tagName();
+        // mapEntityTypeWithData(EntityTypes1_21_4.SNIFFER, EntityTypes1_21_4.RAVAGER).tagName();
    }

    @Override
    public EntityType typeFromId(final int type) {
-        return EntityTypes1_20_5.getTypeFromId(type);
+        return EntityTypes1_21_4.getTypeFromId(type);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -20,19 +20,20 @@ package com.viaversion.viabackwards.protocol.template;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.NBTComponentRewriter;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_5;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_4;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
-import com.viaversion.viaversion.api.type.types.version.Types1_21_2;
+import com.viaversion.viaversion.api.type.types.version.Types1_21_4;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundConfigurationPackets1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.Protocol1_20_5To1_21;
 import com.viaversion.viaversion.protocols.v1_20_5to1_21.packet.ClientboundConfigurationPackets1_21;
+import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPacket1_21_4;
+import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.packet.ServerboundPackets1_21_4;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacket1_21_2;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPackets1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPacket1_21_2;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ServerboundPackets1_21_2;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
@@ -43,24 +44,24 @@ import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 //   Protocol1_98To1_99, EntityPacketRewriter1_99, BlockItemPacketRewriter1_99
 //   Protocol1_20_5To1_21 (the ViaVersion protocol class the mappings depend on)
 //   ClientboundPacket1_21_2
-//   ServerboundPacket1_21_2
+//   ServerboundPacket1_21_4
 //   ClientboundConfigurationPackets1_21
 //   ServerboundConfigurationPackets1_20_5
-//   EntityTypes1_20_5 (UNMAPPED type)
-//   Types1_21_2.PARTICLE
+//   EntityTypes1_21_4 (UNMAPPED type)
+//   Types1_21_4.PARTICLE
 //   1.99, 1.98
-final class Protocol1_98To1_99 extends BackwardsProtocol<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_2, ServerboundPacket1_21_2> {
+final class Protocol1_98To1_99 extends BackwardsProtocol<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_4, ServerboundPacket1_21_4> {

    // ViaBackwards uses its own mappings and also needs a translatablerewriter for translation mappings
    public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.99", "1.98", Protocol1_20_5To1_21.class);
    private final EntityPacketRewriter1_99 entityRewriter = new EntityPacketRewriter1_99(this);
    private final BlockItemPacketRewriter1_99 itemRewriter = new BlockItemPacketRewriter1_99(this);
-    private final ParticleRewriter<ClientboundPacket1_21_2> particleRewriter = new ParticleRewriter<>(this, Types1_21_2.PARTICLE/*, Types1_OLD.PARTICLE*/);
-    private final ComponentRewriter1_99 translatableRewriter = new ComponentRewriter1_99(this);
+    private final ParticleRewriter<ClientboundPacket1_21_2> particleRewriter = new ParticleRewriter<>(this, Types1_21_4.PARTICLE/*, Types1_OLD.PARTICLE*/);
+    private final NBTComponentRewriter<ClientboundPacket1_21_2> translatableRewriter = new ComponentRewriter1_99(this);
    private final TagRewriter<ClientboundPacket1_21_2> tagRewriter = new TagRewriter<>(this);

    public Protocol1_98To1_99() {
-        super(ClientboundPacket1_21_2.class, ClientboundPacket1_21_2.class, ServerboundPacket1_21_2.class, ServerboundPacket1_21_2.class);
+        super(ClientboundPacket1_21_2.class, ClientboundPacket1_21_2.class, ServerboundPacket1_21_4.class, ServerboundPacket1_21_4.class);
    }

    @Override
@@ -79,7 +80,7 @@ final class Protocol1_98To1_99 extends BackwardsProtocol<ClientboundPacket1_21_2
        //new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_2.UPDATE_ATTRIBUTES);

        // Registers translatable mappings (missing a whole bunch still)
-        //translatableRewriter.registerOpenScreen(ClientboundPackets1_21_2.OPEN_SCREEN); // Handled by registerOpenScreen in item rewriters
+        //translatableRewriter.registerOpenScreen1_14(ClientboundPackets1_21_2.OPEN_SCREEN); // Handled by registerOpenScreen in item rewriters
        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_ACTION_BAR_TEXT);
        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_TITLE_TEXT);
        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_SUBTITLE_TEXT);
@@ -87,19 +88,20 @@ final class Protocol1_98To1_99 extends BackwardsProtocol<ClientboundPacket1_21_2
        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.DISCONNECT);
        translatableRewriter.registerTabList(ClientboundPackets1_21_2.TAB_LIST);
        translatableRewriter.registerPlayerCombatKill1_20(ClientboundPackets1_21_2.PLAYER_COMBAT_KILL);
+        translatableRewriter.registerPlayerInfoUpdate1_21_4(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE);
        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SYSTEM_CHAT);
-        translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.DISGUISED_CHAT);
-        translatableRewriter.registerPlayerInfoUpdate1_21_2(ClientboundPackets1_21_2.PLAYER_INFO_UPDATE);
+        translatableRewriter.registerDisguisedChat(ClientboundPackets1_21_2.DISGUISED_CHAT);
+        translatableRewriter.registerPlayerChat1_21_5(ClientboundPackets1_21_2.PLAYER_CHAT);
        translatableRewriter.registerPing();

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

    @Override
    public void init(final UserConnection user) {
-        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_20_5.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_4.PLAYER));
    }

    @Override
@@ -123,7 +125,7 @@ final class Protocol1_98To1_99 extends BackwardsProtocol<ClientboundPacket1_21_2
    }

    @Override
-    public ComponentRewriter1_99 getComponentRewriter() {
+    public NBTComponentRewriter<ClientboundPacket1_21_2> getComponentRewriter() {
        return translatableRewriter;
    }

@@ -133,12 +135,12 @@ final class Protocol1_98To1_99 extends BackwardsProtocol<ClientboundPacket1_21_2
    }

    @Override
-    protected PacketTypesProvider<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_2, ServerboundPacket1_21_2> createPacketTypesProvider() {
+    protected PacketTypesProvider<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_4, ServerboundPacket1_21_4> createPacketTypesProvider() {
        return new SimplePacketTypesProvider<>(
            packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_21_2.class, ClientboundConfigurationPackets1_21.class),
            packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_21_2.class, ClientboundConfigurationPackets1_21.class),
-            packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_21_2.class, ServerboundConfigurationPackets1_20_5.class),
-            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_21_2.class, ServerboundConfigurationPackets1_20_5.class)
+            packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_21_4.class, ServerboundConfigurationPackets1_20_5.class),
+            packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_21_4.class, ServerboundConfigurationPackets1_20_5.class)
        );
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -21,7 +21,7 @@ package com.viaversion.viabackwards.protocol.v1_10to1_9_3;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_10to1_9_3.rewriter.BlockItemPacketRewriter1_10;
 import com.viaversion.viabackwards.protocol.v1_10to1_9_3.rewriter.EntityPacketRewriter1_10;
 import com.viaversion.viaversion.api.connection.UserConnection;
@@ -34,7 +34,7 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 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;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;

 public class Protocol1_10To1_9_3 extends BackwardsProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {

@@ -92,7 +92,7 @@ public class Protocol1_10To1_9_3 extends BackwardsProtocol<ClientboundPackets1_9
            }
        });

-        TranslatableRewriter<ClientboundPackets1_9_3> componentRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
+        JsonNBTComponentRewriter<ClientboundPackets1_9_3> componentRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
        componentRewriter.registerComponentPacket(ClientboundPackets1_9_3.CHAT);
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -89,6 +89,9 @@ public class EntityPacketRewriter1_10 extends LegacyEntityRewriter<ClientboundPa
                handler(wrapper -> {
                    int entityId = wrapper.get(Types.VAR_INT, 0);
                    EntityType type = tracker(wrapper.user()).entityType(entityId);
+                    if (type == null) {
+                        return;
+                    }

                    List<EntityData> entityDataList = wrapper.get(Types1_9.ENTITY_DATA_LIST, 0);
                    handleEntityData(wrapper.get(Types.VAR_INT, 0), entityDataList, wrapper.user());
@@ -161,11 +164,11 @@ public class EntityPacketRewriter1_10 extends LegacyEntityRewriter<ClientboundPa

    @Override
    public EntityType typeFromId(int typeId) {
-        return EntityTypes1_10.getTypeFromId(typeId, false);
+        return EntityTypes1_10.EntityType.findById(typeId);
    }

    @Override
-    public EntityType objectTypeFromId(int typeId) {
-        return EntityTypes1_10.getTypeFromId(typeId, true);
+    public EntityType objectTypeFromId(int typeId, int data) {
+        return EntityTypes1_10.ObjectType.getEntityType(typeId, data);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -117,11 +117,11 @@ public class EntityPacketRewriter1_11_1 extends LegacyEntityRewriter<Clientbound

    @Override
    public EntityType typeFromId(int typeId) {
-        return EntityTypes1_11.getTypeFromId(typeId, false);
+        return EntityTypes1_11.EntityType.findById(typeId);
    }

    @Override
-    public EntityType objectTypeFromId(int typeId) {
-        return EntityTypes1_11.getTypeFromId(typeId, true);
+    public EntityType objectTypeFromId(int typeId, int data) {
+        return EntityTypes1_11.ObjectType.getEntityType(typeId, data);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -21,7 +21,7 @@ package com.viaversion.viabackwards.protocol.v1_11to1_10;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.BlockItemPacketRewriter1_11;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.EntityPacketRewriter1_11;
 import com.viaversion.viabackwards.protocol.v1_11to1_10.rewriter.PlayerPacketRewriter1_11;
@@ -30,17 +30,16 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
-import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;
 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;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;

 public class Protocol1_11To1_10 extends BackwardsProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {

    public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.11", "1.10");
    private final EntityPacketRewriter1_11 entityRewriter = new EntityPacketRewriter1_11(this);
    private final BlockItemPacketRewriter1_11 itemRewriter = new BlockItemPacketRewriter1_11(this);
-    private TranslatableRewriter<ClientboundPackets1_9_3> componentRewriter;
+    private JsonNBTComponentRewriter<ClientboundPackets1_9_3> componentRewriter;

    public Protocol1_11To1_10() {
        super(ClientboundPackets1_9_3.class, ClientboundPackets1_9_3.class, ServerboundPackets1_9_3.class, ServerboundPackets1_9_3.class);
@@ -56,7 +55,7 @@ public class Protocol1_11To1_10 extends BackwardsProtocol<ClientboundPackets1_9_
        soundRewriter.registerNamedSound(ClientboundPackets1_9_3.CUSTOM_SOUND);
        soundRewriter.registerSound(ClientboundPackets1_9_3.SOUND);

-        componentRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
+        componentRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
        componentRewriter.registerComponentPacket(ClientboundPackets1_9_3.CHAT);
    }

@@ -85,7 +84,7 @@ public class Protocol1_11To1_10 extends BackwardsProtocol<ClientboundPackets1_9_
        return itemRewriter;
    }

-    public TranslatableRewriter<ClientboundPackets1_9_3> getComponentRewriter() {
+    public JsonNBTComponentRewriter<ClientboundPackets1_9_3> getComponentRewriter() {
        return componentRewriter;
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -60,7 +60,7 @@ public class BlockItemPacketRewriter1_11 extends LegacyBlockItemRewriter<Clientb
        protocol.registerClientbound(ClientboundPackets1_9_3.CONTAINER_SET_SLOT, new PacketHandlers() {
            @Override
            public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                map(Types.SHORT); // 1 - Slot ID
                map(Types.ITEM1_8); // 2 - Slot Value

@@ -118,7 +118,7 @@ public class BlockItemPacketRewriter1_11 extends LegacyBlockItemRewriter<Clientb
        protocol.registerServerbound(ServerboundPackets1_9_3.CONTAINER_CLICK, new PacketHandlers() {
            @Override
            public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                map(Types.SHORT); // 1 - Slot
                map(Types.BYTE); // 2 - Button
                map(Types.SHORT); // 3 - Action number
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -364,11 +364,11 @@ public class EntityPacketRewriter1_11 extends LegacyEntityRewriter<ClientboundPa

    @Override
    public EntityType typeFromId(int typeId) {
-        return EntityTypes1_11.getTypeFromId(typeId, false);
+        return EntityTypes1_11.EntityType.findById(typeId);
    }

    @Override
-    public EntityType objectTypeFromId(int typeId) {
-        return EntityTypes1_11.getTypeFromId(typeId, true);
+    public EntityType objectTypeFromId(int typeId, int data) {
+        return EntityTypes1_11.ObjectType.getEntityType(typeId, data);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -95,7 +95,7 @@ public class BlockItemPacketRewriter1_12 extends LegacyBlockItemRewriter<Clientb
        protocol.registerServerbound(ServerboundPackets1_9_3.CONTAINER_CLICK, new PacketHandlers() {
            @Override
            public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                map(Types.SHORT); // 1 - Slot
                map(Types.BYTE); // 2 - Button
                map(Types.SHORT); // 3 - Action number
@@ -112,7 +112,7 @@ public class BlockItemPacketRewriter1_12 extends LegacyBlockItemRewriter<Clientb

                        // Apologize (may happen in some cases, maybe if inventory is full?)
                        PacketWrapper confirm = wrapper.create(ServerboundPackets1_12.CONTAINER_ACK);
-                        confirm.write(Types.UNSIGNED_BYTE, wrapper.get(Types.UNSIGNED_BYTE, 0));
+                        confirm.write(Types.BYTE, wrapper.get(Types.BYTE, 0));
                        confirm.write(Types.SHORT, wrapper.get(Types.SHORT, 1));
                        confirm.write(Types.BOOLEAN, false); // Success - not used

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -18,18 +18,18 @@

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

-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;
-import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;

-public class ComponentRewriter1_12 extends TranslatableRewriter<ClientboundPackets1_12> {
+public class ComponentRewriter1_12 extends JsonNBTComponentRewriter<ClientboundPackets1_12> {

    public ComponentRewriter1_12(Protocol1_12To1_11_1 protocol) {
-        super(protocol, ComponentRewriter.ReadType.JSON);
+        super(protocol, ComponentRewriterBase.ReadType.JSON);
    }

    @Override
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -18,6 +18,7 @@

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

+import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.rewriters.LegacyEntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.Protocol1_12To1_11_1;
 import com.viaversion.viabackwards.protocol.v1_12to1_11_1.storage.ParrotStorage;
@@ -35,7 +36,6 @@ import com.viaversion.viaversion.api.type.types.version.Types1_9;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.packet.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ClientboundPackets1_9_3;
-import com.viaversion.nbt.tag.CompoundTag;

 public class EntityPacketRewriter1_12 extends LegacyEntityRewriter<ClientboundPackets1_12, Protocol1_12To1_11_1> {

@@ -285,11 +285,11 @@ public class EntityPacketRewriter1_12 extends LegacyEntityRewriter<ClientboundPa

    @Override
    public EntityType typeFromId(int typeId) {
-        return EntityTypes1_12.getTypeFromId(typeId, false);
+        return EntityTypes1_12.EntityType.findById(typeId);
    }

    @Override
-    public EntityType objectTypeFromId(int typeId) {
-        return EntityTypes1_12.getTypeFromId(typeId, true);
+    public EntityType objectTypeFromId(int typeId, int data) {
+        return EntityTypes1_12.ObjectType.getEntityType(typeId, data);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -20,7 +20,7 @@ package com.viaversion.viabackwards.protocol.v1_13_1to1_13;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.BackwardsMappingData;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_13_1to1_13.rewriter.CommandRewriter1_13_1;
 import com.viaversion.viabackwards.protocol.v1_13_1to1_13.rewriter.EntityPacketRewriter1_13_1;
 import com.viaversion.viabackwards.protocol.v1_13_1to1_13.rewriter.ItemPacketRewriter1_13_1;
@@ -40,7 +40,7 @@ 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.ComponentRewriter;
+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;
@@ -52,7 +52,7 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
    private final EntityPacketRewriter1_13_1 entityRewriter = new EntityPacketRewriter1_13_1(this);
    private final ItemPacketRewriter1_13_1 itemRewriter = new ItemPacketRewriter1_13_1(this);
    private final ParticleRewriter<ClientboundPackets1_13> particleRewriter = new ParticleRewriter<>(this);
-    private final TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
+    private final JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON);
    private final TagRewriter<ClientboundPackets1_13> tagRewriter = new TagRewriter<>(this);

    public Protocol1_13_1To1_13() {
@@ -230,7 +230,7 @@ public class Protocol1_13_1To1_13 extends BackwardsProtocol<ClientboundPackets1_
        return particleRewriter;
    }

-    public TranslatableRewriter<ClientboundPackets1_13> translatableRewriter() {
+    public JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter() {
        return translatableRewriter;
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -55,15 +55,14 @@ public class EntityPacketRewriter1_13_1 extends LegacyEntityRewriter<Clientbound
                handler(wrapper -> {
                    int entityId = wrapper.get(Types.VAR_INT, 0);
                    byte type = wrapper.get(Types.BYTE, 0);
-                    EntityTypes1_13.EntityType entType = EntityTypes1_13.getTypeFromId(type, true);
+                    int data = wrapper.get(Types.INT, 0);
+                    EntityTypes1_13.EntityType entType = EntityTypes1_13.ObjectType.getEntityType(type, data);
                    if (entType == null) {
-                        protocol.getLogger().warning("Could not find entity type " + type);
                        return;
                    }

                    // Rewrite falling block
                    if (entType.is(EntityTypes1_13.EntityType.FALLING_BLOCK)) {
-                        int data = wrapper.get(Types.INT, 0);
                        wrapper.set(Types.INT, 0, protocol.getMappingData().getNewBlockStateId(data));
                    }

@@ -160,11 +159,11 @@ public class EntityPacketRewriter1_13_1 extends LegacyEntityRewriter<Clientbound

    @Override
    public EntityType typeFromId(int typeId) {
-        return EntityTypes1_13.getTypeFromId(typeId, false);
+        return EntityTypes1_13.EntityType.findById(typeId);
    }

    @Override
-    public EntityType objectTypeFromId(int typeId) {
-        return EntityTypes1_13.getTypeFromId(typeId, true);
+    public EntityType objectTypeFromId(int typeId, int data) {
+        return EntityTypes1_13.ObjectType.getEntityType(typeId, data);
    }
 }
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -30,7 +30,7 @@ public class ItemPacketRewriter1_13_2 {
        protocol.registerClientbound(ClientboundPackets1_13.CONTAINER_SET_SLOT, new PacketHandlers() {
            @Override
            public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                map(Types.SHORT); // 1 - Slot ID
                map(Types.ITEM1_13_2, Types.ITEM1_13); // 2 - Slot Value
            }
@@ -117,7 +117,7 @@ public class ItemPacketRewriter1_13_2 {
        protocol.registerServerbound(ServerboundPackets1_13.CONTAINER_CLICK, new PacketHandlers() {
            @Override
            public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                map(Types.SHORT); // 1 - Slot
                map(Types.BYTE); // 2 - Button
                map(Types.SHORT); // 3 - Action number
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -20,7 +20,7 @@ package com.viaversion.viabackwards.protocol.v1_13to1_12_2;

 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
-import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.api.rewriters.text.JsonNBTComponentRewriter;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.data.BackwardsMappingData1_13;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.data.PaintingNames1_13;
 import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider;
@@ -45,7 +45,7 @@ import com.viaversion.viaversion.protocols.v1_12_2to1_13.packet.ServerboundPacke
 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.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.text.ComponentRewriterBase;
 import com.viaversion.viaversion.util.ComponentUtil;
 import com.viaversion.viaversion.util.ProtocolLogger;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -56,7 +56,7 @@ public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_
    public static final ProtocolLogger LOGGER = new ProtocolLogger(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 TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON) {
+    private final JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON) {
        @Override
        protected void handleTranslate(JsonObject root, String translate) {
            String mappedKey = mappedTranslationKey(translate);
@@ -65,7 +65,7 @@ public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_
            }
        }
    };
-    private final TranslatableRewriter<ClientboundPackets1_13> translatableToLegacyRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON) {
+    private final JsonNBTComponentRewriter<ClientboundPackets1_13> translatableToLegacyRewriter = new JsonNBTComponentRewriter<>(this, ComponentRewriterBase.ReadType.JSON) {
        @Override
        protected void handleTranslate(JsonObject root, String translate) {
            String mappedKey = mappedTranslationKey(translate);
@@ -148,7 +148,7 @@ public class Protocol1_13To1_12_2 extends BackwardsProtocol<ClientboundPackets1_
    }

    // Don't override the parent method
-    public TranslatableRewriter<ClientboundPackets1_13> translatableRewriter() {
+    public JsonNBTComponentRewriter<ClientboundPackets1_13> translatableRewriter() {
        return translatableRewriter;
    }

@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
@@ -1,6 +1,6 @@
 /*
 * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2024 ViaVersion and contributors
+ * 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
Author	SHA1	Message	Date
Nassim Jahnke	ddcaa78b61	5.3.0 Release	2025-03-28 18:57:40 +01:00
Nassim Jahnke	d3c6065367	Remove missing new registries	2025-03-28 17:59:47 +01:00
Nassim Jahnke	df5353be29	Also check for hanging sign block entities	2025-03-28 17:05:50 +01:00
FlorianMichael	9e8e23d308	Use TagUtil#getNamespacedTagKey in component rewriter	2025-03-28 15:19:33 +01:00
Nassim Jahnke	3693ec6021	Process player chat and disguised chat text components	2025-03-27 16:23:22 +01:00
Nassim Jahnke	0a5ba125f7	Add 1.21.5 translations	2025-03-26 14:32:57 +01:00
Nassim Jahnke	8f861f670c	Update dependencies	2025-03-23 11:00:30 +01:00
Nassim Jahnke	0f806f1016	1.21.5-pre1	2025-03-12 16:54:34 +01:00
Nassim Jahnke	fbba2dc81b	Handle show_in_tooltip and other structural changes in show item hovers	2025-03-12 16:54:34 +01:00
Nassim Jahnke	61f537e9b9	Fix some entity variants	2025-03-12 16:54:34 +01:00
FlorianMichael	ba84a588f1	Backup PROVIDES_TRIM_MATERIAL item component	2025-03-12 16:54:34 +01:00
Nassim Jahnke	4ec0969b45	Send horse saddle equipment as entity data	2025-03-12 16:54:33 +01:00
Nassim Jahnke	19a04666e5	Update sign text	2025-03-12 16:54:33 +01:00
Nassim Jahnke	9a5e2f8e8c	25w08a	2025-03-12 16:54:33 +01:00
Nassim Jahnke	a33feff59b	25w07a	2025-03-12 16:54:33 +01:00
Nassim Jahnke	612a6b3696	25w06a	2025-03-12 16:54:32 +01:00
Nassim Jahnke	b42e466248	Null check bypassed_by tag	2025-03-12 16:54:32 +01:00
Nassim Jahnke	e4ea6aa5e2	25w05a	2025-03-12 16:54:32 +01:00
Nassim Jahnke	c40e092b48	Start working on 25w04a Testing will be easier once Mojang fixes current crashes and parsing issues	2025-03-12 16:54:32 +01:00
Nassim Jahnke	46a33a42ec	Handle new item data components	2025-03-12 16:54:31 +01:00
Nassim Jahnke	d31892513c	Mostly done 25w03a	2025-03-12 16:54:31 +01:00
Nassim Jahnke	e6af10a0b6	25w02a	2025-03-12 16:54:31 +01:00
Nassim Jahnke	f6dcd149cb	Update pre-1.20 container id types	2025-03-11 10:38:06 +01:00
Nassim Jahnke	1fb2bd410f	Fix inverted player input when in a vehicle Fixes #969	2025-03-10 11:28:31 +01:00
github-actions[bot]andgradle-update-robot	b1e667fadb	Update Gradle Wrapper from 8.12.1 to 8.13 (#966 ) Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc> Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>	2025-02-25 18:41:22 +01:00
Nassim Jahnke	7eb0522150	Also remove data component overrides in hover events Fixes ViaVersion/ViaVersion#4395	2025-02-25 13:51:31 +01:00
Nassim Jahnke	3f6c172d7b	Fix player rotation in 1.21.2->1.21.2 Fixes ViaVersion/ViaVersion#4380	2025-02-08 14:24:35 +01:00
Nassim Jahnke	9e7fad2840	Update minecart held block states in 1.17->1.16 Fixes #958	2025-02-04 11:04:58 +01:00
FlorianMichael	2f3c869f4d	Fix compile error	2025-02-03 00:22:12 +01:00
bookyandFlorianMichael	c6b287bfac	Always rewrite map color ids in 1.17->1.16.4 (#956 ) Co-authored-by: FlorianMichael <florian.michael07@gmail.com>	2025-02-03 00:17:34 +01:00
EnZaXD	0f59bf96c8	Only send registry before tags if not empty in 1.20.5->1.20.3 (#955 )	2025-01-31 22:35:37 +01:00
Florian	ca5028a7fa	Use ProtocolRunnable in PlayerPacketsTickTask (#954 )	2025-01-29 20:53:00 +01:00
github-actions[bot]andgradle-update-robot	9740910d98	Update Gradle Wrapper from 8.12 to 8.12.1 (#953 ) Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc> Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>	2025-01-26 20:01:56 +01:00
EnZaXD	cb9907743d	Add show_item rewriting to 1.20.5->1.20.3 (#931 )	2025-01-15 12:04:18 +01:00
EnZaXD	4617e6e416	[ci skip] Exclude .DS_Store file (#951 )	2025-01-11 10:17:25 +01:00
Nassim Jahnke	de0c869dbb	Update component rewriters	2025-01-10 21:38:08 +01:00
EnZaXD	29ec02687c	Properly track minecart object entity types in <= 1.12.2 (#946 )	2025-01-10 17:14:47 +01:00
Nassim Jahnke	481b06cd2a	Fix inlined jukebox song backup Fixes #949	2025-01-09 22:47:20 +01:00
Ryn.	624fb6acd4	[ci skip] Fix typo in README.md (#947 )	2025-01-07 17:48:06 +01:00
Nassim Jahnke	284810f1e5	5.2.1 Release	2025-01-01 21:19:07 +01:00
Nassim Jahnke	28df61e98e	[ci skip] Update copyright header	2025-01-01 12:32:56 +01:00
Nassim Jahnke	a1a71a160a	Mark publish tasks as not compatible with config cache for now	2024-12-29 13:48:39 +01:00
Nassim Jahnke	4265866c93	Enable Gradle configuration cache	2024-12-29 12:59:34 +01:00
Nassim Jahnke	b197c758b5	Add empty flowers and tall_flowers tags Fixes #945	2024-12-22 10:55:12 +01:00
github-actions[bot]andgradle-update-robot	a38904e5c6	Update Gradle Wrapper from 8.11.1 to 8.12 (#943 ) Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc> Co-authored-by: gradle-update-robot <gradle-update-robot@regolo.cc>	2024-12-22 03:25:27 +01:00
EnZaXD	b214235c04	Map first float of 1.21.4 custom model data as int for 1.21.3 clients (#942 )	2024-12-20 09:21:14 +01:00
Nassim Jahnke	0dc7b471b8	Add pale_garden biome mapping	2024-12-18 14:19:43 +01:00
Nassim Jahnke	da75e1957f	Fix potion effect tag backup Fixes #4319	2024-12-17 18:24:16 +01:00
Kichura	9675bbd8fe	[ci skip] Migrate to the setup-gradle action (#937 )	2024-12-17 00:46:22 +01:00
EnZaXD	f0def507fd	Null check entity type in LegacyEntityRewriter#getObjectTrackerHandler (#935 )	2024-12-16 01:23:05 +01:00
Kichura	e0430c0f45	[ci skip] Do not persist credentials in checkout action (#934 )	2024-12-15 18:30:28 +01:00
Nassim Jahnke	c770c3e1fa	Update VV dep, a field type changes	2024-12-15 10:14:20 +01:00
Nassim Jahnke	3896a12166	[ci skip] Update some text and comments	2024-12-15 10:13:28 +01:00
EnZaXD	563a3e518d	Handle unknown entity types correctly (#932 )	2024-12-15 10:13:08 +01:00
Nassim Jahnke	8896528c34	5.2.0 Release	2024-12-06 16:11:13 +01:00
Nassim Jahnke	8ec7c27153	Check for client state in event loop in PlayerPacketsTickTask	2024-12-05 23:22:03 +01:00
Nassim Jahnke	5f0cb34e64	Merge branch 'master' into preview	2024-12-05 17:17:35 +01:00
Nassim Jahnke	5f6696f741	Update FUNDING.yml	2024-12-04 22:04:30 +01:00
FlorianMichael	7b48d1bd56	Add snapshot support section to README	2024-12-04 20:42:45 +01:00
Nassim Jahnke	b6828aa73d	Add missing set_player_inventory handler, update template protocol	2024-12-04 15:43:49 +01:00
Nassim Jahnke	7711974b58	Remove remaining changed data from show item hovers	2024-12-04 12:41:09 +01:00
Nassim Jahnke	07037fd201	Enable experimental feature for .3 clients	2024-12-03 23:29:16 +01:00
Nassim Jahnke	c6ac4542f1	Remove unnecessary container set data handler	2024-12-03 23:16:26 +01:00
Nassim Jahnke	1805777b6f	Fix switcheroo	2024-11-29 13:59:42 +01:00
Nassim Jahnke	4f6fa42f53	Update mappings	2024-11-27 21:59:58 +01:00
Nassim Jahnke	07272b7ab3	Add translation mappings	2024-11-27 21:59:58 +01:00
Nassim Jahnke	b3e508444d	1.21.4-pre1	2024-11-27 21:59:58 +01:00
Nassim Jahnke	68b8481de1	24w46a	2024-11-27 21:59:58 +01:00
Nassim Jahnke	402aff9656	24w45a (mostly)	2024-11-27 21:59:58 +01:00
Nassim Jahnke	2456b05ea6	24w44a	2024-11-27 21:59:58 +01:00