4.9.0 Release

Fixes 1.20.2+ Fabric servers with Fabric API

Co-authored-by: EnZaXD <60033407+FlorianMichael@users.noreply.github.com>

.github/workflows/gradle.yml

@@ -9,16 +9,15 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: gradle/wrapper-validation-action@v1
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+    - name: Validate Gradle Wrapper
+      uses: gradle/wrapper-validation-action@v1
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: 11
+        check-latest: true
     - name: Build with Gradle
       run: ./gradlew build
-    - uses: actions/upload-artifact@v3
-      with:
-        name: artifact
-        path: build/libs

.github/workflows/publish.yml

@@ -0,0 +1,25 @@
+name: Publish to Hangar and Modrinth
+on:
+  push:
+    branches:
+      - master
+      - dev
+
+jobs:
+  publish:
+    if: github.repository_owner == 'ViaVersion'
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          check-latest: true
+      - name: Publish
+        env:
+          HANGAR_TOKEN: ${{ secrets.HANGAR_TOKEN }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+        run: ./gradlew build modrinth publishAllPublicationsToHangar --stacktrace

README.md

@@ -4,43 +4,53 @@
 [![Build Status](https://github.com/ViaVersion/ViaBackwards/actions/workflows/gradle.yml/badge.svg?branch=master)](https://github.com/ViaVersion/ViaBackwards/actions)
 [![Discord](https://img.shields.io/badge/chat-on%20discord-blue.svg)](https://viaversion.com/discord)
 
-**Allows older Minecraft client versions to connect to newer server versions**
+**Allows older Minecraft client versions to connect to newer server versions.**
+
+Requires [ViaVersion](https://hangar.papermc.io/ViaVersion/ViaVersion) to be installed..
 
 Supported Versions
 -
-**Green** = ViaVersion\
-**Purple** = ViaBackwards addition
+As a plugin, ViaBackwards runs on servers on releases 1.10-latest. Versions from the dev branch will also support the
+latest snapshot. You can also use ViaBackwards in ViaFabric or ViaFabricPlus.
 
-![supported_versions](https://i.imgur.com/KpLsMHj.png)
+See [HERE](https://github.com/ViaVersion) for an overview of the different Via* projects.
 
-Releases / Dev Builds
+Releases/Dev Builds
 -
-**Requires [ViaVersion](https://www.spigotmc.org/resources/viaversion.19254/) to be installed**
-   
-You can find the latest dev builds here:\
-**Jenkins:** https://ci.viaversion.com/view/ViaBackwards/
+You can find releases in the following places:
 
-**Spigot page:** https://www.spigotmc.org/resources/viabackwards.27448/
+- **Hangar (for our plugins)**: https://hangar.papermc.io/ViaVersion/ViaBackwards
+- **Modrinth (for our mods)**: https://modrinth.com/mod/viabackwards
+- **GitHub**: https://github.com/ViaVersion/ViaBackwards/releases
 
-**CurseForge page:** https://www.curseforge.com/minecraft/mc-mods/viabackwards
+Dev builds for **all** of our projects are on our Jenkins server:
+
+- **Jenkins**: https://ci.viaversion.com/view/ViaBackwards/
 
 Known issues
 -
-* Custom 1.17+ min_y and height world values are not and will (most likely) never be supported => Clients older than 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
+
+* 1.17+ min_y and height world values that are not 0/256 **are not supported**. Clients older than
+  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
+  installing [AxSmithing](https://github.com/ViaVersionAddons/AxSmithing)
 
 Other Links
 -
 **Maven:** https://repo.viaversion.com
 
-**Issue tracker:** https://github.com/ViaVersion/ViaBackwards/issues
-
 **List of contributors:** https://github.com/ViaVersion/ViaBackwards/graphs/contributors
 
+Building
+-
+After cloning this repository, build the project with Gradle by running `./gradlew build` and take the created jar out
+of the `build/libs` directory.
+
 License
 -
-This project is licensed under the [GNU General Public License](LICENSE).
+This project is licensed under the [GNU General Public License Version 3](LICENSE).
 
 Special Thanks
 -

build-logic/build.gradle.kts

@@ -8,5 +8,5 @@ repositories {
 
 dependencies {
     // version must be manually kept in sync with the one in root project settings.gradle.kts
-    implementation("com.github.johnrengelman", "shadow", "8.1.0")
+    implementation("com.github.johnrengelman", "shadow", "8.1.1")
 }

build-logic/src/main/kotlin/extensions.kt

@@ -38,6 +38,33 @@ fun Project.latestCommitHash(): String {
     return byteOut.toString(Charsets.UTF_8.name()).trim()
 }
 
+fun Project.latestCommitMessage(): String {
+    val byteOut = ByteArrayOutputStream()
+    exec {
+        commandLine = listOf("git", "log", "-1", "--pretty=%B")
+        standardOutput = byteOut
+    }
+    return byteOut.toString(Charsets.UTF_8.name()).trim()
+}
+
+fun Project.branchName(): String {
+    val byteOut = ByteArrayOutputStream()
+    exec {
+        commandLine = listOf("git", "rev-parse", "--abbrev-ref", "HEAD")
+        standardOutput = byteOut
+    }
+    return byteOut.toString(Charsets.UTF_8.name()).trim()
+}
+
+fun Project.parseMinecraftSnapshotVersion(version: String): String? {
+    val separatorIndex = version.indexOf('-')
+    val lastSeparatorIndex = version.lastIndexOf('-')
+    if (separatorIndex == -1 || separatorIndex == lastSeparatorIndex) {
+        return null
+    }
+    return version.substring(separatorIndex + 1, lastSeparatorIndex)
+}
+
 fun JavaPluginExtension.javaTarget(version: Int) {
     sourceCompatibility = JavaVersion.toVersion(version)
     targetCompatibility = JavaVersion.toVersion(version)

build-logic/src/main/kotlin/vb.platform-conventions.gradle.kts

@@ -1,12 +0,0 @@
-import java.util.*
-
-plugins {
-    id("vb.shadow-conventions")
-}
-
-tasks {
-    shadowJar {
-        archiveFileName.set("ViaBackwards-${project.name.substringAfter("viabackwards-").replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}-${project.version}.jar")
-        destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
-    }
-}

build.gradle.kts

@@ -5,11 +5,13 @@ plugins {
 
 allprojects {
     group = "com.viaversion"
-    version = "4.6.0"
+    version = property("projectVersion") as String // from gradle.properties
     description = "Allow older clients to join newer server versions."
 }
 
-val platforms = setOf(
+val main = setOf(
+        projects.viabackwards,
+        projects.viabackwardsCommon,
         projects.viabackwardsBukkit,
         projects.viabackwardsBungee,
         projects.viabackwardsFabric,
@@ -17,15 +19,9 @@ val platforms = setOf(
         projects.viabackwardsVelocity
 ).map { it.dependencyProject }
 
-// Would otherwise contain api/depdency modules if at some point needed
-val special = setOf(
-        projects.viabackwards
-).map { it.dependencyProject }
-
 subprojects {
     when (this) {
-        in platforms -> plugins.apply("vb.platform-conventions")
-        in special -> plugins.apply("vb.base-conventions")
+        in main -> plugins.apply("vb.shadow-conventions")
         else -> plugins.apply("vb.standard-conventions")
     }
 }

bukkit/build.gradle.kts

@@ -1,5 +1,5 @@
 dependencies {
-    implementation(projects.viabackwardsCommon)
+    compileOnlyApi(projects.viabackwardsCommon)
     compileOnly(libs.paper) {
         exclude("com.google.code.gson", "gson")
         exclude("javax.persistence", "persistence-api")

bukkit/src/main/java/com/viaversion/viabackwards/BukkitPlugin.java

@@ -25,13 +25,14 @@ import com.viaversion.viabackwards.listener.LecternInteractListener;
 import com.viaversion.viabackwards.listener.PlayerItemDropListener;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.bukkit.platform.BukkitViaLoader;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
+
 public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform {
 
     public BukkitPlugin() {
-        Via.getManager().addEnableListener(() -> init(getDataFolder()));
+        Via.getManager().addEnableListener(() -> init(new File(getDataFolder(), "config.yml")));
     }
 
     @Override
@@ -45,19 +46,18 @@ public class BukkitPlugin extends JavaPlugin implements ViaBackwardsPlatform {
     }
 
     private void enable() {
-        BukkitViaLoader loader = (BukkitViaLoader) Via.getManager().getLoader();
         int protocolVersion = Via.getAPI().getServerVersion().highestSupportedVersion();
         if (protocolVersion >= ProtocolVersion.v1_17.getVersion()) {
-            loader.storeListener(new PlayerItemDropListener(this)).register();
+            new PlayerItemDropListener(this).register();
         }
         if (protocolVersion >= ProtocolVersion.v1_16.getVersion()) {
-            loader.storeListener(new FireExtinguishListener(this)).register();
+            new FireExtinguishListener(this).register();
         }
         if (protocolVersion >= ProtocolVersion.v1_14.getVersion()) {
-            loader.storeListener(new LecternInteractListener(this)).register();
+            new LecternInteractListener(this).register();
         }
         if (protocolVersion >= ProtocolVersion.v1_12.getVersion()) {
-            loader.storeListener(new FireDamageListener(this)).register();
+            new FireDamageListener(this).register();
         }
     }
 

bungee/build.gradle.kts

@@ -1,4 +1,4 @@
 dependencies {
-    implementation(projects.viabackwardsCommon)
+    compileOnlyApi(projects.viabackwardsCommon)
     compileOnly(libs.bungee)
 }

bungee/src/main/java/com/viaversion/viabackwards/BungeePlugin.java

@@ -20,14 +20,15 @@ package com.viaversion.viabackwards;
 
 import com.viaversion.viabackwards.api.ViaBackwardsPlatform;
 import com.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.data.MappingDataLoader;
 import net.md_5.bungee.api.plugin.Plugin;
 
+import java.io.File;
+
 public class BungeePlugin extends Plugin implements ViaBackwardsPlatform {
 
     @Override
     public void onLoad() {
-        Via.getManager().addEnableListener(() -> this.init(getDataFolder()));
+        Via.getManager().addEnableListener(() -> this.init(new File(getDataFolder(), "config.yml")));
     }
 
 

common/build.gradle.kts

@@ -1,10 +1,17 @@
 plugins {
     id("net.kyori.blossom")
+    id("org.jetbrains.gradle.plugin.idea-ext")
 }
 
-blossom {
-    replaceToken("\$VERSION", project.version)
-    replaceToken("\$IMPL_VERSION", "git-ViaBackwards-${project.version}:${rootProject.latestCommitHash()}")
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+                property("impl_version", "git-ViaBackwards-${project.version}:${rootProject.latestCommitHash()}")
+            }
+        }
+    }
 }
 
 dependencies {

common/src/main/java-templates/com/viaversion/viabackwards/utils/VersionInfo.java

@@ -17,7 +17,16 @@
  */
 package com.viaversion.viabackwards.utils;
 
-public class VersionInfo {
+public final class VersionInfo {
 
-    public static final String VERSION = "$VERSION";
+    public static final String VERSION = "{{ version }}";
+    private static final String IMPLEMENTATION_VERSION = "{{ impl_version }}";
+
+    public static String getVersion() {
+        return VERSION;
+    }
+
+    public static String getImplementationVersion() {
+        return IMPLEMENTATION_VERSION;
+    }
 }

common/src/main/java/com/viaversion/viabackwards/ViaBackwards.java

@@ -28,7 +28,7 @@ public final class ViaBackwards {
     private static ViaBackwardsConfig config;
 
     public static void init(ViaBackwardsPlatform platform, ViaBackwardsConfig config) {
-        Preconditions.checkArgument(platform != null, "ViaBackwards is already initialized");
+        Preconditions.checkArgument(ViaBackwards.platform == null, "ViaBackwards is already initialized");
 
         ViaBackwards.platform = platform;
         ViaBackwards.config = config;

common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java

@@ -21,10 +21,8 @@ import com.viaversion.viaversion.util.Config;
 import java.io.File;
 import java.net.URL;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class ViaBackwardsConfig extends Config implements com.viaversion.viabackwards.api.ViaBackwardsConfig {
 
@@ -34,15 +32,14 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
     private boolean alwaysShowOriginalMobName;
     private boolean fix1_13FormattedInventoryTitles;
     private boolean handlePingsAsInvAcknowledgements;
-    private Map<String, String> chatTypeFormats;
 
     public ViaBackwardsConfig(File configFile) {
         super(configFile);
     }
 
     @Override
-    public void reloadConfig() {
-        super.reloadConfig();
+    public void reload() {
+        super.reload();
         loadFields();
     }
 
@@ -53,7 +50,6 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
         fix1_13FormattedInventoryTitles = getBoolean("fix-formatted-inventory-titles", true);
         alwaysShowOriginalMobName = getBoolean("always-show-original-mob-name", true);
         handlePingsAsInvAcknowledgements = getBoolean("handle-pings-as-inv-acknowledgements", false);
-        chatTypeFormats = get("chat-types-1_19_1", Map.class, new HashMap<String, String>());
     }
 
     @Override
@@ -86,11 +82,6 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
         return handlePingsAsInvAcknowledgements || Boolean.getBoolean("com.viaversion.handlePingsAsInvAcknowledgements");
     }
 
-    @Override
-    public @Nullable String chatTypeFormat(final String translationKey) {
-        return chatTypeFormats.get(translationKey);
-    }
-
     @Override
     public URL getDefaultConfigURL() {
         return getClass().getClassLoader().getResource("assets/viabackwards/config.yml");

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java

@@ -17,9 +17,9 @@
  */
 package com.viaversion.viabackwards.api;
 
-import org.checkerframework.checker.nullness.qual.Nullable;
+import com.viaversion.viaversion.api.configuration.Config;
 
-public interface ViaBackwardsConfig {
+public interface ViaBackwardsConfig extends Config {
 
     /**
      * Mimics name and level of a custom enchant through the item's lore.
@@ -42,6 +42,11 @@ public interface ViaBackwardsConfig {
      */
     boolean isFix1_13FacePlayer();
 
+    /**
+     * Converts the 1.13 face look-at packet for 1.12- players. Requires a bit of extra caching.
+     *
+     * @return true if enabled
+     */
     boolean fix1_13FormattedInventoryTitle();
 
     /**
@@ -51,7 +56,11 @@ public interface ViaBackwardsConfig {
      */
     boolean alwaysShowOriginalMobName();
 
+    /**
+     * Sends inventory acknowledgement packets to act as a replacement for ping packets for sub 1.17 clients.
+     * This only takes effect for ids in the short range. Useful for anticheat compatibility.
+     *
+     * @return true if enabled
+     */
     boolean handlePingsAsInvAcknowledgements();
-
-    @Nullable String chatTypeFormat(String translationKey);
 }

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java

@@ -49,26 +49,33 @@ import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.Protocol1_18_2T
 import com.viaversion.viabackwards.protocol.protocol1_18to1_18_2.Protocol1_18To1_18_2;
 import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.Protocol1_19_1To1_19_3;
 import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.Protocol1_19_3To1_19_4;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.Protocol1_19_4To1_20;
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.Protocol1_19To1_19_1;
+import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.Protocol1_20_2To1_20_3;
+import com.viaversion.viabackwards.protocol.protocol1_20to1_20_2.Protocol1_20To1_20_2;
+import com.viaversion.viabackwards.protocol.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2To1_9_3_4;
 import com.viaversion.viabackwards.protocol.protocol1_9_4to1_10.Protocol1_9_4To1_10;
+import com.viaversion.viabackwards.protocol.protocol1_9to1_9_1.Protocol1_9To1_9_1;
+import com.viaversion.viabackwards.utils.VersionInfo;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.protocol.ProtocolManager;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.update.Version;
 import java.io.File;
+import java.util.Arrays;
 import java.util.logging.Logger;
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "4.6.0";
-    String IMPL_VERSION = "$IMPL_VERSION";
+    String MINIMUM_VV_VERSION = "4.9.0";
 
     /**
      * Initialize ViaBackwards.
      */
-    default void init(File dataFolder) {
-        ViaBackwardsConfig config = new ViaBackwardsConfig(new File(dataFolder, "config.yml"));
-        config.reloadConfig();
+    default void init(final File configFile) {
+        ViaBackwardsConfig config = new ViaBackwardsConfig(configFile);
+        config.reload();
+        Via.getManager().getConfigurationProvider().register(config);
 
         ViaBackwards.init(this, config);
 
@@ -77,13 +84,15 @@ public interface ViaBackwardsPlatform {
             return;
         }
 
-        Via.getManager().getSubPlatforms().add(IMPL_VERSION);
+        Via.getManager().getSubPlatforms().add(VersionInfo.getImplementationVersion());
 
         getLogger().info("Loading translations...");
         TranslatableRewriter.loadTranslatables();
 
         getLogger().info("Registering protocols...");
         final ProtocolManager protocolManager = Via.getManager().getProtocolManager();
+        protocolManager.registerProtocol(new Protocol1_9To1_9_1(), ProtocolVersion.v1_9, ProtocolVersion.v1_9_1);
+        protocolManager.registerProtocol(new Protocol1_9_1_2To1_9_3_4(), Arrays.asList(ProtocolVersion.v1_9_1.getVersion(), ProtocolVersion.v1_9_2.getVersion()), ProtocolVersion.v1_9_3.getVersion());
         protocolManager.registerProtocol(new Protocol1_9_4To1_10(), ProtocolVersion.v1_9_3, ProtocolVersion.v1_10);
 
         protocolManager.registerProtocol(new Protocol1_10To1_11(), ProtocolVersion.v1_10, ProtocolVersion.v1_11);
@@ -123,6 +132,10 @@ public interface ViaBackwardsPlatform {
         protocolManager.registerProtocol(new Protocol1_19To1_19_1(), ProtocolVersion.v1_19, ProtocolVersion.v1_19_1);
         protocolManager.registerProtocol(new Protocol1_19_1To1_19_3(), ProtocolVersion.v1_19_1, ProtocolVersion.v1_19_3);
         protocolManager.registerProtocol(new Protocol1_19_3To1_19_4(), ProtocolVersion.v1_19_3, ProtocolVersion.v1_19_4);
+
+        protocolManager.registerProtocol(new Protocol1_19_4To1_20(), ProtocolVersion.v1_19_4, ProtocolVersion.v1_20);
+        protocolManager.registerProtocol(new Protocol1_20To1_20_2(), ProtocolVersion.v1_20, ProtocolVersion.v1_20_2);
+        protocolManager.registerProtocol(new Protocol1_20_2To1_20_3(), ProtocolVersion.v1_20_2, ProtocolVersion.v1_20_3);
     }
 
     /**

common/src/main/java/com/viaversion/viabackwards/api/entities/storage/EntityData.java

@@ -21,6 +21,7 @@ package com.viaversion.viabackwards.api.entities.storage;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import java.util.Locale;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -30,7 +31,7 @@ public class EntityData {
     private final int id;
     private final int replacementId;
     private final String key;
-    private NameVisibility nameVisibility = NameVisibility.NONE;
+    private ComponentType componentType = ComponentType.NONE;
     private MetaCreator defaultMeta;
 
     public EntityData(BackwardsProtocol<?, ?, ?, ?> protocol, EntityType type, int replacementId) {
@@ -45,12 +46,17 @@ public class EntityData {
     }
 
     public EntityData jsonName() {
-        this.nameVisibility = NameVisibility.JSON;
+        this.componentType = ComponentType.JSON;
+        return this;
+    }
+
+    public EntityData tagName() {
+        this.componentType = ComponentType.TAG;
         return this;
     }
 
     public EntityData plainName() {
-        this.nameVisibility = NameVisibility.PLAIN;
+        this.componentType = ComponentType.PLAIN;
         return this;
     }
 
@@ -70,17 +76,22 @@ public class EntityData {
     /**
      * @return custom mobname, can be either a String or a JsonElement
      */
-    public @Nullable Object mobName() {
-        if (nameVisibility == NameVisibility.NONE) {
+    public @Nullable Object entityName() {
+        if (componentType == ComponentType.NONE) {
             return null;
         }
 
-        String name = protocol.getMappingData().mappedEntityName(key);
+        final String name = protocol.getMappingData().mappedEntityName(key);
         if (name == null) {
-            ViaBackwards.getPlatform().getLogger().warning("Entity name for " + key + " not found in protocol " + protocol.getClass().getSimpleName());
-            name = key;
+            return null;
         }
-        return nameVisibility == NameVisibility.JSON ? ChatRewriter.legacyTextToJson(name) : name;
+
+        if (componentType == ComponentType.JSON) {
+            return ChatRewriter.legacyTextToJson(name);
+        } else if (componentType == ComponentType.TAG) {
+            return new StringTag(name);
+        }
+        return name;
     }
 
     public int replacementId() {
@@ -115,9 +126,10 @@ public class EntityData {
         void createMeta(WrappedMetadata storage);
     }
 
-    private enum NameVisibility {
+    private enum ComponentType {
         PLAIN,
         JSON,
+        TAG,
         NONE
     }
 }

common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriter.java

@@ -90,6 +90,10 @@ public abstract class EntityRewriter<C extends ClientboundPacketType, T extends
 
     public PacketHandler getSpawnTrackerWithDataHandler1_19(EntityType fallingBlockType) {
         return wrapper -> {
+            if (protocol.getMappingData() == null) {
+                return;
+            }
+
             // Check against the UNMAPPED entity type
             EntityType entityType = trackAndMapEntity(wrapper);
             if (entityType == fallingBlockType) {

common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java

@@ -26,6 +26,7 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.Int2IntMapMappings;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.data.entity.TrackedEntity;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
@@ -35,7 +36,6 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
 import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 import com.viaversion.viaversion.rewriter.meta.MetaHandlerEvent;
 import java.util.List;
@@ -76,21 +76,22 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
 
         // Set the mapped entity name if there is no custom name set already
         final EntityData entityData = entityDataForType(entity.entityType());
-        if (entityData != null && entityData.mobName() != null) {
+        final Object displayNameObject;
+        if (entityData != null && (displayNameObject = entityData.entityName()) != null) {
             final Metadata displayName = getMeta(displayNameIndex, metadataList);
             if (initialMetadata) {
                 if (displayName == null) {
                     // Add it as new metadata
-                    metadataList.add(new Metadata(displayNameIndex, displayNameMetaType, entityData.mobName()));
+                    metadataList.add(new Metadata(displayNameIndex, displayNameMetaType, displayNameObject));
                     addDisplayVisibilityMeta(metadataList);
                 } else if (displayName.getValue() == null || displayName.getValue().toString().isEmpty()) {
                     // Overwrite the existing null/empty display name
-                    displayName.setValue(entityData.mobName());
+                    displayName.setValue(displayNameObject);
                     addDisplayVisibilityMeta(metadataList);
                 }
             } else if (displayName != null && (displayName.getValue() == null || displayName.getValue().toString().isEmpty())) {
                 // Overwrite null/empty display name
-                displayName.setValue(entityData.mobName());
+                displayName.setValue(displayNameObject);
                 addDisplayVisibilityMeta(metadataList);
             }
         }
@@ -175,17 +176,29 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
         }
     }
 
-    public void registerMetaTypeHandler(@Nullable MetaType itemType, @Nullable MetaType blockType, @Nullable MetaType particleType, @Nullable MetaType optChatType) {
+    public void registerMetaTypeHandler(
+            @Nullable MetaType itemType,
+            @Nullable MetaType blockStateType,
+            @Nullable MetaType optionalBlockStateType,
+            @Nullable MetaType particleType,
+            @Nullable MetaType componentType,
+            @Nullable MetaType optionalComponentType
+    ) {
         filter().handler((event, meta) -> {
             MetaType type = meta.metaType();
-            if (itemType != null && type == itemType) {
+            if (type == itemType) {
                 protocol.getItemRewriter().handleItemToClient(meta.value());
-            } else if (blockType != null && type == blockType) {
+            } else if (type == blockStateType) {
                 int data = meta.value();
                 meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
-            } else if (particleType != null && type == particleType) {
+            } else if (type == optionalBlockStateType) {
+                int data = meta.value();
+                if (data != 0) {
+                    meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
+                }
+            } else if (type == particleType) {
                 rewriteParticle(meta.value());
-            } else if (optChatType != null && type == optChatType) {
+            } else if (type == optionalComponentType || type == componentType) {
                 JsonElement text = meta.value();
                 if (text != null) {
                     protocol.getTranslatableRewriter().processText(text);

common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriter.java

@@ -40,6 +40,10 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
         super(protocol, true);
     }
 
+    public ItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType) {
+        super(protocol, itemType, itemArrayType, true);
+    }
+
     @Override
     public @Nullable Item handleItemToClient(@Nullable Item item) {
         if (item == null) {
@@ -49,28 +53,32 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
         CompoundTag display = item.tag() != null ? item.tag().get("display") : null;
         if (protocol.getTranslatableRewriter() != null && display != null) {
             // Handle name and lore components
-            StringTag name = display.get("Name");
-            if (name != null) {
-                String newValue = protocol.getTranslatableRewriter().processText(name.getValue()).toString();
+            Tag name = display.get("Name");
+            if (name instanceof StringTag) {
+                StringTag nameStringTag = (StringTag) name;
+                String newValue = protocol.getTranslatableRewriter().processText(nameStringTag.getValue()).toString();
                 if (!newValue.equals(name.getValue())) {
-                    saveStringTag(display, name, "Name");
+                    saveStringTag(display, nameStringTag, "Name");
                 }
 
-                name.setValue(newValue);
+                nameStringTag.setValue(newValue);
             }
 
-            ListTag lore = display.get("Lore");
-            if (lore != null) {
+            Tag lore = display.get("Lore");
+            if (lore instanceof ListTag) {
+                ListTag loreListTag = (ListTag) lore;
                 boolean changed = false;
-                for (Tag loreEntryTag : lore) {
-                    if (!(loreEntryTag instanceof StringTag)) continue;
+                for (Tag loreEntryTag : loreListTag) {
+                    if (!(loreEntryTag instanceof StringTag)) {
+                        continue;
+                    }
 
                     StringTag loreEntry = (StringTag) loreEntryTag;
                     String newValue = protocol.getTranslatableRewriter().processText(loreEntry.getValue()).toString();
                     if (!changed && !newValue.equals(loreEntry.getValue())) {
                         // Backup original lore before doing any modifications
                         changed = true;
-                        saveListTag(display, lore, "Lore");
+                        saveListTag(display, loreListTag, "Lore");
                     }
 
                     loreEntry.setValue(newValue);
@@ -78,7 +86,7 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
             }
         }
 
-        MappedItem data = protocol.getMappingData().getMappedItem(item.identifier());
+        MappedItem data = protocol.getMappingData() != null ? protocol.getMappingData().getMappedItem(item.identifier()) : null;
         if (data == null) {
             // Just rewrite the id
             return super.handleItemToClient(item);
@@ -169,4 +177,48 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
             }
         });
     }
+
+    @Override
+    public void registerAdvancements1_20_3(final C packetType) {
+        // Insert translatable rewriter
+        protocol.registerClientbound(packetType, wrapper -> {
+            wrapper.passthrough(Type.BOOLEAN); // Reset/clear
+            final int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
+            for (int i = 0; i < size; i++) {
+                wrapper.passthrough(Type.STRING); // Identifier
+
+                // Parent
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    wrapper.passthrough(Type.STRING);
+                }
+
+                // Display data
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    final Tag title = wrapper.passthrough(Type.TAG);
+                    final Tag description = wrapper.passthrough(Type.TAG);
+                    final TranslatableRewriter<C> translatableRewriter = protocol.getTranslatableRewriter();
+                    if (translatableRewriter != null) {
+                        translatableRewriter.processTag(title);
+                        translatableRewriter.processTag(description);
+                    }
+
+                    handleItemToClient(wrapper.passthrough(Type.ITEM1_20_2)); // Icon
+                    wrapper.passthrough(Type.VAR_INT); // Frame type
+                    final int flags = wrapper.passthrough(Type.INT);
+                    if ((flags & 1) != 0) {
+                        wrapper.passthrough(Type.STRING); // Background texture
+                    }
+                    wrapper.passthrough(Type.FLOAT); // X
+                    wrapper.passthrough(Type.FLOAT); // Y
+                }
+
+                final int requirements = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < requirements; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY);
+                }
+
+                wrapper.passthrough(Type.BOOLEAN); // Send telemetry
+            }
+        });
+    }
 }

common/src/main/java/com/viaversion/viabackwards/api/rewriters/ItemRewriterBase.java

@@ -21,6 +21,7 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
 import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
@@ -35,7 +36,11 @@ public abstract class ItemRewriterBase<C extends ClientboundPacketType, S extend
     protected final boolean jsonNameFormat;
 
     protected ItemRewriterBase(T protocol, boolean jsonNameFormat) {
-        super(protocol);
+        this(protocol, Type.ITEM1_13_2, Type.ITEM1_13_2_ARRAY, jsonNameFormat);
+    }
+
+    public ItemRewriterBase(T protocol, Type<Item> itemType, Type<Item[]> itemArrayType, boolean jsonNameFormat) {
+        super(protocol, itemType, itemArrayType);
         this.jsonNameFormat = jsonNameFormat;
         nbtTagName = "VB|" + protocol.getClass().getSimpleName();
     }

common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyEntityRewriter.java

@@ -22,6 +22,7 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.entities.storage.EntityData;
 import com.viaversion.viabackwards.api.entities.storage.EntityObjectData;
 import com.viaversion.viabackwards.api.entities.storage.WrappedMetadata;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.ObjectType;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
@@ -32,7 +33,6 @@ 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.Type;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java

@@ -21,9 +21,6 @@ import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.data.VBMappingDataLoader;
 import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
-import com.viaversion.viaversion.api.protocol.packet.State;
-import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
-import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
@@ -34,91 +31,43 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 public class TranslatableRewriter<C extends ClientboundPacketType> extends ComponentRewriter<C> {
 
     private static final Map<String, Map<String, String>> TRANSLATABLES = new HashMap<>();
-    private final Map<String, String> newTranslatables;
+    private final Map<String, String> translatables;
 
     public static void loadTranslatables() {
-        JsonObject jsonObject = VBMappingDataLoader.loadFromDataDir("translation-mappings.json");
-        for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
-            Map<String, String> versionMappings = new HashMap<>();
+        final JsonObject jsonObject = VBMappingDataLoader.loadFromDataDir("translation-mappings.json");
+        for (final Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
+            final Map<String, String> versionMappings = new HashMap<>();
             TRANSLATABLES.put(entry.getKey(), versionMappings);
-            for (Map.Entry<String, JsonElement> translationEntry : entry.getValue().getAsJsonObject().entrySet()) {
+            for (final Map.Entry<String, JsonElement> translationEntry : entry.getValue().getAsJsonObject().entrySet()) {
                 versionMappings.put(translationEntry.getKey(), translationEntry.getValue().getAsString());
             }
         }
     }
 
-    public TranslatableRewriter(BackwardsProtocol<C, ?, ?, ?> protocol) {
-        this(protocol, protocol.getClass().getSimpleName().split("To")[1].replace("_", "."));
+    public TranslatableRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final ReadType type) {
+        this(protocol, type, protocol.getClass().getSimpleName().split("To")[1].replace("_", "."));
     }
 
-    public TranslatableRewriter(BackwardsProtocol<C, ?, ?, ?> protocol, String sectionIdentifier) {
-        super(protocol);
-        final Map<String, String> newTranslatables = TRANSLATABLES.get(sectionIdentifier);
-        if (newTranslatables == null) {
-            ViaBackwards.getPlatform().getLogger().warning("Error loading " + sectionIdentifier + " translatables!");
-            this.newTranslatables = new HashMap<>();
+    public TranslatableRewriter(final BackwardsProtocol<C, ?, ?, ?> protocol, final ReadType type, final String sectionIdentifier) {
+        super(protocol, type);
+        final Map<String, String> translatableMappings = TRANSLATABLES.get(sectionIdentifier);
+        if (translatableMappings == null) {
+            ViaBackwards.getPlatform().getLogger().warning("Missing " + sectionIdentifier + " translatables!");
+            this.translatables = new HashMap<>();
         } else {
-            this.newTranslatables = newTranslatables;
+            this.translatables = translatableMappings;
         }
     }
 
-    public void registerPing() {
-        protocol.registerClientbound(State.LOGIN, 0x00, 0x00, wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-    }
-
-    public void registerDisconnect(C packetType) {
-        protocol.registerClientbound(packetType, wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-    }
-
-    public void registerLegacyOpenWindow(C packetType) {
-        protocol.registerClientbound(packetType, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Type.UNSIGNED_BYTE); // Id
-                map(Type.STRING); // Window Type
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerOpenWindow(C packetType) {
-        protocol.registerClientbound(packetType, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Type.VAR_INT); // Id
-                map(Type.VAR_INT); // Window Type
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
-    public void registerTabList(C packetType) {
-        protocol.registerClientbound(packetType, wrapper -> {
-            processText(wrapper.passthrough(Type.COMPONENT));
-            processText(wrapper.passthrough(Type.COMPONENT));
-        });
-    }
-
-    public void registerCombatKill(C packetType) {
-        protocol.registerClientbound(packetType, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Type.VAR_INT);
-                map(Type.INT);
-                handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT)));
-            }
-        });
-    }
-
     @Override
-    protected void handleTranslate(JsonObject root, String translate) {
-        String newTranslate = mappedTranslationKey(translate);
+    protected void handleTranslate(final JsonObject root, final String translate) {
+        final String newTranslate = mappedTranslationKey(translate);
         if (newTranslate != null) {
             root.addProperty("translate", newTranslate);
         }
     }
 
     public @Nullable String mappedTranslationKey(final String translationKey) {
-        return newTranslatables.get(translationKey);
+        return translatables.get(translationKey);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java

@@ -26,11 +26,11 @@ import com.viaversion.viabackwards.protocol.protocol1_10to1_11.packets.EntityPac
 import com.viaversion.viabackwards.protocol.protocol1_10to1_11.packets.PlayerPackets1_11;
 import com.viaversion.viabackwards.protocol.protocol1_10to1_11.storage.WindowTracker;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
+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.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 public class Protocol1_10To1_11 extends BackwardsProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {
 
@@ -57,10 +57,10 @@ public class Protocol1_10To1_11 extends BackwardsProtocol<ClientboundPackets1_9_
     public void init(UserConnection user) {
         // Register ClientWorld
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_11Types.EntityType.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_11.EntityType.PLAYER));
 
         if (!user.has(WindowTracker.class)) {
             user.put(new WindowTracker());

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java

@@ -28,23 +28,23 @@ import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 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.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_11to1_10.EntityIdRewriter;
-import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import java.util.Arrays;
 import java.util.Optional;
 
@@ -63,9 +63,9 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
             public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
                 map(Type.SHORT); // 1 - Slot ID
-                map(Type.ITEM); // 2 - Slot Value
+                map(Type.ITEM1_8); // 2 - Slot Value
 
-                handler(itemToClientHandler(Type.ITEM));
+                handler(itemToClientHandler(Type.ITEM1_8));
 
                 // Handle Llama
                 handler(new PacketHandler() {
@@ -78,7 +78,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
                             ChestedHorseStorage storage = horse.get();
                             int currentSlot = wrapper.get(Type.SHORT, 0);
                             wrapper.set(Type.SHORT, 0, ((Integer) (currentSlot = getNewSlotId(storage, currentSlot))).shortValue());
-                            wrapper.set(Type.ITEM, 0, getNewItem(storage, currentSlot, wrapper.get(Type.ITEM, 0)));
+                            wrapper.set(Type.ITEM1_8, 0, getNewItem(storage, currentSlot, wrapper.get(Type.ITEM1_8, 0)));
                         }
                     }
                 });
@@ -89,10 +89,10 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
             @Override
             public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
-                map(Type.ITEM_ARRAY); // 1 - Window Values
+                map(Type.ITEM1_8_SHORT_ARRAY); // 1 - Window Values
 
                 handler(wrapper -> {
-                    Item[] stacks = wrapper.get(Type.ITEM_ARRAY, 0);
+                    Item[] stacks = wrapper.get(Type.ITEM1_8_SHORT_ARRAY, 0);
                     for (int i = 0; i < stacks.length; i++)
                         stacks[i] = handleItemToClient(stacks[i]);
 
@@ -107,13 +107,13 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
                             stacks[getNewSlotId(storage, i)] = stacks[i];
                             stacks[i] = getNewItem(storage, i, stacks[i]);
                         }
-                        wrapper.set(Type.ITEM_ARRAY, 0, stacks);
+                        wrapper.set(Type.ITEM1_8_SHORT_ARRAY, 0, stacks);
                     }
                 });
             }
         });
 
-        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM);
+        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM1_8);
 
         // Plugin message Packet -> Trading
         protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketHandlers() {
@@ -127,12 +127,12 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
 
                         int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                         for (int i = 0; i < size; i++) {
-                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
-                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item
+                            wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Input Item
+                            wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Output Item
 
                             boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
                             if (secondItem) {
-                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Second Item
+                                wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Second Item
                             }
 
                             wrapper.passthrough(Type.BOOLEAN); // Trade disabled
@@ -152,9 +152,9 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
                 map(Type.BYTE); // 2 - Button
                 map(Type.SHORT); // 3 - Action number
                 map(Type.VAR_INT); // 4 - Mode
-                map(Type.ITEM); // 5 - Clicked Item
+                map(Type.ITEM1_8); // 5 - Clicked Item
 
-                handler(itemToServerHandler(Type.ITEM));
+                handler(itemToServerHandler(Type.ITEM1_8));
 
                 // Llama slot
                 handler(wrapper -> {
@@ -172,12 +172,12 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
             }
         });
 
-        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
+        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM1_8);
 
         protocol.registerClientbound(ClientboundPackets1_9_3.CHUNK_DATA, wrapper -> {
             ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
 
-            Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld); // Use the 1.10 Chunk type since nothing changed.
+            ChunkType1_9_3 type = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); // Use the 1.10 Chunk type since nothing changed.
             Chunk chunk = wrapper.passthrough(type);
 
             handleChunk(chunk);
@@ -197,7 +197,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
         protocol.registerClientbound(ClientboundPackets1_9_3.BLOCK_CHANGE, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Block Position
+                map(Type.POSITION1_8); // 0 - Block Position
                 map(Type.VAR_INT); // 1 - Block
 
                 handler(wrapper -> {
@@ -225,9 +225,9 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
         protocol.registerClientbound(ClientboundPackets1_9_3.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Position
+                map(Type.POSITION1_8); // 0 - Position
                 map(Type.UNSIGNED_BYTE); // 1 - Action
-                map(Type.NBT); // 2 - NBT
+                map(Type.NAMED_COMPOUND_TAG); // 2 - NBT
 
                 handler(wrapper -> {
                     // Remove on shulkerbox decleration
@@ -236,7 +236,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
                     }
                     // Handler Spawners
                     if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 1) {
-                        CompoundTag tag = wrapper.get(Type.NBT, 0);
+                        CompoundTag tag = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                         EntityIdRewriter.toClientSpawner(tag, true);
                     }
                 });
@@ -298,7 +298,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
         });
 
         protocol.getEntityRewriter().filter().handler((event, meta) -> {
-            if (meta.metaType().type().equals(Type.ITEM)) // Is Item
+            if (meta.metaType().type().equals(Type.ITEM1_8)) // Is Item
                 meta.setValue(handleItemToClient((Item) meta.getValue()));
         });
     }
@@ -364,7 +364,7 @@ public class BlockItemPackets1_11 extends LegacyBlockItemRewriter<ClientboundPac
         if (tracker.getInventory() != null && tracker.getInventory().equals("EntityHorse")) {
             EntityTracker entTracker = user.getEntityTracker(Protocol1_10To1_11.class);
             StoredEntityData entityData = entTracker.entityData(tracker.getEntityId());
-            return entityData != null && entityData.type().is(Entity1_11Types.EntityType.LIAMA);
+            return entityData != null && entityData.type().is(EntityTypes1_11.EntityType.LIAMA);
         }
         return false;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java

@@ -26,8 +26,8 @@ import com.viaversion.viabackwards.protocol.protocol1_10to1_11.Protocol1_10To1_1
 import com.viaversion.viabackwards.protocol.protocol1_10to1_11.storage.ChestedHorseStorage;
 import com.viaversion.viabackwards.utils.Block;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
@@ -50,7 +50,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
             @Override
             public void register() {
                 map(Type.INT);
-                map(Type.POSITION);
+                map(Type.POSITION1_8);
                 map(Type.INT);
                 handler(wrapper -> {
                     int type = wrapper.get(Type.INT, 0);
@@ -84,12 +84,12 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
 
                 // Track Entity
                 handler(getObjectTrackerHandler());
-                handler(getObjectRewriter(id -> Entity1_11Types.ObjectType.findById(id).orElse(null)));
+                handler(getObjectRewriter(id -> EntityTypes1_11.ObjectType.findById(id).orElse(null)));
 
                 // Handle FallingBlock blocks
                 handler(wrapper -> {
-                    Optional<Entity1_12Types.ObjectType> type = Entity1_12Types.ObjectType.findById(wrapper.get(Type.BYTE, 0));
-                    if (type.isPresent() && type.get() == Entity1_12Types.ObjectType.FALLING_BLOCK) {
+                    Optional<EntityTypes1_12.ObjectType> type = EntityTypes1_12.ObjectType.findById(wrapper.get(Type.BYTE, 0));
+                    if (type.isPresent() && type.get() == EntityTypes1_12.ObjectType.FALLING_BLOCK) {
                         int objectData = wrapper.get(Type.INT, 0);
                         int objType = objectData & 4095;
                         int data = objectData >> 12 & 15;
@@ -104,8 +104,8 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        registerTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, Entity1_11Types.EntityType.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, Entity1_11Types.EntityType.WEATHER);
+        registerTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, EntityTypes1_11.EntityType.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, EntityTypes1_11.EntityType.WEATHER);
 
         protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_MOB, new PacketHandlers() {
             @Override
@@ -151,8 +151,8 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        registerTracker(ClientboundPackets1_9_3.SPAWN_PAINTING, Entity1_11Types.EntityType.PAINTING);
-        registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, Entity1_11Types.EntityType.PLAYER);
+        registerTracker(ClientboundPackets1_9_3.SPAWN_PAINTING, EntityTypes1_11.EntityType.PAINTING);
+        registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, EntityTypes1_11.EntityType.PLAYER);
         registerRespawn(ClientboundPackets1_9_3.RESPAWN);
 
         protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketHandlers() {
@@ -167,7 +167,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.BYTE); // 6 - Pitch
                 map(Types1_9.METADATA_LIST); // 7 - Metadata list
 
-                handler(getTrackerAndMetaHandler(Types1_9.METADATA_LIST, Entity1_11Types.EntityType.PLAYER));
+                handler(getTrackerAndMetaHandler(Types1_9.METADATA_LIST, EntityTypes1_11.EntityType.PLAYER));
                 handler(wrapper -> {
                     // Sub 1.11 clients will cry if the list is empty
                     List<Metadata> metadata = wrapper.get(Types1_9.METADATA_LIST, 0);
@@ -204,37 +204,37 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
     @Override
     protected void registerRewrites() {
         // Guardian
-        mapEntityTypeWithData(Entity1_11Types.EntityType.ELDER_GUARDIAN, Entity1_11Types.EntityType.GUARDIAN);
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.ELDER_GUARDIAN, EntityTypes1_11.EntityType.GUARDIAN);
         // Skeletons
-        mapEntityTypeWithData(Entity1_11Types.EntityType.WITHER_SKELETON, Entity1_11Types.EntityType.SKELETON).spawnMetadata(storage -> storage.add(getSkeletonTypeMeta(1)));
-        mapEntityTypeWithData(Entity1_11Types.EntityType.STRAY, Entity1_11Types.EntityType.SKELETON).plainName().spawnMetadata(storage -> storage.add(getSkeletonTypeMeta(2)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.WITHER_SKELETON, EntityTypes1_11.EntityType.SKELETON).spawnMetadata(storage -> storage.add(getSkeletonTypeMeta(1)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.STRAY, EntityTypes1_11.EntityType.SKELETON).plainName().spawnMetadata(storage -> storage.add(getSkeletonTypeMeta(2)));
         // Zombies
-        mapEntityTypeWithData(Entity1_11Types.EntityType.HUSK, Entity1_11Types.EntityType.ZOMBIE).plainName().spawnMetadata(storage -> handleZombieType(storage, 6));
-        mapEntityTypeWithData(Entity1_11Types.EntityType.ZOMBIE_VILLAGER, Entity1_11Types.EntityType.ZOMBIE).spawnMetadata(storage -> handleZombieType(storage, 1));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.HUSK, EntityTypes1_11.EntityType.ZOMBIE).plainName().spawnMetadata(storage -> handleZombieType(storage, 6));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.ZOMBIE_VILLAGER, EntityTypes1_11.EntityType.ZOMBIE).spawnMetadata(storage -> handleZombieType(storage, 1));
         // Horses
-        mapEntityTypeWithData(Entity1_11Types.EntityType.HORSE, Entity1_11Types.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(0))); // Nob able to ride the horse without having the MetaType sent.
-        mapEntityTypeWithData(Entity1_11Types.EntityType.DONKEY, Entity1_11Types.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(1)));
-        mapEntityTypeWithData(Entity1_11Types.EntityType.MULE, Entity1_11Types.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(2)));
-        mapEntityTypeWithData(Entity1_11Types.EntityType.SKELETON_HORSE, Entity1_11Types.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(4)));
-        mapEntityTypeWithData(Entity1_11Types.EntityType.ZOMBIE_HORSE, Entity1_11Types.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(3)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.HORSE, EntityTypes1_11.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(0))); // Nob able to ride the horse without having the MetaType sent.
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.DONKEY, EntityTypes1_11.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(1)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.MULE, EntityTypes1_11.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(2)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.SKELETON_HORSE, EntityTypes1_11.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(4)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.ZOMBIE_HORSE, EntityTypes1_11.EntityType.HORSE).spawnMetadata(storage -> storage.add(getHorseMetaType(3)));
         // New mobs
-        mapEntityTypeWithData(Entity1_11Types.EntityType.EVOCATION_FANGS, Entity1_11Types.EntityType.SHULKER);
-        mapEntityTypeWithData(Entity1_11Types.EntityType.EVOCATION_ILLAGER, Entity1_11Types.EntityType.VILLAGER).plainName();
-        mapEntityTypeWithData(Entity1_11Types.EntityType.VEX, Entity1_11Types.EntityType.BAT).plainName();
-        mapEntityTypeWithData(Entity1_11Types.EntityType.VINDICATION_ILLAGER, Entity1_11Types.EntityType.VILLAGER).plainName().spawnMetadata(storage -> storage.add(new Metadata(13, MetaType1_9.VarInt, 4))); // Base Profession
-        mapEntityTypeWithData(Entity1_11Types.EntityType.LIAMA, Entity1_11Types.EntityType.HORSE).plainName().spawnMetadata(storage -> storage.add(getHorseMetaType(1)));
-        mapEntityTypeWithData(Entity1_11Types.EntityType.LIAMA_SPIT, Entity1_11Types.EntityType.SNOWBALL);
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.EVOCATION_FANGS, EntityTypes1_11.EntityType.SHULKER);
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.EVOCATION_ILLAGER, EntityTypes1_11.EntityType.VILLAGER).plainName();
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.VEX, EntityTypes1_11.EntityType.BAT).plainName();
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.VINDICATION_ILLAGER, EntityTypes1_11.EntityType.VILLAGER).plainName().spawnMetadata(storage -> storage.add(new Metadata(13, MetaType1_9.VarInt, 4))); // Base Profession
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.LIAMA, EntityTypes1_11.EntityType.HORSE).plainName().spawnMetadata(storage -> storage.add(getHorseMetaType(1)));
+        mapEntityTypeWithData(EntityTypes1_11.EntityType.LIAMA_SPIT, EntityTypes1_11.EntityType.SNOWBALL);
 
-        mapObjectType(Entity1_11Types.ObjectType.LIAMA_SPIT, Entity1_11Types.ObjectType.SNOWBALL, -1);
+        mapObjectType(EntityTypes1_11.ObjectType.LIAMA_SPIT, EntityTypes1_11.ObjectType.SNOWBALL, -1);
         // Replace with endertorchthingies
-        mapObjectType(Entity1_11Types.ObjectType.EVOCATION_FANGS, Entity1_11Types.ObjectType.FALLING_BLOCK, 198 | 1 << 12);
+        mapObjectType(EntityTypes1_11.ObjectType.EVOCATION_FANGS, EntityTypes1_11.ObjectType.FALLING_BLOCK, 198 | 1 << 12);
 
         // Handle ElderGuardian & target metadata
-        filter().filterFamily(Entity1_11Types.EntityType.GUARDIAN).index(12).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_11.EntityType.GUARDIAN).index(12).handler((event, meta) -> {
             boolean b = (boolean) meta.getValue();
             int bitmask = b ? 0x02 : 0;
 
-            if (event.entityType() == Entity1_11Types.EntityType.ELDER_GUARDIAN) {
+            if (event.entityType() == EntityTypes1_11.EntityType.ELDER_GUARDIAN) {
                 bitmask |= 0x04;
             }
 
@@ -242,12 +242,12 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Handle skeleton swing
-        filter().filterFamily(Entity1_11Types.EntityType.ABSTRACT_SKELETON).index(12).toIndex(13);
+        filter().filterFamily(EntityTypes1_11.EntityType.ABSTRACT_SKELETON).index(12).toIndex(13);
 
         /*
             ZOMBIE CHANGES
          */
-        filter().filterFamily(Entity1_11Types.EntityType.ZOMBIE).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_11.EntityType.ZOMBIE).handler((event, meta) -> {
             switch (meta.id()) {
                 case 13:
                     event.cancel();
@@ -267,18 +267,18 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Handle Evocation Illager
-        filter().type(Entity1_11Types.EntityType.EVOCATION_ILLAGER).index(12).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.EVOCATION_ILLAGER).index(12).handler((event, meta) -> {
             event.setIndex(13);
             meta.setTypeAndValue(MetaType1_9.VarInt, ((Byte) meta.getValue()).intValue()); // Change the profession for the states
         });
 
         // Handle Vex (Remove this field completely since the position is not updated correctly when idling for bats. Sad ):
-        filter().type(Entity1_11Types.EntityType.VEX).index(12).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.VEX).index(12).handler((event, meta) -> {
             meta.setValue((byte) 0x00);
         });
 
         // Handle VindicationIllager
-        filter().type(Entity1_11Types.EntityType.VINDICATION_ILLAGER).index(12).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.VINDICATION_ILLAGER).index(12).handler((event, meta) -> {
             event.setIndex(13);
             meta.setTypeAndValue(MetaType1_9.VarInt, ((Number) meta.getValue()).intValue() == 1 ? 2 : 4);
         });
@@ -288,7 +288,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
          */
 
         // Handle horse flags
-        filter().filterFamily(Entity1_11Types.EntityType.ABSTRACT_HORSE).index(13).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_11.EntityType.ABSTRACT_HORSE).index(13).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             byte b = (byte) meta.getValue();
             if (data.has(ChestedHorseStorage.class) && data.get(ChestedHorseStorage.class).isChested()) {
@@ -298,7 +298,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Create chested horse storage
-        filter().filterFamily(Entity1_11Types.EntityType.CHESTED_HORSE).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_11.EntityType.CHESTED_HORSE).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             if (!data.has(ChestedHorseStorage.class)) {
                 data.put(new ChestedHorseStorage());
@@ -306,10 +306,10 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Handle horse armor
-        filter().type(Entity1_11Types.EntityType.HORSE).index(16).toIndex(17);
+        filter().type(EntityTypes1_11.EntityType.HORSE).index(16).toIndex(17);
 
         // Handle chested horse
-        filter().filterFamily(Entity1_11Types.EntityType.CHESTED_HORSE).index(15).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_11.EntityType.CHESTED_HORSE).index(15).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             ChestedHorseStorage storage = data.get(ChestedHorseStorage.class);
             boolean b = (boolean) meta.getValue();
@@ -318,7 +318,7 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Get rid of Liama metadata
-        filter().type(Entity1_11Types.EntityType.LIAMA).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.LIAMA).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             ChestedHorseStorage storage = data.get(ChestedHorseStorage.class);
 
@@ -341,17 +341,17 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Handle Horse (Correct owner)
-        filter().filterFamily(Entity1_11Types.EntityType.ABSTRACT_HORSE).index(14).toIndex(16);
+        filter().filterFamily(EntityTypes1_11.EntityType.ABSTRACT_HORSE).index(14).toIndex(16);
 
         // Handle villager - Change non-existing profession
-        filter().type(Entity1_11Types.EntityType.VILLAGER).index(13).handler((event, meta) -> {
+        filter().type(EntityTypes1_11.EntityType.VILLAGER).index(13).handler((event, meta) -> {
             if ((int) meta.getValue() == 5) {
                 meta.setValue(0);
             }
         });
 
         // handle new Shulker color meta
-        filter().type(Entity1_11Types.EntityType.SHULKER).cancel(15);
+        filter().type(EntityTypes1_11.EntityType.SHULKER).cancel(15);
     }
 
     /*
@@ -393,11 +393,11 @@ public class EntityPackets1_11 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_11Types.getTypeFromId(typeId, false);
+        return EntityTypes1_11.getTypeFromId(typeId, false);
     }
 
     @Override
     protected EntityType getObjectTypeFromId(int typeId) {
-        return Entity1_11Types.getTypeFromId(typeId, true);
+        return EntityTypes1_11.getTypeFromId(typeId, true);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java

@@ -81,7 +81,7 @@ public class PlayerPackets1_11 {
         protocol.registerServerbound(ServerboundPackets1_9_3.PLAYER_BLOCK_PLACEMENT, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Location
+                map(Type.POSITION1_8); // 0 - Location
                 map(Type.VAR_INT); // 1 - Face
                 map(Type.VAR_INT); // 2 - Hand
 

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java

@@ -26,7 +26,8 @@ import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets.ChatPac
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets.EntityPackets1_12;
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.packets.SoundPackets1_12;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -34,7 +35,6 @@ import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPacke
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 
 public class Protocol1_11_1To1_12 extends BackwardsProtocol<ClientboundPackets1_12, ClientboundPackets1_9_3, ServerboundPackets1_12, ServerboundPackets1_9_3> {
@@ -71,10 +71,10 @@ public class Protocol1_11_1To1_12 extends BackwardsProtocol<ClientboundPackets1_
     public void init(UserConnection user) {
         // Register ClientWorld
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_12Types.EntityType.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_12.EntityType.PLAYER));
 
         user.put(new ShoulderTracker(user));
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java

@@ -26,6 +26,7 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
+import com.viaversion.viaversion.util.Key;
 
 public class ShoulderTracker extends StoredObject {
     private int entityId;
@@ -74,9 +75,7 @@ public class ShoulderTracker extends StoredObject {
     }
 
     private String getName(String current) {
-        if (current.startsWith("minecraft:")) {
-            current = current.substring(10);
-        }
+        current = Key.stripMinecraftNamespace(current);
 
         String[] array = current.split("_");
         StringBuilder builder = new StringBuilder();

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java

@@ -22,20 +22,20 @@ import com.viaversion.viabackwards.api.rewriters.LegacyBlockItemRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.Protocol1_11_1To1_12;
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.data.MapColorMapping;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ServerboundPackets1_12;
-import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import java.util.Iterator;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -80,9 +80,9 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
             }
         });
 
-        registerSetSlot(ClientboundPackets1_12.SET_SLOT, Type.ITEM);
-        registerWindowItems(ClientboundPackets1_12.WINDOW_ITEMS, Type.ITEM_ARRAY);
-        registerEntityEquipment(ClientboundPackets1_12.ENTITY_EQUIPMENT, Type.ITEM);
+        registerSetSlot(ClientboundPackets1_12.SET_SLOT, Type.ITEM1_8);
+        registerWindowItems(ClientboundPackets1_12.WINDOW_ITEMS, Type.ITEM1_8_SHORT_ARRAY);
+        registerEntityEquipment(ClientboundPackets1_12.ENTITY_EQUIPMENT, Type.ITEM1_8);
 
         // Plugin message Packet -> Trading
         protocol.registerClientbound(ClientboundPackets1_12.PLUGIN_MESSAGE, new PacketHandlers() {
@@ -96,12 +96,12 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
 
                         int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                         for (int i = 0; i < size; i++) {
-                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
-                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item
+                            wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Input Item
+                            wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Output Item
 
                             boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
                             if (secondItem)
-                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Second Item
+                                wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Second Item
 
                             wrapper.passthrough(Type.BOOLEAN); // Trade disabled
                             wrapper.passthrough(Type.INT); // Number of tools uses
@@ -120,7 +120,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
                 map(Type.BYTE); // 2 - Button
                 map(Type.SHORT); // 3 - Action number
                 map(Type.VAR_INT); // 4 - Mode
-                map(Type.ITEM); // 5 - Clicked Item
+                map(Type.ITEM1_8); // 5 - Clicked Item
 
                 handler(wrapper -> {
                     if (wrapper.get(Type.VAR_INT, 0) == 1) { // Shift click
@@ -128,7 +128,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
                         // Previously clients grab the item from the clicked slot *before* it has
                         // been moved however now they grab the slot item *after* it has been moved
                         // and send that in the packet.
-                        wrapper.set(Type.ITEM, 0, null); // Set null item (probably will work)
+                        wrapper.set(Type.ITEM1_8, 0, null); // Set null item (probably will work)
 
                         // Apologize (may happen in some cases, maybe if inventory is full?)
                         PacketWrapper confirm = wrapper.create(ServerboundPackets1_12.WINDOW_CONFIRMATION);
@@ -142,18 +142,18 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
                         return;
 
                     }
-                    Item item = wrapper.get(Type.ITEM, 0);
+                    Item item = wrapper.get(Type.ITEM1_8, 0);
                     handleItemToServer(item);
                 });
             }
         });
 
-        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
+        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM1_8);
 
         protocol.registerClientbound(ClientboundPackets1_12.CHUNK_DATA, wrapper -> {
             ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
 
-            Chunk1_9_3_4Type type = new Chunk1_9_3_4Type(clientWorld); // Use the 1.9.4 Chunk type since nothing changed.
+            ChunkType1_9_3 type = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment()); // Use the 1.9.4 Chunk type since nothing changed.
             Chunk chunk = wrapper.passthrough(type);
 
             handleChunk(chunk);
@@ -162,7 +162,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
         protocol.registerClientbound(ClientboundPackets1_12.BLOCK_CHANGE, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Block Position
+                map(Type.POSITION1_8); // 0 - Block Position
                 map(Type.VAR_INT); // 1 - Block
 
                 handler(wrapper -> {
@@ -190,9 +190,9 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
         protocol.registerClientbound(ClientboundPackets1_12.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Position
+                map(Type.POSITION1_8); // 0 - Position
                 map(Type.UNSIGNED_BYTE); // 1 - Action
-                map(Type.NBT); // 2 - NBT
+                map(Type.NAMED_COMPOUND_TAG); // 2 - NBT
 
                 handler(wrapper -> {
                     // Remove bed color
@@ -203,7 +203,7 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<ClientboundPac
         });
 
         protocol.getEntityRewriter().filter().handler((event, meta) -> {
-            if (meta.metaType().type().equals(Type.ITEM)) // Is Item
+            if (meta.metaType().type().equals(Type.ITEM1_8)) // Is Item
                 meta.setValue(handleItemToClient((Item) meta.getValue()));
         });
 

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java

@@ -29,7 +29,24 @@ import com.viaversion.viaversion.rewriter.ComponentRewriter;
 
 public class ChatPackets1_12 extends RewriterBase<Protocol1_11_1To1_12> {
 
-    private final ComponentRewriter<ClientboundPackets1_12> componentRewriter = new ComponentRewriter<ClientboundPackets1_12>() {
+    public static final ComponentRewriter<ClientboundPackets1_12> COMPONENT_REWRITER = new ComponentRewriter<ClientboundPackets1_12>(null, ComponentRewriter.ReadType.JSON) {
+        @Override
+        public void processText(JsonElement element) {
+            super.processText(element);
+            if (element == null || !element.isJsonObject()) {
+                return;
+            }
+
+            JsonObject object = element.getAsJsonObject();
+            JsonElement keybind = object.remove("keybind");
+            if (keybind == null) {
+                return;
+            }
+
+            //TODO Add nicer text for the key, also use this component rewriter in more packets
+            object.addProperty("text", keybind.getAsString());
+        }
+
         @Override
         protected void handleTranslate(JsonObject object, String translate) {
             String text = AdvancementTranslations.get(translate);
@@ -47,7 +64,7 @@ public class ChatPackets1_12 extends RewriterBase<Protocol1_11_1To1_12> {
     protected void registerPackets() {
         protocol.registerClientbound(ClientboundPackets1_12.CHAT_MESSAGE, wrapper -> {
             JsonElement element = wrapper.passthrough(Type.COMPONENT);
-            componentRewriter.processText(element);
+            COMPONENT_REWRITER.processText(element);
         });
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java

@@ -24,14 +24,16 @@ import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.data.ParrotStor
 import com.viaversion.viabackwards.protocol.protocol1_11_1to1_12.data.ShoulderTracker;
 import com.viaversion.viabackwards.utils.Block;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_12Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_12;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_12;
+import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_9;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_12;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.ClientboundPackets1_12;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
@@ -60,12 +62,12 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
 
                 // Track Entity
                 handler(getObjectTrackerHandler());
-                handler(getObjectRewriter(id -> Entity1_12Types.ObjectType.findById(id).orElse(null)));
+                handler(getObjectRewriter(id -> EntityTypes1_12.ObjectType.findById(id).orElse(null)));
 
                 // Handle FallingBlock blocks
                 handler(wrapper -> {
-                    Optional<Entity1_12Types.ObjectType> type = Entity1_12Types.ObjectType.findById(wrapper.get(Type.BYTE, 0));
-                    if (type.isPresent() && type.get() == Entity1_12Types.ObjectType.FALLING_BLOCK) {
+                    Optional<EntityTypes1_12.ObjectType> type = EntityTypes1_12.ObjectType.findById(wrapper.get(Type.BYTE, 0));
+                    if (type.isPresent() && type.get() == EntityTypes1_12.ObjectType.FALLING_BLOCK) {
                         int objectData = wrapper.get(Type.INT, 0);
                         int objType = objectData & 4095;
                         int data = objectData >> 12 & 15;
@@ -81,8 +83,8 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        registerTracker(ClientboundPackets1_12.SPAWN_EXPERIENCE_ORB, Entity1_12Types.EntityType.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_12.SPAWN_GLOBAL_ENTITY, Entity1_12Types.EntityType.WEATHER);
+        registerTracker(ClientboundPackets1_12.SPAWN_EXPERIENCE_ORB, EntityTypes1_12.EntityType.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_12.SPAWN_GLOBAL_ENTITY, EntityTypes1_12.EntityType.WEATHER);
 
         protocol.registerClientbound(ClientboundPackets1_12.SPAWN_MOB, new PacketHandlers() {
             @Override
@@ -109,7 +111,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        registerTracker(ClientboundPackets1_12.SPAWN_PAINTING, Entity1_12Types.EntityType.PAINTING);
+        registerTracker(ClientboundPackets1_12.SPAWN_PAINTING, EntityTypes1_12.EntityType.PAINTING);
 
         protocol.registerClientbound(ClientboundPackets1_12.SPAWN_PLAYER, new PacketHandlers() {
             @Override
@@ -123,7 +125,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.BYTE); // 6 - Pitch
                 map(Types1_12.METADATA_LIST); // 7 - Metadata list
 
-                handler(getTrackerAndMetaHandler(Types1_12.METADATA_LIST, Entity1_12Types.EntityType.PLAYER));
+                handler(getTrackerAndMetaHandler(Types1_12.METADATA_LIST, EntityTypes1_12.EntityType.PLAYER));
             }
         });
 
@@ -134,7 +136,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.UNSIGNED_BYTE); // 1 - Gamemode
                 map(Type.INT); // 2 - Dimension
 
-                handler(getTrackerHandler(Entity1_12Types.EntityType.PLAYER, Type.INT));
+                handler(getTrackerHandler(EntityTypes1_12.EntityType.PLAYER, Type.INT));
 
                 handler(getDimensionHandler(1));
 
@@ -202,14 +204,20 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     protected void registerRewrites() {
-        mapEntityTypeWithData(Entity1_12Types.EntityType.PARROT, Entity1_12Types.EntityType.BAT).plainName().spawnMetadata(storage -> storage.add(new Metadata(12, MetaType1_12.Byte, (byte) 0x00)));
-        mapEntityTypeWithData(Entity1_12Types.EntityType.ILLUSION_ILLAGER, Entity1_12Types.EntityType.EVOCATION_ILLAGER).plainName();
+        mapEntityTypeWithData(EntityTypes1_12.EntityType.PARROT, EntityTypes1_12.EntityType.BAT).plainName().spawnMetadata(storage -> storage.add(new Metadata(12, MetaType1_12.Byte, (byte) 0x00)));
+        mapEntityTypeWithData(EntityTypes1_12.EntityType.ILLUSION_ILLAGER, EntityTypes1_12.EntityType.EVOCATION_ILLAGER).plainName();
+
+        filter().handler((event, meta) -> {
+            if (meta.metaType() == MetaType1_12.Chat) {
+                ChatPackets1_12.COMPONENT_REWRITER.processText((JsonElement) meta.getValue());
+            }
+        });
 
         // Handle Illager
-        filter().filterFamily(Entity1_12Types.EntityType.EVOCATION_ILLAGER).cancel(12);
-        filter().filterFamily(Entity1_12Types.EntityType.EVOCATION_ILLAGER).index(13).toIndex(12);
+        filter().filterFamily(EntityTypes1_12.EntityType.EVOCATION_ILLAGER).cancel(12);
+        filter().filterFamily(EntityTypes1_12.EntityType.EVOCATION_ILLAGER).index(13).toIndex(12);
 
-        filter().type(Entity1_12Types.EntityType.ILLUSION_ILLAGER).index(0).handler((event, meta) -> {
+        filter().type(EntityTypes1_12.EntityType.ILLUSION_ILLAGER).index(0).handler((event, meta) -> {
             byte mask = (byte) meta.getValue();
 
             if ((mask & 0x20) == 0x20) {
@@ -220,15 +228,15 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Create Parrot storage
-        filter().filterFamily(Entity1_12Types.EntityType.PARROT).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_12.EntityType.PARROT).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             if (!data.has(ParrotStorage.class)) {
                 data.put(new ParrotStorage());
             }
         });
         // Parrot remove animal metadata
-        filter().type(Entity1_12Types.EntityType.PARROT).cancel(12); // Is baby
-        filter().type(Entity1_12Types.EntityType.PARROT).index(13).handler((event, meta) -> {
+        filter().type(EntityTypes1_12.EntityType.PARROT).cancel(12); // Is baby
+        filter().type(EntityTypes1_12.EntityType.PARROT).index(13).handler((event, meta) -> {
             StoredEntityData data = storedEntityData(event);
             ParrotStorage storage = data.get(ParrotStorage.class);
             boolean isSitting = (((byte) meta.getValue()) & 0x01) == 0x01;
@@ -252,11 +260,11 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
                 event.cancel();
             }
         }); // Flags (Is sitting etc, might be useful in the future
-        filter().type(Entity1_12Types.EntityType.PARROT).cancel(14); // Owner
-        filter().type(Entity1_12Types.EntityType.PARROT).cancel(15); // Variant
+        filter().type(EntityTypes1_12.EntityType.PARROT).cancel(14); // Owner
+        filter().type(EntityTypes1_12.EntityType.PARROT).cancel(15); // Variant
 
         // Left shoulder entity data
-        filter().type(Entity1_12Types.EntityType.PLAYER).index(15).handler((event, meta) -> {
+        filter().type(EntityTypes1_12.EntityType.PLAYER).index(15).handler((event, meta) -> {
             CompoundTag tag = (CompoundTag) meta.getValue();
             ShoulderTracker tracker = event.user().get(ShoulderTracker.class);
 
@@ -275,7 +283,7 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
         });
 
         // Right shoulder entity data
-        filter().type(Entity1_12Types.EntityType.PLAYER).index(16).handler((event, meta) -> {
+        filter().type(EntityTypes1_12.EntityType.PLAYER).index(16).handler((event, meta) -> {
             CompoundTag tag = (CompoundTag) event.meta().getValue();
             ShoulderTracker tracker = event.user().get(ShoulderTracker.class);
 
@@ -296,11 +304,11 @@ public class EntityPackets1_12 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_12Types.getTypeFromId(typeId, false);
+        return EntityTypes1_12.getTypeFromId(typeId, false);
     }
 
     @Override
     protected EntityType getObjectTypeFromId(final int typeId) {
-        return Entity1_12Types.getTypeFromId(typeId, true);
+        return EntityTypes1_12.getTypeFromId(typeId, true);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java

@@ -22,11 +22,11 @@ import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.packets.EntityPackets1_11_1;
 import com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.packets.ItemPackets1_11_1;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
+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.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ServerboundPackets1_9_3;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 
 public class Protocol1_11To1_11_1 extends BackwardsProtocol<ClientboundPackets1_9_3, ClientboundPackets1_9_3, ServerboundPackets1_9_3, ServerboundPackets1_9_3> {
 
@@ -47,10 +47,10 @@ public class Protocol1_11To1_11_1 extends BackwardsProtocol<ClientboundPackets1_
     public void init(UserConnection user) {
         // Register ClientWorld
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_11Types.EntityType.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_11.EntityType.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java

@@ -20,7 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.packets;
 
 import com.viaversion.viabackwards.api.rewriters.LegacyEntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_11to1_11_1.Protocol1_11To1_11_1;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_11Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_11;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -50,12 +50,12 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<ClientboundPackets
 
                 // Track Entity
                 handler(getObjectTrackerHandler());
-                handler(getObjectRewriter(id -> Entity1_11Types.ObjectType.findById(id).orElse(null)));
+                handler(getObjectRewriter(id -> EntityTypes1_11.ObjectType.findById(id).orElse(null)));
             }
         });
 
-        registerTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, Entity1_11Types.EntityType.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, Entity1_11Types.EntityType.WEATHER);
+        registerTracker(ClientboundPackets1_9_3.SPAWN_EXPERIENCE_ORB, EntityTypes1_11.EntityType.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_9_3.SPAWN_GLOBAL_ENTITY, EntityTypes1_11.EntityType.WEATHER);
 
         protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_MOB, new PacketHandlers() {
             @Override
@@ -82,8 +82,8 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<ClientboundPackets
             }
         });
 
-        registerTracker(ClientboundPackets1_9_3.SPAWN_PAINTING, Entity1_11Types.EntityType.PAINTING);
-        registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, Entity1_11Types.EntityType.PLAYER);
+        registerTracker(ClientboundPackets1_9_3.SPAWN_PAINTING, EntityTypes1_11.EntityType.PAINTING);
+        registerJoinGame(ClientboundPackets1_9_3.JOIN_GAME, EntityTypes1_11.EntityType.PLAYER);
         registerRespawn(ClientboundPackets1_9_3.RESPAWN);
 
         protocol.registerClientbound(ClientboundPackets1_9_3.SPAWN_PLAYER, new PacketHandlers() {
@@ -98,7 +98,7 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<ClientboundPackets
                 map(Type.BYTE); // 6 - Pitch
                 map(Types1_9.METADATA_LIST); // 7 - Metadata list
 
-                handler(getTrackerAndMetaHandler(Types1_9.METADATA_LIST, Entity1_11Types.EntityType.PLAYER));
+                handler(getTrackerAndMetaHandler(Types1_9.METADATA_LIST, EntityTypes1_11.EntityType.PLAYER));
             }
         });
 
@@ -109,19 +109,19 @@ public class EntityPackets1_11_1 extends LegacyEntityRewriter<ClientboundPackets
     @Override
     protected void registerRewrites() {
         // Handle non-existing firework metadata (index 7 entity id for boosting)
-        filter().type(Entity1_11Types.EntityType.FIREWORK).cancel(7);
+        filter().type(EntityTypes1_11.EntityType.FIREWORK).cancel(7);
 
         // Handle non-existing pig metadata (index 14 - boost time)
-        filter().type(Entity1_11Types.EntityType.PIG).cancel(14);
+        filter().type(EntityTypes1_11.EntityType.PIG).cancel(14);
     }
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_11Types.getTypeFromId(typeId, false);
+        return EntityTypes1_11.getTypeFromId(typeId, false);
     }
 
     @Override
     protected EntityType getObjectTypeFromId(final int typeId) {
-        return Entity1_11Types.getTypeFromId(typeId, true);
+        return EntityTypes1_11.getTypeFromId(typeId, true);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java

@@ -39,9 +39,9 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<ClientboundPacket
 
     @Override
     protected void registerPackets() {
-        registerSetSlot(ClientboundPackets1_9_3.SET_SLOT, Type.ITEM);
-        registerWindowItems(ClientboundPackets1_9_3.WINDOW_ITEMS, Type.ITEM_ARRAY);
-        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM);
+        registerSetSlot(ClientboundPackets1_9_3.SET_SLOT, Type.ITEM1_8);
+        registerWindowItems(ClientboundPackets1_9_3.WINDOW_ITEMS, Type.ITEM1_8_SHORT_ARRAY);
+        registerEntityEquipment(ClientboundPackets1_9_3.ENTITY_EQUIPMENT, Type.ITEM1_8);
 
         // Plugin message Packet -> Trading
         protocol.registerClientbound(ClientboundPackets1_9_3.PLUGIN_MESSAGE, new PacketHandlers() {
@@ -55,12 +55,12 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<ClientboundPacket
 
                         int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                         for (int i = 0; i < size; i++) {
-                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Input Item
-                            wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Output Item
+                            wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Input Item
+                            wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Output Item
 
                             boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
                             if (secondItem) {
-                                wrapper.write(Type.ITEM, handleItemToClient(wrapper.read(Type.ITEM))); // Second Item
+                                wrapper.write(Type.ITEM1_8, handleItemToClient(wrapper.read(Type.ITEM1_8))); // Second Item
                             }
 
                             wrapper.passthrough(Type.BOOLEAN); // Trade disabled
@@ -72,12 +72,12 @@ public class ItemPackets1_11_1 extends LegacyBlockItemRewriter<ClientboundPacket
             }
         });
 
-        registerClickWindow(ServerboundPackets1_9_3.CLICK_WINDOW, Type.ITEM);
-        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM);
+        registerClickWindow(ServerboundPackets1_9_3.CLICK_WINDOW, Type.ITEM1_8);
+        registerCreativeInvAction(ServerboundPackets1_9_3.CREATIVE_INVENTORY_ACTION, Type.ITEM1_8);
 
         // Handle item metadata
         protocol.getEntityRewriter().filter().handler((event, meta) -> {
-            if (meta.metaType().type().equals(Type.ITEM)) { // Is Item
+            if (meta.metaType().type().equals(Type.ITEM1_8)) { // Is Item
                 meta.setValue(handleItemToClient((Item) meta.getValue()));
             }
         });

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java

@@ -33,21 +33,46 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.PlayerP
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.TabCompleteStorage;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.gson.JsonObject;
+import com.viaversion.viaversion.libs.gson.JsonParser;
+import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
+import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
+import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_13, ClientboundPackets1_12_1, ServerboundPackets1_13, ServerboundPackets1_12_1> {
 
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings();
     private final EntityPackets1_13 entityRewriter = new EntityPackets1_13(this);
     private final BlockItemPackets1_13 blockItemPackets = new BlockItemPackets1_13(this);
+    private final TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<ClientboundPackets1_13>(this, ComponentRewriter.ReadType.JSON) {
+        @Override
+        protected void handleTranslate(JsonObject root, String translate) {
+            String mappedKey = mappedTranslationKey(translate);
+            if (mappedKey != null || (mappedKey = getMappingData().getTranslateMappings().get(translate)) != null) {
+                root.addProperty("translate", mappedKey);
+            }
+        }
+    };
+    private final TranslatableRewriter<ClientboundPackets1_13> translatableToLegacyRewriter = new TranslatableRewriter<ClientboundPackets1_13>(this, ComponentRewriter.ReadType.JSON) {
+        @Override
+        protected void handleTranslate(JsonObject root, String translate) {
+            String mappedKey = mappedTranslationKey(translate);
+            if (mappedKey != null || (mappedKey = getMappingData().getTranslateMappings().get(translate)) != null) {
+                root.addProperty("translate", Protocol1_13To1_12_2.MAPPINGS.getMojangTranslation().getOrDefault(mappedKey, mappedKey));
+            }
+        }
+    };
 
     public Protocol1_12_2To1_13() {
         super(ClientboundPackets1_13.class, ClientboundPackets1_12_1.class, ServerboundPackets1_13.class, ServerboundPackets1_12_1.class);
@@ -61,20 +86,11 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
             Via.getManager().getProviders().register(BackwardsBlockEntityProvider.class, new BackwardsBlockEntityProvider());
         });
 
-        TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<ClientboundPackets1_13>(this) {
-            @Override
-            protected void handleTranslate(JsonObject root, String translate) {
-                String newTranslate = mappedTranslationKey(translate);
-                if (newTranslate != null || (newTranslate = getMappingData().getTranslateMappings().get(translate)) != null) {
-                    root.addProperty("translate", newTranslate);
-                }
-            }
-        };
         translatableRewriter.registerPing();
         translatableRewriter.registerBossBar(ClientboundPackets1_13.BOSSBAR);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_13.CHAT_MESSAGE);
         translatableRewriter.registerLegacyOpenWindow(ClientboundPackets1_13.OPEN_WINDOW);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_13.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_13.DISCONNECT);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_13.COMBAT_EVENT);
         translatableRewriter.registerTitle(ClientboundPackets1_13.TITLE);
         translatableRewriter.registerTabList(ClientboundPackets1_13.TAB_LIST);
@@ -99,10 +115,10 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
     public void init(UserConnection user) {
         // Register ClientWorld
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_13Types.EntityType.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_13.EntityType.PLAYER));
 
         user.put(new BackwardsBlockStorage());
         user.put(new TabCompleteStorage());
@@ -126,4 +142,39 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
     public BlockItemPackets1_13 getItemRewriter() {
         return blockItemPackets;
     }
+
+    // Don't override the parent method
+    public TranslatableRewriter<ClientboundPackets1_13> translatableRewriter() {
+        return translatableRewriter;
+    }
+
+    public String jsonToLegacy(String value) {
+        if (value.isEmpty()) {
+            return "";
+        }
+
+        try {
+            return jsonToLegacy(JsonParser.parseString(value));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    public String jsonToLegacy(@Nullable JsonElement value) {
+        if (value == null || value.isJsonNull()) {
+            return "";
+        }
+
+        translatableToLegacyRewriter.processText(value);
+
+        try {
+            Component component = ChatRewriter.HOVER_GSON_SERIALIZER.deserializeFromTree(value);
+            return LegacyComponentSerializer.legacySection().serialize(component);
+        } catch (Exception e) {
+            ViaBackwards.getPlatform().getLogger().warning("Error converting json text to legacy: " + value);
+            e.printStackTrace();
+        }
+        return "";
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/EntityNameRewrites.java

@@ -18,6 +18,8 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 
+import com.viaversion.viaversion.util.Key;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,15 +44,11 @@ public class EntityNameRewrites {
 
 
     private static void reg(String past, String future) {
-        ENTITY_NAMES.put("minecraft:" + future, "minecraft:" + past);
+        ENTITY_NAMES.put(Key.namespaced(future), Key.namespaced(past));
     }
 
     public static String rewrite(String entName) {
-        String entityName = ENTITY_NAMES.get(entName);
-        if (entityName != null) {
-            return entityName;
-        }
-        entityName = ENTITY_NAMES.get("minecraft:" + entName);
+        String entityName = ENTITY_NAMES.get(Key.namespaced(entName));
         if (entityName != null) {
             return entityName;
         } else

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java

@@ -18,6 +18,8 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.NamedSoundRewriter;
+import com.viaversion.viaversion.util.Key;
+
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,9 +39,6 @@ public class NamedSoundMapping {
     }
 
     public static String getOldId(String sound1_13) {
-        if (sound1_13.startsWith("minecraft:")) {
-            sound1_13 = sound1_13.substring(10);
-        }
-        return SOUNDS.get(sound1_13);
+        return SOUNDS.get(Key.stripMinecraftNamespace(sound1_13));
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java

@@ -19,10 +19,10 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data;
 
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import java.util.List;
 
 public class ParticleMapping {
@@ -36,7 +36,7 @@ public class ParticleMapping {
             }
 
             @Override
-            public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data) {
+            public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data) {
                 return rewrite((int) data.get(0).getValue());
             }
 
@@ -85,7 +85,7 @@ public class ParticleMapping {
                     }
 
                     @Override
-                    public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data) {
+                    public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data) {
                         return null;
                     }
                 }),         // (11->30) minecraft:dust -> reddust
@@ -108,11 +108,11 @@ public class ParticleMapping {
                 rewrite(36, new ParticleHandler() {
                     @Override
                     public int[] rewrite(Protocol1_12_2To1_13 protocol, PacketWrapper wrapper) throws Exception {
-                        return rewrite(protocol, wrapper.read(Type.FLAT_ITEM));
+                        return rewrite(protocol, wrapper.read(Type.ITEM1_13));
                     }
 
                     @Override
-                    public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data) {
+                    public int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data) {
                         return rewrite(protocol, (Item) data.get(0).getValue());
                     }
 
@@ -162,7 +162,7 @@ public class ParticleMapping {
 
         int[] rewrite(Protocol1_12_2To1_13 protocol, PacketWrapper wrapper) throws Exception;
 
-        int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data);
+        int[] rewrite(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data);
 
         default boolean isBlockHandler() {
             return false;
@@ -187,7 +187,7 @@ public class ParticleMapping {
             return handler.rewrite(protocol, wrapper);
         }
 
-        public int[] rewriteMeta(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData> data) {
+        public int[] rewriteMeta(Protocol1_12_2To1_13 protocol, List<Particle.ParticleData<?>> data) {
             if (handler == null) return null;
             return handler.rewrite(protocol, data);
         }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java

@@ -28,6 +28,7 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.Backwar
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
@@ -37,15 +38,10 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_9_3;
 import com.viaversion.viaversion.libs.opennbt.conversion.ConverterRegistry;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ShortTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
@@ -53,15 +49,9 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPacke
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.BlockIdData;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.SpawnEggRewriter;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
-import com.viaversion.viaversion.protocols.protocol1_9_1_2to1_9_3_4.types.Chunk1_9_3_4Type;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
+import com.viaversion.viaversion.util.Key;
+
+import java.util.*;
 
 public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewriters.ItemRewriter<ClientboundPackets1_13, ServerboundPackets1_12_1, Protocol1_12_2To1_13> {
 
@@ -108,7 +98,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         protocol.registerClientbound(ClientboundPackets1_13.BLOCK_ACTION, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // Location
+                map(Type.POSITION1_8); // Location
                 map(Type.UNSIGNED_BYTE); // Action Id
                 map(Type.UNSIGNED_BYTE); // Action param
                 map(Type.VAR_INT); // Block Id - /!\ NOT BLOCK STATE ID
@@ -144,9 +134,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         protocol.registerClientbound(ClientboundPackets1_13.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Position
+                map(Type.POSITION1_8); // 0 - Position
                 map(Type.UNSIGNED_BYTE); // 1 - Action
-                map(Type.NBT); // 2 - NBT Data
+                map(Type.NAMED_COMPOUND_TAG); // 2 - NBT Data
 
                 handler(wrapper -> {
                     BackwardsBlockEntityProvider provider = Via.getManager().getProviders().get(BackwardsBlockEntityProvider.class);
@@ -156,11 +146,11 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                         wrapper.cancel();
                     }
 
-                    wrapper.set(Type.NBT, 0,
+                    wrapper.set(Type.NAMED_COMPOUND_TAG, 0,
                             provider.transform(
                                     wrapper.user(),
-                                    wrapper.get(Type.POSITION, 0),
-                                    wrapper.get(Type.NBT, 0)
+                                    wrapper.get(Type.POSITION1_8, 0),
+                                    wrapper.get(Type.NAMED_COMPOUND_TAG, 0)
                             ));
                 });
             }
@@ -183,11 +173,11 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         protocol.registerClientbound(ClientboundPackets1_13.BLOCK_CHANGE, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION); // 0 - Position
+                map(Type.POSITION1_8); // 0 - Position
 
                 handler(wrapper -> {
                     int blockState = wrapper.read(Type.VAR_INT);
-                    Position position = wrapper.get(Type.POSITION, 0);
+                    Position position = wrapper.get(Type.POSITION1_8, 0);
 
                     // Store blocks
                     BackwardsBlockStorage storage = wrapper.user().get(BackwardsBlockStorage.class);
@@ -237,9 +227,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             @Override
             public void register() {
                 map(Type.UNSIGNED_BYTE);
-                map(Type.FLAT_ITEM_ARRAY, Type.ITEM_ARRAY);
+                map(Type.ITEM1_13_ARRAY, Type.ITEM1_8_SHORT_ARRAY);
 
-                handler(itemArrayHandler(Type.ITEM_ARRAY));
+                handler(itemArrayToClientHandler(Type.ITEM1_8_SHORT_ARRAY));
             }
         });
 
@@ -248,17 +238,17 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             public void register() {
                 map(Type.UNSIGNED_BYTE);
                 map(Type.SHORT);
-                map(Type.FLAT_ITEM, Type.ITEM);
+                map(Type.ITEM1_13, Type.ITEM1_8);
 
-                handler(itemToClientHandler(Type.ITEM));
+                handler(itemToClientHandler(Type.ITEM1_8));
             }
         });
 
         protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, wrapper -> {
             ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
 
-            Chunk1_9_3_4Type type_old = new Chunk1_9_3_4Type(clientWorld);
-            Chunk1_13Type type = new Chunk1_13Type(clientWorld);
+            ChunkType1_9_3 type_old = ChunkType1_9_3.forEnvironment(clientWorld.getEnvironment());
+            ChunkType1_13 type = ChunkType1_13.forEnvironment(clientWorld.getEnvironment());
             Chunk chunk = wrapper.read(type);
 
             // Handle Block Entities before block rewrite
@@ -370,7 +360,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             @Override
             public void register() {
                 map(Type.INT); // Effect Id
-                map(Type.POSITION); // Location
+                map(Type.POSITION1_8); // Location
                 map(Type.INT); // Data
                 handler(wrapper -> {
                     int id = wrapper.get(Type.INT, 0);
@@ -420,9 +410,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             public void register() {
                 map(Type.VAR_INT);
                 map(Type.VAR_INT);
-                map(Type.FLAT_ITEM, Type.ITEM);
+                map(Type.ITEM1_13, Type.ITEM1_8);
 
-                handler(itemToClientHandler(Type.ITEM));
+                handler(itemToClientHandler(Type.ITEM1_8));
             }
         });
 
@@ -448,9 +438,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             @Override
             public void register() {
                 map(Type.SHORT);
-                map(Type.ITEM, Type.FLAT_ITEM);
+                map(Type.ITEM1_8, Type.ITEM1_13);
 
-                handler(itemToServerHandler(Type.FLAT_ITEM));
+                handler(itemToServerHandler(Type.ITEM1_13));
             }
         });
 
@@ -462,9 +452,9 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                 map(Type.BYTE);
                 map(Type.SHORT);
                 map(Type.VAR_INT);
-                map(Type.ITEM, Type.FLAT_ITEM);
+                map(Type.ITEM1_8, Type.ITEM1_13);
 
-                handler(itemToServerHandler(Type.FLAT_ITEM));
+                handler(itemToServerHandler(Type.ITEM1_13));
             }
         });
     }
@@ -549,7 +539,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                 StringTag name = display.get("Name");
                 if (name != null) {
                     display.put(extraNbtTag + "|Name", new StringTag(name.getValue()));
-                    name.setValue(ChatRewriter.jsonToLegacyText(name.getValue()));
+                    name.setValue(protocol.jsonToLegacy(name.getValue()));
                 }
             }
 
@@ -591,7 +581,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
         for (Tag oldTag : blockTag) {
             Object value = oldTag.getValue();
             String[] newValues = value instanceof String ?
-                    BlockIdData.fallbackReverseMapping.get(((String) value).replace("minecraft:", "")) : null;
+                    BlockIdData.fallbackReverseMapping.get(Key.stripMinecraftNamespace((String) value)) : null;
             if (newValues != null) {
                 for (String newValue : newValues) {
                     newCanPlaceOn.add(new StringTag(newValue));
@@ -634,7 +624,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
                 lore.add(new StringTag(mappedEnchantmentId + " " + EnchantmentRewriter.getRomanNumber(level)));
                 noMapped.add(enchantmentEntry);
             } else if (!newId.isEmpty()) {
-                Short oldId = Protocol1_13To1_12_2.MAPPINGS.getOldEnchantmentsIds().inverse().get(newId);
+                Short oldId = Protocol1_13To1_12_2.MAPPINGS.getOldEnchantmentsIds().inverse().get(Key.stripMinecraftNamespace(newId));
                 if (oldId == null) {
                     if (!newId.startsWith("viaversion:legacy/")) {
                         // Custom enchant (?)
@@ -842,7 +832,7 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
             ListTag newCanPlaceOn = new ListTag(StringTag.class);
             for (Tag oldTag : blockTag) {
                 Object value = oldTag.getValue();
-                String oldId = value.toString().replace("minecraft:", "");
+                String oldId = Key.stripMinecraftNamespace(value.toString());
                 int key = Ints.tryParse(oldId);
                 String numberConverted = BlockIdData.numberIdToString.get(key);
                 if (numberConverted != null) {
@@ -965,21 +955,21 @@ public class BlockItemPackets1_13 extends com.viaversion.viabackwards.api.rewrit
 
             // Remove the flowerpot
             PacketWrapper blockUpdateRemove = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_CHANGE, user);
-            blockUpdateRemove.write(Type.POSITION, position);
+            blockUpdateRemove.write(Type.POSITION1_8, position);
             blockUpdateRemove.write(Type.VAR_INT, 0);
             blockUpdateRemove.scheduleSend(Protocol1_12_2To1_13.class);
 
             // Create the flowerpot
             PacketWrapper blockCreate = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_CHANGE, user);
-            blockCreate.write(Type.POSITION, position);
+            blockCreate.write(Type.POSITION1_8, position);
             blockCreate.write(Type.VAR_INT, Protocol1_12_2To1_13.MAPPINGS.getNewBlockStateId(blockState));
             blockCreate.scheduleSend(Protocol1_12_2To1_13.class);
 
             // Send a block entity update
             PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_12_1.BLOCK_ENTITY_DATA, user);
-            wrapper.write(Type.POSITION, position);
+            wrapper.write(Type.POSITION1_8, position);
             wrapper.write(Type.UNSIGNED_BYTE, (short) 5);
-            wrapper.write(Type.NBT, nbt);
+            wrapper.write(Type.NAMED_COMPOUND_TAG, nbt);
             wrapper.scheduleSend(Protocol1_12_2To1_13.class);
 
         }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java

@@ -26,20 +26,20 @@ import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.PaintingMa
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.data.ParticleMapping;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage;
 import com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage.PlayerPositionStorage1_13;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_12;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_12;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import java.util.Optional;
 
@@ -88,16 +88,16 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
                 handler(getObjectTrackerHandler());
 
                 handler(wrapper -> {
-                    Optional<Entity1_13Types.ObjectType> optionalType = Entity1_13Types.ObjectType.findById(wrapper.get(Type.BYTE, 0));
+                    Optional<EntityTypes1_13.ObjectType> optionalType = EntityTypes1_13.ObjectType.findById(wrapper.get(Type.BYTE, 0));
                     if (!optionalType.isPresent()) return;
 
-                    Entity1_13Types.ObjectType type = optionalType.get();
-                    if (type == Entity1_13Types.ObjectType.FALLING_BLOCK) {
+                    EntityTypes1_13.ObjectType type = optionalType.get();
+                    if (type == EntityTypes1_13.ObjectType.FALLING_BLOCK) {
                         int blockState = wrapper.get(Type.INT, 0);
                         int combined = Protocol1_12_2To1_13.MAPPINGS.getNewBlockStateId(blockState);
                         combined = ((combined >> 4) & 0xFFF) | ((combined & 0xF) << 12);
                         wrapper.set(Type.INT, 0, combined);
-                    } else if (type == Entity1_13Types.ObjectType.ITEM_FRAME) {
+                    } else if (type == EntityTypes1_13.ObjectType.ITEM_FRAME) {
                         int data = wrapper.get(Type.INT, 0);
                         switch (data) {
                             case 3:
@@ -111,15 +111,15 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
                                 break;
                         }
                         wrapper.set(Type.INT, 0, data);
-                    } else if (type == Entity1_13Types.ObjectType.TRIDENT) {
-                        wrapper.set(Type.BYTE, 0, (byte) Entity1_13Types.ObjectType.TIPPED_ARROW.getId());
+                    } else if (type == EntityTypes1_13.ObjectType.TRIDENT) {
+                        wrapper.set(Type.BYTE, 0, (byte) EntityTypes1_13.ObjectType.TIPPED_ARROW.getId());
                     }
                 });
             }
         });
 
-        registerTracker(ClientboundPackets1_13.SPAWN_EXPERIENCE_ORB, Entity1_13Types.EntityType.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_13.SPAWN_GLOBAL_ENTITY, Entity1_13Types.EntityType.LIGHTNING_BOLT);
+        registerTracker(ClientboundPackets1_13.SPAWN_EXPERIENCE_ORB, EntityTypes1_13.EntityType.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_13.SPAWN_GLOBAL_ENTITY, EntityTypes1_13.EntityType.LIGHTNING_BOLT);
 
         protocol.registerClientbound(ClientboundPackets1_13.SPAWN_MOB, new PacketHandlers() {
             @Override
@@ -140,7 +140,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
 
                 handler(wrapper -> {
                     int type = wrapper.get(Type.VAR_INT, 1);
-                    EntityType entityType = Entity1_13Types.getTypeFromId(type, false);
+                    EntityType entityType = EntityTypes1_13.getTypeFromId(type, false);
                     tracker(wrapper.user()).addEntity(wrapper.get(Type.VAR_INT, 0), entityType);
 
                     int oldId = EntityTypeMapping.getOldId(type);
@@ -170,7 +170,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.BYTE);
                 map(Types1_13.METADATA_LIST, Types1_12.METADATA_LIST);
 
-                handler(getTrackerAndMetaHandler(Types1_12.METADATA_LIST, Entity1_13Types.EntityType.PLAYER));
+                handler(getTrackerAndMetaHandler(Types1_12.METADATA_LIST, EntityTypes1_13.EntityType.PLAYER));
             }
         });
 
@@ -180,7 +180,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.VAR_INT);
                 map(Type.UUID);
 
-                handler(getTrackerHandler(Entity1_13Types.EntityType.PAINTING, Type.VAR_INT));
+                handler(getTrackerHandler(EntityTypes1_13.EntityType.PAINTING, Type.VAR_INT));
                 handler(wrapper -> {
                     int motive = wrapper.read(Type.VAR_INT);
                     String title = PaintingMapping.getStringId(motive);
@@ -189,7 +189,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        registerJoinGame(ClientboundPackets1_13.JOIN_GAME, Entity1_13Types.EntityType.PLAYER);
+        registerJoinGame(ClientboundPackets1_13.JOIN_GAME, EntityTypes1_13.EntityType.PLAYER);
 
         protocol.registerClientbound(ClientboundPackets1_13.RESPAWN, new PacketHandlers() {
             @Override
@@ -254,94 +254,79 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
     @Override
     protected void registerRewrites() {
         // Rewrite new Entity 'drowned'
-        mapEntityTypeWithData(Entity1_13Types.EntityType.DROWNED, Entity1_13Types.EntityType.ZOMBIE_VILLAGER).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.DROWNED, EntityTypes1_13.EntityType.ZOMBIE_VILLAGER).plainName();
 
         // Fishy
-        mapEntityTypeWithData(Entity1_13Types.EntityType.COD, Entity1_13Types.EntityType.SQUID).plainName();
-        mapEntityTypeWithData(Entity1_13Types.EntityType.SALMON, Entity1_13Types.EntityType.SQUID).plainName();
-        mapEntityTypeWithData(Entity1_13Types.EntityType.PUFFERFISH, Entity1_13Types.EntityType.SQUID).plainName();
-        mapEntityTypeWithData(Entity1_13Types.EntityType.TROPICAL_FISH, Entity1_13Types.EntityType.SQUID).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.COD, EntityTypes1_13.EntityType.SQUID).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.SALMON, EntityTypes1_13.EntityType.SQUID).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.PUFFERFISH, EntityTypes1_13.EntityType.SQUID).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.TROPICAL_FISH, EntityTypes1_13.EntityType.SQUID).plainName();
 
         // Phantom
-        mapEntityTypeWithData(Entity1_13Types.EntityType.PHANTOM, Entity1_13Types.EntityType.PARROT).plainName().spawnMetadata(storage -> {
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.PHANTOM, EntityTypes1_13.EntityType.PARROT).plainName().spawnMetadata(storage -> {
             // The phantom is grey/blue so let's do yellow/blue
             storage.add(new Metadata(15, MetaType1_12.VarInt, 3));
         });
 
         // Dolphin
-        mapEntityTypeWithData(Entity1_13Types.EntityType.DOLPHIN, Entity1_13Types.EntityType.SQUID).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.DOLPHIN, EntityTypes1_13.EntityType.SQUID).plainName();
 
         // Turtle
-        mapEntityTypeWithData(Entity1_13Types.EntityType.TURTLE, Entity1_13Types.EntityType.OCELOT).plainName();
+        mapEntityTypeWithData(EntityTypes1_13.EntityType.TURTLE, EntityTypes1_13.EntityType.OCELOT).plainName();
 
         // Rewrite Meta types
         filter().handler((event, meta) -> {
             int typeId = meta.metaType().typeId();
-
-            // Rewrite optional chat to string
-            if (typeId == 5) {
-                // Json -> Legacy is done below
-                meta.setTypeAndValue(MetaType1_12.String, meta.getValue() != null ? meta.getValue().toString() : "");
-            }
-
-            // Rewrite items
-            else if (typeId == 6) {
+            if (typeId == 4) {
+                JsonElement element = meta.value();
+                protocol.translatableRewriter().processText(element);
+                meta.setMetaType(MetaType1_12.Chat);
+            } else if (typeId == 5) {
+                // Rewrite optional chat to string
+                JsonElement element = meta.value();
+                meta.setTypeAndValue(MetaType1_12.String, protocol.jsonToLegacy(element));
+            } else if (typeId == 6) {
                 Item item = (Item) meta.getValue();
                 meta.setTypeAndValue(MetaType1_12.Slot, protocol.getItemRewriter().handleItemToClient(item));
-            }
-
-            // Discontinue particles
-            else if (typeId == 15) {
+            } else if (typeId == 15) {
+                // Discontinue particles
                 event.cancel();
-            }
-
-            // Rewrite to 1.12 ids
-            else if (typeId > 5) {
-                meta.setMetaType(MetaType1_12.byId(
-                        typeId - 1
-                ));
-            }
-        });
-
-        // Rewrite Custom Name from Chat to String
-        filter().filterFamily(Entity1_13Types.EntityType.ENTITY).index(2).handler((event, meta) -> {
-            String value = meta.getValue().toString();
-            if (!value.isEmpty()) {
-                meta.setValue(ChatRewriter.jsonToLegacyText(value));
+            } else {
+                meta.setMetaType(MetaType1_12.byId(typeId > 5 ? typeId - 1 : typeId));
             }
         });
 
         // Handle zombie metadata
-        filter().filterFamily(Entity1_13Types.EntityType.ZOMBIE).removeIndex(15);
+        filter().filterFamily(EntityTypes1_13.EntityType.ZOMBIE).removeIndex(15);
 
         // Handle turtle metadata (Remove them all for now)
-        filter().type(Entity1_13Types.EntityType.TURTLE).cancel(13); // Home pos
-        filter().type(Entity1_13Types.EntityType.TURTLE).cancel(14); // Has egg
-        filter().type(Entity1_13Types.EntityType.TURTLE).cancel(15); // Laying egg
-        filter().type(Entity1_13Types.EntityType.TURTLE).cancel(16); // Travel pos
-        filter().type(Entity1_13Types.EntityType.TURTLE).cancel(17); // Going home
-        filter().type(Entity1_13Types.EntityType.TURTLE).cancel(18); // Traveling
+        filter().type(EntityTypes1_13.EntityType.TURTLE).cancel(13); // Home pos
+        filter().type(EntityTypes1_13.EntityType.TURTLE).cancel(14); // Has egg
+        filter().type(EntityTypes1_13.EntityType.TURTLE).cancel(15); // Laying egg
+        filter().type(EntityTypes1_13.EntityType.TURTLE).cancel(16); // Travel pos
+        filter().type(EntityTypes1_13.EntityType.TURTLE).cancel(17); // Going home
+        filter().type(EntityTypes1_13.EntityType.TURTLE).cancel(18); // Traveling
 
         // Remove additional fish meta
-        filter().filterFamily(Entity1_13Types.EntityType.ABSTRACT_FISHES).cancel(12);
-        filter().filterFamily(Entity1_13Types.EntityType.ABSTRACT_FISHES).cancel(13);
+        filter().filterFamily(EntityTypes1_13.EntityType.ABSTRACT_FISHES).cancel(12);
+        filter().filterFamily(EntityTypes1_13.EntityType.ABSTRACT_FISHES).cancel(13);
 
         // Remove phantom size
-        filter().type(Entity1_13Types.EntityType.PHANTOM).cancel(12);
+        filter().type(EntityTypes1_13.EntityType.PHANTOM).cancel(12);
 
         // Remove boat splash timer
-        filter().type(Entity1_13Types.EntityType.BOAT).cancel(12);
+        filter().type(EntityTypes1_13.EntityType.BOAT).cancel(12);
 
         // Remove Trident special loyalty level
-        filter().type(Entity1_13Types.EntityType.TRIDENT).cancel(7);
+        filter().type(EntityTypes1_13.EntityType.TRIDENT).cancel(7);
 
         // Handle new wolf colors
-        filter().type(Entity1_13Types.EntityType.WOLF).index(17).handler((event, meta) -> {
+        filter().type(EntityTypes1_13.EntityType.WOLF).index(17).handler((event, meta) -> {
             meta.setValue(15 - (int) meta.getValue());
         });
 
         // Rewrite AreaEffectCloud
-        filter().type(Entity1_13Types.EntityType.AREA_EFFECT_CLOUD).index(9).handler((event, meta) -> {
+        filter().type(EntityTypes1_13.EntityType.AREA_EFFECT_CLOUD).index(9).handler((event, meta) -> {
             Particle particle = (Particle) meta.getValue();
 
             ParticleMapping.ParticleData data = ParticleMapping.getMapping(particle.getId());
@@ -369,12 +354,12 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_13Types.getTypeFromId(typeId, false);
+        return EntityTypes1_13.getTypeFromId(typeId, false);
     }
 
     @Override
     protected EntityType getObjectTypeFromId(final int typeId) {
-        return Entity1_13Types.getTypeFromId(typeId, true);
+        return EntityTypes1_13.getTypeFromId(typeId, true);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java

@@ -35,7 +35,6 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ClientboundPackets1_12_1;
 import com.viaversion.viaversion.protocols.protocol1_12_1to1_12.ServerboundPackets1_12_1;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
@@ -82,17 +81,17 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                 int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                 for (int i = 0; i < size; i++) {
                     //Input Item
-                    Item input = wrapper.read(Type.FLAT_ITEM);
-                    wrapper.write(Type.ITEM, protocol.getItemRewriter().handleItemToClient(input));
+                    Item input = wrapper.read(Type.ITEM1_13);
+                    wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(input));
                     //Output Item
-                    Item output = wrapper.read(Type.FLAT_ITEM);
-                    wrapper.write(Type.ITEM, protocol.getItemRewriter().handleItemToClient(output));
+                    Item output = wrapper.read(Type.ITEM1_13);
+                    wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(output));
 
                     boolean secondItem = wrapper.passthrough(Type.BOOLEAN); //Has second item
                     if (secondItem) {
                         //Second Item
-                        Item second = wrapper.read(Type.FLAT_ITEM);
-                        wrapper.write(Type.ITEM, protocol.getItemRewriter().handleItemToClient(second));
+                        Item second = wrapper.read(Type.ITEM1_13);
+                        wrapper.write(Type.ITEM1_8, protocol.getItemRewriter().handleItemToClient(second));
                     }
 
                     wrapper.passthrough(Type.BOOLEAN); //Trade disabled
@@ -202,13 +201,9 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                 handler(wrapper -> {
                     byte mode = wrapper.get(Type.BYTE, 0);
                     if (mode == 0 || mode == 2) {
-                        String value = wrapper.read(Type.COMPONENT).toString();
-                        value = ChatRewriter.jsonToLegacyText(value);
-                        if (value.length() > 32) {
-                            value = value.substring(0, 32);
-                        }
-
-                        wrapper.write(Type.STRING, value);
+                        JsonElement value = wrapper.read(Type.COMPONENT);
+                        String legacyValue = protocol.jsonToLegacy(value);
+                        wrapper.write(Type.STRING, ChatUtil.fromLegacy(legacyValue, 'f', 32));
                         int type = wrapper.read(Type.VAR_INT);
                         wrapper.write(Type.STRING, type == 1 ? "hearts" : "integer");
                     }
@@ -225,12 +220,8 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                     byte action = wrapper.get(Type.BYTE, 0);
                     if (action == 0 || action == 2) {
                         JsonElement displayName = wrapper.read(Type.COMPONENT);
-                        String legacyTextDisplayName = displayName == null || displayName.isJsonNull() ? "" : ChatRewriter.jsonToLegacyText(displayName.toString());
-                        legacyTextDisplayName = ChatUtil.removeUnusedColor(legacyTextDisplayName, 'f');
-                        if (legacyTextDisplayName.length() > 32) {
-                            legacyTextDisplayName = legacyTextDisplayName.substring(0, 32);
-                        }
-                        wrapper.write(Type.STRING, legacyTextDisplayName);
+                        String legacyTextDisplayName = protocol.jsonToLegacy(displayName);
+                        wrapper.write(Type.STRING, ChatUtil.fromLegacy(legacyTextDisplayName, 'f', 32));
 
                         byte flags = wrapper.read(Type.BYTE);
                         String nameTagVisibility = wrapper.read(Type.STRING);
@@ -244,22 +235,14 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                         JsonElement prefixComponent = wrapper.read(Type.COMPONENT);
                         JsonElement suffixComponent = wrapper.read(Type.COMPONENT);
 
-                        String prefix = prefixComponent == null || prefixComponent.isJsonNull() ? "" : ChatRewriter.jsonToLegacyText(prefixComponent.toString());
+                        String prefix = protocol.jsonToLegacy(prefixComponent);
                         if (ViaBackwards.getConfig().addTeamColorTo1_13Prefix()) {
                             prefix += "§" + (colour > -1 && colour <= 15 ? Integer.toHexString(colour) : "r");
                         }
+                        String suffix = protocol.jsonToLegacy(suffixComponent);
 
-                        prefix = ChatUtil.removeUnusedColor(prefix, 'f', true);
-                        if (prefix.length() > 16) prefix = prefix.substring(0, 16);
-                        if (prefix.endsWith("§")) prefix = prefix.substring(0, prefix.length() - 1);
-
-                        String suffix = suffixComponent == null || suffixComponent.isJsonNull() ? "" : ChatRewriter.jsonToLegacyText(suffixComponent.toString());
-                        suffix = ChatUtil.removeUnusedColor(suffix, '\0'); // Don't remove white coloring
-                        if (suffix.length() > 16) suffix = suffix.substring(0, 16);
-                        if (suffix.endsWith("§")) suffix = suffix.substring(0, suffix.length() - 1);
-
-                        wrapper.write(Type.STRING, prefix);
-                        wrapper.write(Type.STRING, suffix);
+                        wrapper.write(Type.STRING, ChatUtil.fromLegacyPrefix(prefix, 'f', 16));
+                        wrapper.write(Type.STRING, ChatUtil.fromLegacy(suffix, '\0', 16));
 
                         wrapper.write(Type.BYTE, flags);
                         wrapper.write(Type.STRING, nameTagVisibility);
@@ -349,7 +332,7 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
 
             String command = wrapper.read(Type.STRING);
             boolean assumeCommand = wrapper.read(Type.BOOLEAN);
-            wrapper.read(Type.OPTIONAL_POSITION);
+            wrapper.read(Type.OPTIONAL_POSITION1_8);
 
             if (!assumeCommand && !command.startsWith("/")) {
                 // Complete usernames for non-commands
@@ -399,8 +382,8 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                 case "MC|BSign":
                 case "MC|BEdit":
                     wrapper.setPacketType(ServerboundPackets1_13.EDIT_BOOK);
-                    Item book = wrapper.read(Type.ITEM);
-                    wrapper.write(Type.FLAT_ITEM, protocol.getItemRewriter().handleItemToServer(book));
+                    Item book = wrapper.read(Type.ITEM1_8);
+                    wrapper.write(Type.ITEM1_13, protocol.getItemRewriter().handleItemToServer(book));
                     boolean signing = channel.equals("MC|BSign");
                     wrapper.write(Type.BOOLEAN, signing);
                     break;
@@ -433,7 +416,7 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                     int y = wrapper.read(Type.INT);
                     int z = wrapper.read(Type.INT);
 
-                    wrapper.write(Type.POSITION, new Position(x, (short) y, z));
+                    wrapper.write(Type.POSITION1_8, new Position(x, (short) y, z));
 
                     wrapper.passthrough(Type.STRING);  //Command
 
@@ -456,7 +439,7 @@ public class PlayerPacket1_13 extends RewriterBase<Protocol1_12_2To1_13> {
                     int x = wrapper.read(Type.INT);
                     int y = wrapper.read(Type.INT);
                     int z = wrapper.read(Type.INT);
-                    wrapper.write(Type.POSITION, new Position(x, (short) y, z));
+                    wrapper.write(Type.POSITION1_8, new Position(x, (short) y, z));
                     wrapper.write(Type.VAR_INT, wrapper.read(Type.BYTE) - 1);
                     String mode = wrapper.read(Type.STRING);
                     int modeId = mode.equals("SAVE") ? 0 : mode.equals("LOAD") ? 1 : mode.equals("CORNER") ? 2 : 3;

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java

@@ -42,7 +42,7 @@ public class Protocol1_13_1To1_13_2 extends BackwardsProtocol<ClientboundPackets
         registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM);
+                map(Type.ITEM1_13, Type.ITEM1_13_2);
             }
         });
 
@@ -61,8 +61,8 @@ public class Protocol1_13_1To1_13_2 extends BackwardsProtocol<ClientboundPackets
                 if (wrapper.passthrough(Type.BOOLEAN)) {
                     wrapper.passthrough(Type.COMPONENT); // Title
                     wrapper.passthrough(Type.COMPONENT); // Description
-                    Item icon = wrapper.read(Type.FLAT_VAR_INT_ITEM);
-                    wrapper.write(Type.FLAT_ITEM, icon);
+                    Item icon = wrapper.read(Type.ITEM1_13_2);
+                    wrapper.write(Type.ITEM1_13, icon);
                     wrapper.passthrough(Type.VAR_INT); // Frame type
                     int flags = wrapper.passthrough(Type.INT); // Flags
                     if ((flags & 1) != 0)

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java

@@ -31,7 +31,7 @@ public class InventoryPackets1_13_2 {
             public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
                 map(Type.SHORT); // 1 - Slot ID
-                map(Type.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM); // 2 - Slot Value
+                map(Type.ITEM1_13_2, Type.ITEM1_13); // 2 - Slot Value
             }
         });
 
@@ -39,7 +39,7 @@ public class InventoryPackets1_13_2 {
             @Override
             public void register() {
                 map(Type.UNSIGNED_BYTE); // 0 - Window ID
-                map(Type.FLAT_VAR_INT_ITEM_ARRAY, Type.FLAT_ITEM_ARRAY); // 1 - Window Values
+                map(Type.ITEM1_13_2_SHORT_ARRAY, Type.ITEM1_13_ARRAY); // 1 - Window Values
             }
         });
 
@@ -55,13 +55,13 @@ public class InventoryPackets1_13_2 {
                         int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                         for (int i = 0; i < size; i++) {
                             // Input Item
-                            wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                            wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
                             // Output Item
-                            wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                            wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
 
                             boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
                             if (secondItem) {
-                                wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                                wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
                             }
 
                             wrapper.passthrough(Type.BOOLEAN); // Trade disabled
@@ -78,7 +78,7 @@ public class InventoryPackets1_13_2 {
             public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.VAR_INT); // 1 - Slot ID
-                map(Type.FLAT_VAR_INT_ITEM, Type.FLAT_ITEM); // 2 - Item
+                map(Type.ITEM1_13_2, Type.ITEM1_13); // 2 - Item
             }
         });
 
@@ -91,22 +91,22 @@ public class InventoryPackets1_13_2 {
                     wrapper.passthrough(Type.STRING); // Group
                     int ingredientsNo = wrapper.passthrough(Type.VAR_INT);
                     for (int i1 = 0; i1 < ingredientsNo; i1++) {
-                        wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                        wrapper.write(Type.ITEM1_13_ARRAY, wrapper.read(Type.ITEM1_13_2_ARRAY));
                     }
-                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                    wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
                 } else if (type.equals("crafting_shaped")) {
                     int ingredientsNo = wrapper.passthrough(Type.VAR_INT) * wrapper.passthrough(Type.VAR_INT);
                     wrapper.passthrough(Type.STRING); // Group
                     for (int i1 = 0; i1 < ingredientsNo; i1++) {
-                        wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                        wrapper.write(Type.ITEM1_13_ARRAY, wrapper.read(Type.ITEM1_13_2_ARRAY));
                     }
-                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                    wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
                 } else if (type.equals("smelting")) {
                     wrapper.passthrough(Type.STRING); // Group
                     // Ingredient start
-                    wrapper.write(Type.FLAT_ITEM_ARRAY_VAR_INT, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+                    wrapper.write(Type.ITEM1_13_ARRAY, wrapper.read(Type.ITEM1_13_2_ARRAY));
                     // Ingredient end
-                    wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                    wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
                     wrapper.passthrough(Type.FLOAT); // EXP
                     wrapper.passthrough(Type.VAR_INT); // Cooking time
                 }
@@ -121,7 +121,7 @@ public class InventoryPackets1_13_2 {
                 map(Type.BYTE); // 2 - Button
                 map(Type.SHORT); // 3 - Action number
                 map(Type.VAR_INT); // 4 - Mode
-                map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM); // 5 - Clicked Item
+                map(Type.ITEM1_13, Type.ITEM1_13_2); // 5 - Clicked Item
             }
         });
 
@@ -129,7 +129,7 @@ public class InventoryPackets1_13_2 {
             @Override
             public void register() {
                 map(Type.SHORT); // 0 - Slot
-                map(Type.FLAT_ITEM, Type.FLAT_VAR_INT_ITEM); // 1 - Clicked Item
+                map(Type.ITEM1_13, Type.ITEM1_13_2); // 1 - Clicked Item
             }
         });
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java

@@ -42,7 +42,7 @@ public class WorldPackets1_13_2 {
                 handler(wrapper -> {
                     int id = wrapper.get(Type.INT, 0);
                     if (id == 27) {
-                        wrapper.write(Type.FLAT_ITEM, wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                        wrapper.write(Type.ITEM1_13, wrapper.read(Type.ITEM1_13_2));
                     }
                 });
             }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java

@@ -28,7 +28,8 @@ import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.packets.SoundPa
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLightStorage;
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.DifficultyStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
@@ -36,7 +37,7 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPacke
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 
 public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_13, ServerboundPackets1_14, ServerboundPackets1_13> {
@@ -44,7 +45,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.14", "1.13.2", Protocol1_14To1_13_2.class);
     private final EntityPackets1_14 entityRewriter = new EntityPackets1_14(this);
     private final BlockItemPackets1_14 blockItemPackets = new BlockItemPackets1_14(this);
-    private final TranslatableRewriter<ClientboundPackets1_14> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_14> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_13_2To1_14() {
         super(ClientboundPackets1_14.class, ClientboundPackets1_13.class, ServerboundPackets1_14.class, ServerboundPackets1_13.class);
@@ -57,7 +58,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
         translatableRewriter.registerBossBar(ClientboundPackets1_14.BOSSBAR);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_14.CHAT_MESSAGE);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_14.COMBAT_EVENT);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_14.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_14.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_14.TAB_LIST);
         translatableRewriter.registerTitle(ClientboundPackets1_14.TITLE);
         translatableRewriter.registerPing();
@@ -70,7 +71,6 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
 
         cancelClientbound(ClientboundPackets1_14.UPDATE_VIEW_POSITION);
         cancelClientbound(ClientboundPackets1_14.UPDATE_VIEW_DISTANCE);
-        cancelClientbound(ClientboundPackets1_14.ACKNOWLEDGE_PLAYER_DIGGING);
 
         registerClientbound(ClientboundPackets1_14.TAGS, wrapper -> {
             int blockTagsSize = wrapper.passthrough(Type.VAR_INT);
@@ -164,16 +164,16 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
     public void init(UserConnection user) {
         // Register ClientWorld
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
 
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_14Types.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_14.PLAYER));
 
         if (!user.has(ChunkLightStorage.class)) {
-            user.put(new ChunkLightStorage(user));
+            user.put(new ChunkLightStorage());
         }
 
-        user.put(new DifficultyStorage(user));
+        user.put(new DifficultyStorage());
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java

@@ -23,19 +23,17 @@ import com.viaversion.viabackwards.api.rewriters.EnchantmentRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.Protocol1_13_2To1_14;
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLightStorage;
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Environment;
-import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
-import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
-import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionLight;
-import com.viaversion.viaversion.api.minecraft.chunks.ChunkSectionLightImpl;
-import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
-import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.chunks.*;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_14;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
 import com.viaversion.viaversion.libs.gson.JsonElement;
@@ -47,13 +45,12 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.Protocol1_14To1_13_2;
-import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
+import com.viaversion.viaversion.util.Key;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -68,7 +65,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
 
     @Override
     protected void registerPackets() {
-        protocol.registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+        protocol.registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2)));
 
         protocol.registerClientbound(ClientboundPackets1_14.OPEN_WINDOW, wrapper -> {
             int windowId = wrapper.read(Type.VAR_INT);
@@ -166,12 +163,12 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             wrapper.passthrough(Type.INT); // Entity id
         });
 
-        BlockRewriter<ClientboundPackets1_14> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION);
+        BlockRewriter<ClientboundPackets1_14> blockRewriter = BlockRewriter.legacy(protocol);
 
         registerSetCooldown(ClientboundPackets1_14.COOLDOWN);
-        registerWindowItems(ClientboundPackets1_14.WINDOW_ITEMS, Type.FLAT_VAR_INT_ITEM_ARRAY);
-        registerSetSlot(ClientboundPackets1_14.SET_SLOT, Type.FLAT_VAR_INT_ITEM);
-        registerAdvancements(ClientboundPackets1_14.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerWindowItems(ClientboundPackets1_14.WINDOW_ITEMS, Type.ITEM1_13_2_SHORT_ARRAY);
+        registerSetSlot(ClientboundPackets1_14.SET_SLOT, Type.ITEM1_13_2);
+        registerAdvancements(ClientboundPackets1_14.ADVANCEMENTS, Type.ITEM1_13_2);
 
         // Trade List -> Plugin Message
         protocol.registerClientbound(ClientboundPackets1_14.TRADE_LIST, ClientboundPackets1_13.PLUGIN_MESSAGE, wrapper -> {
@@ -183,22 +180,22 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
             for (int i = 0; i < size; i++) {
                 // Input Item
-                Item input = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                Item input = wrapper.read(Type.ITEM1_13_2);
                 input = handleItemToClient(input);
-                wrapper.write(Type.FLAT_VAR_INT_ITEM, input);
+                wrapper.write(Type.ITEM1_13_2, input);
 
 
                 // Output Item
-                Item output = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                Item output = wrapper.read(Type.ITEM1_13_2);
                 output = handleItemToClient(output);
-                wrapper.write(Type.FLAT_VAR_INT_ITEM, output);
+                wrapper.write(Type.ITEM1_13_2, output);
 
                 boolean secondItem = wrapper.passthrough(Type.BOOLEAN); // Has second item
                 if (secondItem) {
                     // Second Item
-                    Item second = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                    Item second = wrapper.read(Type.ITEM1_13_2);
                     second = handleItemToClient(second);
-                    wrapper.write(Type.FLAT_VAR_INT_ITEM, second);
+                    wrapper.write(Type.ITEM1_13_2, second);
                 }
 
                 wrapper.passthrough(Type.BOOLEAN); // Trade disabled
@@ -225,21 +222,21 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             public void register() {
                 map(Type.VAR_INT); // 0 - Entity ID
                 map(Type.VAR_INT); // 1 - Slot ID
-                map(Type.FLAT_VAR_INT_ITEM); // 2 - Item
+                map(Type.ITEM1_13_2); // 2 - Item
 
-                handler(itemToClientHandler(Type.FLAT_VAR_INT_ITEM));
+                handler(itemToClientHandler(Type.ITEM1_13_2));
 
                 handler(wrapper -> {
                     int entityId = wrapper.get(Type.VAR_INT, 0);
                     EntityType entityType = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class).entityType(entityId);
                     if (entityType == null) return;
 
-                    if (entityType.isOrHasParent(Entity1_14Types.ABSTRACT_HORSE)) {
+                    if (entityType.isOrHasParent(EntityTypes1_14.ABSTRACT_HORSE)) {
                         wrapper.setPacketType(ClientboundPackets1_13.ENTITY_METADATA);
                         wrapper.resetReader();
                         wrapper.passthrough(Type.VAR_INT);
                         wrapper.read(Type.VAR_INT);
-                        Item item = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                        Item item = wrapper.read(Type.ITEM1_13_2);
                         int armorType = item == null || item.identifier() == 0 ? 0 : item.identifier() - 726;
                         if (armorType < 0 || armorType > 3) {
                             wrapper.cancel();
@@ -261,22 +258,22 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             for (int i = 0; i < size; i++) {
                 String type = wrapper.read(Type.STRING);
                 String id = wrapper.read(Type.STRING); // Recipe Identifier
-                type = type.replace("minecraft:", "");
+                type = Key.stripMinecraftNamespace(type);
                 if (removedTypes.contains(type)) {
                     switch (type) {
                         case "blasting":
                         case "smoking":
                         case "campfire_cooking":
                             wrapper.read(Type.STRING); // Group
-                            wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
-                            wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                            wrapper.read(Type.ITEM1_13_2_ARRAY); // Ingredients
+                            wrapper.read(Type.ITEM1_13_2);
                             wrapper.read(Type.FLOAT); // EXP
                             wrapper.read(Type.VAR_INT); // Cooking time
                             break;
                         case "stonecutting":
                             wrapper.read(Type.STRING); // Group?
-                            wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
-                            wrapper.read(Type.FLAT_VAR_INT_ITEM); // Result
+                            wrapper.read(Type.ITEM1_13_2_ARRAY); // Ingredients
+                            wrapper.read(Type.ITEM1_13_2); // Result
                             break;
                     }
                     deleted++;
@@ -292,14 +289,14 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
         });
 
 
-        registerClickWindow(ServerboundPackets1_13.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM);
-        registerCreativeInvAction(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerClickWindow(ServerboundPackets1_13.CLICK_WINDOW, Type.ITEM1_13_2);
+        registerCreativeInvAction(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
 
         protocol.registerClientbound(ClientboundPackets1_14.BLOCK_BREAK_ANIMATION, new PacketHandlers() {
             @Override
             public void register() {
                 map(Type.VAR_INT);
-                map(Type.POSITION1_14, Type.POSITION);
+                map(Type.POSITION1_14, Type.POSITION1_8);
                 map(Type.BYTE);
             }
         });
@@ -307,14 +304,14 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
         protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ENTITY_DATA, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION1_14, Type.POSITION);
+                map(Type.POSITION1_14, Type.POSITION1_8);
             }
         });
 
         protocol.registerClientbound(ClientboundPackets1_14.BLOCK_ACTION, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION1_14, Type.POSITION); // Location
+                map(Type.POSITION1_14, Type.POSITION1_8); // Location
                 map(Type.UNSIGNED_BYTE); // Action id
                 map(Type.UNSIGNED_BYTE); // Action param
                 map(Type.VAR_INT); // Block id - /!\ NOT BLOCK STATE
@@ -332,7 +329,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
         protocol.registerClientbound(ClientboundPackets1_14.BLOCK_CHANGE, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION1_14, Type.POSITION);
+                map(Type.POSITION1_14, Type.POSITION1_8);
                 map(Type.VAR_INT);
                 handler(wrapper -> {
                     int id = wrapper.get(Type.VAR_INT, 0);
@@ -366,8 +363,8 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
 
         protocol.registerClientbound(ClientboundPackets1_14.CHUNK_DATA, wrapper -> {
             ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
-            Chunk chunk = wrapper.read(new Chunk1_14Type());
-            wrapper.write(new Chunk1_13Type(clientWorld), chunk);
+            Chunk chunk = wrapper.read(ChunkType1_14.TYPE);
+            wrapper.write(ChunkType1_13.forEnvironment(clientWorld.getEnvironment()), chunk);
 
             ChunkLightStorage.ChunkLight chunkLight = wrapper.user().get(ChunkLightStorage.class).getStoredLight(chunk.getX(), chunk.getZ());
             for (int i = 0; i < chunk.getSections().length; i++) {
@@ -382,10 +379,10 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
                         sectionLight.setSkyLight(ChunkLightStorage.FULL_LIGHT);
                     }
                 } else {
-                    byte[] blockLight = chunkLight.getBlockLight()[i];
+                    byte[] blockLight = chunkLight.blockLight()[i];
                     sectionLight.setBlockLight(blockLight != null ? blockLight : ChunkLightStorage.FULL_LIGHT);
                     if (clientWorld.getEnvironment() == Environment.NORMAL) {
-                        byte[] skyLight = chunkLight.getSkyLight()[i];
+                        byte[] skyLight = chunkLight.skyLight()[i];
                         sectionLight.setSkyLight(skyLight != null ? skyLight : ChunkLightStorage.FULL_LIGHT);
                     }
                 }
@@ -421,7 +418,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             @Override
             public void register() {
                 map(Type.INT); // Effect Id
-                map(Type.POSITION1_14, Type.POSITION); // Location
+                map(Type.POSITION1_14, Type.POSITION1_8); // Location
                 map(Type.INT); // Data
                 handler(wrapper -> {
                     int id = wrapper.get(Type.INT, 0);
@@ -435,7 +432,7 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
             }
         });
 
-        registerSpawnParticle(ClientboundPackets1_14.SPAWN_PARTICLE, Type.FLAT_VAR_INT_ITEM, Type.FLOAT);
+        registerSpawnParticle(ClientboundPackets1_14.SPAWN_PARTICLE, Type.ITEM1_13_2, Type.FLOAT);
 
         protocol.registerClientbound(ClientboundPackets1_14.MAP_DATA, new PacketHandlers() {
             @Override
@@ -443,14 +440,14 @@ public class BlockItemPackets1_14 extends com.viaversion.viabackwards.api.rewrit
                 map(Type.VAR_INT);
                 map(Type.BYTE);
                 map(Type.BOOLEAN);
-                map(Type.BOOLEAN, Type.NOTHING); // Locked
+                read(Type.BOOLEAN); // Locked
             }
         });
 
         protocol.registerClientbound(ClientboundPackets1_14.SPAWN_POSITION, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION1_14, Type.POSITION);
+                map(Type.POSITION1_14, Type.POSITION1_8);
             }
         });
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java

@@ -26,23 +26,21 @@ import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.ChunkLi
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.DifficultyStorage;
 import com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage.EntityPositionStorage1_14;
 import com.viaversion.viaversion.api.data.entity.EntityTracker;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.VillagerData;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
-import com.viaversion.viaversion.api.minecraft.item.Item;
-import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_13_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.meta.MetaHandler;
 
 public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_14, Protocol1_13_2To1_14> {
@@ -59,8 +57,8 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
         super.addTrackedEntity(wrapper, entityId, type);
 
         // Cache the position for every newly tracked entity
-        if (type == Entity1_14Types.PAINTING) {
-            final Position position = wrapper.get(Type.POSITION, 0);
+        if (type == EntityTypes1_14.PAINTING) {
+            final Position position = wrapper.get(Type.POSITION1_8, 0);
             positionHandler.cacheEntityPosition(wrapper, position.x(), position.y(), position.z(), true, false);
         } else if (wrapper.getId() != ClientboundPackets1_14.JOIN_GAME.getId()) { // ignore join game
             positionHandler.cacheEntityPosition(wrapper, true, false);
@@ -79,14 +77,14 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
 
             EntityTracker tracker = tracker(wrapper.user());
             EntityType entityType = tracker.entityType(entityId);
-            if (entityType != Entity1_14Types.PLAYER) return;
+            if (entityType != EntityTypes1_14.PLAYER) return;
 
             // Remove equipment, else the client will see ghost items
             for (int i = 0; i <= 5; i++) {
                 PacketWrapper equipmentPacket = wrapper.create(ClientboundPackets1_13.ENTITY_EQUIPMENT);
                 equipmentPacket.write(Type.VAR_INT, entityId);
                 equipmentPacket.write(Type.VAR_INT, i);
-                equipmentPacket.write(Type.FLAT_VAR_INT_ITEM, null);
+                equipmentPacket.write(Type.ITEM1_13_2, null);
                 equipmentPacket.send(Protocol1_13_2To1_14.class);
             }
         });
@@ -141,10 +139,10 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                 handler(wrapper -> {
                     int id = wrapper.get(Type.BYTE, 0);
                     int mappedId = newEntityId(id);
-                    Entity1_13Types.EntityType entityType = Entity1_13Types.getTypeFromId(mappedId, false);
-                    Entity1_13Types.ObjectType objectType;
-                    if (entityType.isOrHasParent(Entity1_13Types.EntityType.MINECART_ABSTRACT)) {
-                        objectType = Entity1_13Types.ObjectType.MINECART;
+                    EntityTypes1_13.EntityType entityType = EntityTypes1_13.getTypeFromId(mappedId, false);
+                    EntityTypes1_13.ObjectType objectType;
+                    if (entityType.isOrHasParent(EntityTypes1_13.EntityType.MINECART_ABSTRACT)) {
+                        objectType = EntityTypes1_13.ObjectType.MINECART;
                         int data = 0;
                         switch (entityType) {
                             case CHEST_MINECART:
@@ -169,7 +167,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                         if (data != 0)
                             wrapper.set(Type.INT, 0, data);
                     } else {
-                        objectType = Entity1_13Types.ObjectType.fromEntityType(entityType).orElse(null);
+                        objectType = EntityTypes1_13.ObjectType.fromEntityType(entityType).orElse(null);
                     }
 
                     if (objectType == null) return;
@@ -177,11 +175,11 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                     wrapper.set(Type.BYTE, 0, (byte) objectType.getId());
 
                     int data = wrapper.get(Type.INT, 0);
-                    if (objectType == Entity1_13Types.ObjectType.FALLING_BLOCK) {
+                    if (objectType == EntityTypes1_13.ObjectType.FALLING_BLOCK) {
                         int blockState = wrapper.get(Type.INT, 0);
                         int combined = protocol.getMappingData().getNewBlockStateId(blockState);
                         wrapper.set(Type.INT, 0, combined);
-                    } else if (entityType.isOrHasParent(Entity1_13Types.EntityType.ABSTRACT_ARROW)) {
+                    } else if (entityType.isOrHasParent(EntityTypes1_13.EntityType.ABSTRACT_ARROW)) {
                         wrapper.set(Type.INT, 0, data + 1);
                     }
                 });
@@ -207,7 +205,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
 
                 handler(wrapper -> {
                     int type = wrapper.get(Type.VAR_INT, 1);
-                    EntityType entityType = Entity1_14Types.getTypeFromId(type);
+                    EntityType entityType = EntityTypes1_14.getTypeFromId(type);
                     addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), entityType);
 
                     int oldId = newEntityId(type);
@@ -236,7 +234,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.DOUBLE); // Needs to be mapped for the position cache
                 map(Type.DOUBLE);
                 map(Type.DOUBLE);
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), Entity1_14Types.EXPERIENCE_ORB));
+                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), EntityTypes1_14.EXPERIENCE_ORB));
             }
         });
 
@@ -248,7 +246,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.DOUBLE); // Needs to be mapped for the position cache
                 map(Type.DOUBLE);
                 map(Type.DOUBLE);
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), Entity1_14Types.LIGHTNING_BOLT));
+                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), EntityTypes1_14.LIGHTNING_BOLT));
             }
         });
 
@@ -258,11 +256,11 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.VAR_INT);
                 map(Type.UUID);
                 map(Type.VAR_INT);
-                map(Type.POSITION1_14, Type.POSITION);
+                map(Type.POSITION1_14, Type.POSITION1_8);
                 map(Type.BYTE);
 
                 // Track entity
-                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), Entity1_14Types.PAINTING));
+                handler(wrapper -> addTrackedEntity(wrapper, wrapper.get(Type.VAR_INT, 0), EntityTypes1_14.PAINTING));
             }
         });
 
@@ -278,7 +276,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.BYTE); // 6 - Pitch
                 map(Types1_14.METADATA_LIST, Types1_13_2.METADATA_LIST); // 7 - Metadata
 
-                handler(getTrackerAndMetaHandler(Types1_13_2.METADATA_LIST, Entity1_14Types.PLAYER));
+                handler(getTrackerAndMetaHandler(Types1_13_2.METADATA_LIST, EntityTypes1_14.PLAYER));
                 handler(wrapper -> positionHandler.cacheEntityPosition(wrapper, true, false));
             }
         });
@@ -293,7 +291,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                 map(Type.UNSIGNED_BYTE); // 1 - Gamemode
                 map(Type.INT); // 2 - Dimension
 
-                handler(getTrackerHandler(Entity1_14Types.PLAYER, Type.INT));
+                handler(getTrackerHandler(EntityTypes1_14.PLAYER, Type.INT));
                 handler(getDimensionHandler(1));
                 handler(wrapper -> {
                     short difficulty = wrapper.user().get(DifficultyStorage.class).getDifficulty();
@@ -333,55 +331,48 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     protected void registerRewrites() {
-        mapTypes(Entity1_14Types.values(), Entity1_13Types.EntityType.class);
+        mapTypes(EntityTypes1_14.values(), EntityTypes1_13.EntityType.class);
 
-        mapEntityTypeWithData(Entity1_14Types.CAT, Entity1_14Types.OCELOT).jsonName();
-        mapEntityTypeWithData(Entity1_14Types.TRADER_LLAMA, Entity1_14Types.LLAMA).jsonName();
-        mapEntityTypeWithData(Entity1_14Types.FOX, Entity1_14Types.WOLF).jsonName();
-        mapEntityTypeWithData(Entity1_14Types.PANDA, Entity1_14Types.POLAR_BEAR).jsonName();
-        mapEntityTypeWithData(Entity1_14Types.PILLAGER, Entity1_14Types.VILLAGER).jsonName();
-        mapEntityTypeWithData(Entity1_14Types.WANDERING_TRADER, Entity1_14Types.VILLAGER).jsonName();
-        mapEntityTypeWithData(Entity1_14Types.RAVAGER, Entity1_14Types.COW).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.CAT, EntityTypes1_14.OCELOT).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.TRADER_LLAMA, EntityTypes1_14.LLAMA).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.FOX, EntityTypes1_14.WOLF).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.PANDA, EntityTypes1_14.POLAR_BEAR).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.PILLAGER, EntityTypes1_14.VILLAGER).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.WANDERING_TRADER, EntityTypes1_14.VILLAGER).jsonName();
+        mapEntityTypeWithData(EntityTypes1_14.RAVAGER, EntityTypes1_14.COW).jsonName();
 
         filter().handler((event, meta) -> {
             int typeId = meta.metaType().typeId();
             if (typeId <= 15) {
                 meta.setMetaType(Types1_13_2.META_TYPES.byId(typeId));
             }
-
-            MetaType type = meta.metaType();
-
-            if (type == Types1_13_2.META_TYPES.itemType) {
-                Item item = (Item) meta.getValue();
-                meta.setValue(protocol.getItemRewriter().handleItemToClient(item));
-            } else if (type == Types1_13_2.META_TYPES.blockStateType) {
-                int blockstate = meta.value();
-                meta.setValue(protocol.getMappingData().getNewBlockStateId(blockstate));
-            }
         });
 
-        filter().type(Entity1_14Types.PILLAGER).cancel(15);
+        registerMetaTypeHandler(Types1_13_2.META_TYPES.itemType, Types1_13_2.META_TYPES.blockStateType, null, null,
+                Types1_13_2.META_TYPES.componentType, Types1_13_2.META_TYPES.optionalComponentType);
 
-        filter().type(Entity1_14Types.FOX).cancel(15);
-        filter().type(Entity1_14Types.FOX).cancel(16);
-        filter().type(Entity1_14Types.FOX).cancel(17);
-        filter().type(Entity1_14Types.FOX).cancel(18);
+        filter().type(EntityTypes1_14.PILLAGER).cancel(15);
 
-        filter().type(Entity1_14Types.PANDA).cancel(15);
-        filter().type(Entity1_14Types.PANDA).cancel(16);
-        filter().type(Entity1_14Types.PANDA).cancel(17);
-        filter().type(Entity1_14Types.PANDA).cancel(18);
-        filter().type(Entity1_14Types.PANDA).cancel(19);
-        filter().type(Entity1_14Types.PANDA).cancel(20);
+        filter().type(EntityTypes1_14.FOX).cancel(15);
+        filter().type(EntityTypes1_14.FOX).cancel(16);
+        filter().type(EntityTypes1_14.FOX).cancel(17);
+        filter().type(EntityTypes1_14.FOX).cancel(18);
 
-        filter().type(Entity1_14Types.CAT).cancel(18);
-        filter().type(Entity1_14Types.CAT).cancel(19);
-        filter().type(Entity1_14Types.CAT).cancel(20);
+        filter().type(EntityTypes1_14.PANDA).cancel(15);
+        filter().type(EntityTypes1_14.PANDA).cancel(16);
+        filter().type(EntityTypes1_14.PANDA).cancel(17);
+        filter().type(EntityTypes1_14.PANDA).cancel(18);
+        filter().type(EntityTypes1_14.PANDA).cancel(19);
+        filter().type(EntityTypes1_14.PANDA).cancel(20);
+
+        filter().type(EntityTypes1_14.CAT).cancel(18);
+        filter().type(EntityTypes1_14.CAT).cancel(19);
+        filter().type(EntityTypes1_14.CAT).cancel(20);
 
         filter().handler((event, meta) -> {
             EntityType type = event.entityType();
             if (type == null) return;
-            if (type.isOrHasParent(Entity1_14Types.ABSTRACT_ILLAGER_BASE) || type == Entity1_14Types.RAVAGER || type == Entity1_14Types.WITCH) {
+            if (type.isOrHasParent(EntityTypes1_14.ABSTRACT_ILLAGER_BASE) || type == EntityTypes1_14.RAVAGER || type == EntityTypes1_14.WITCH) {
                 int index = event.index();
                 if (index == 14) {
                     event.cancel();
@@ -391,11 +382,11 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        filter().type(Entity1_14Types.AREA_EFFECT_CLOUD).index(10).handler((event, meta) -> {
+        filter().type(EntityTypes1_14.AREA_EFFECT_CLOUD).index(10).handler((event, meta) -> {
             rewriteParticle((Particle) meta.getValue());
         });
 
-        filter().type(Entity1_14Types.FIREWORK_ROCKET).index(8).handler((event, meta) -> {
+        filter().type(EntityTypes1_14.FIREWORK_ROCKET).index(8).handler((event, meta) -> {
             meta.setMetaType(Types1_13_2.META_TYPES.varIntType);
             Integer value = (Integer) meta.getValue();
             if (value == null) {
@@ -403,9 +394,9 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         });
 
-        filter().filterFamily(Entity1_14Types.ABSTRACT_ARROW).removeIndex(9);
+        filter().filterFamily(EntityTypes1_14.ABSTRACT_ARROW).removeIndex(9);
 
-        filter().type(Entity1_14Types.VILLAGER).cancel(15); // Head shake timer
+        filter().type(EntityTypes1_14.VILLAGER).cancel(15); // Head shake timer
 
         MetaHandler villagerDataHandler = (event, meta) -> {
             VillagerData villagerData = (VillagerData) meta.getValue();
@@ -415,27 +406,27 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
             }
         };
 
-        filter().type(Entity1_14Types.ZOMBIE_VILLAGER).index(18).handler(villagerDataHandler);
-        filter().type(Entity1_14Types.VILLAGER).index(16).handler(villagerDataHandler);
+        filter().type(EntityTypes1_14.ZOMBIE_VILLAGER).index(18).handler(villagerDataHandler);
+        filter().type(EntityTypes1_14.VILLAGER).index(16).handler(villagerDataHandler);
 
         // Holding arms up - from bitfield into own boolean
-        filter().filterFamily(Entity1_14Types.ABSTRACT_SKELETON).index(13).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_14.ABSTRACT_SKELETON).index(13).handler((event, meta) -> {
             byte value = (byte) meta.getValue();
             if ((value & 4) != 0) {
                 event.createExtraMeta(new Metadata(14, Types1_13_2.META_TYPES.booleanType, true));
             }
         });
-        filter().filterFamily(Entity1_14Types.ZOMBIE).index(13).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_14.ZOMBIE).index(13).handler((event, meta) -> {
             byte value = (byte) meta.getValue();
             if ((value & 4) != 0) {
                 event.createExtraMeta(new Metadata(16, Types1_13_2.META_TYPES.booleanType, true));
             }
         });
 
-        filter().filterFamily(Entity1_14Types.ZOMBIE).addIndex(16);
+        filter().filterFamily(EntityTypes1_14.ZOMBIE).addIndex(16);
 
         // Remove bed location
-        filter().filterFamily(Entity1_14Types.LIVINGENTITY).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_14.LIVINGENTITY).handler((event, meta) -> {
             int index = event.index();
             if (index == 12) {
                 Position position = (Position) meta.getValue();
@@ -443,7 +434,7 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
                     // Use bed
                     PacketWrapper wrapper = PacketWrapper.create(ClientboundPackets1_13.USE_BED, null, event.user());
                     wrapper.write(Type.VAR_INT, event.entityId());
-                    wrapper.write(Type.POSITION, position);
+                    wrapper.write(Type.POSITION1_8, position);
 
                     try {
                         wrapper.scheduleSend(Protocol1_13_2To1_14.class);
@@ -461,12 +452,12 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
         // Pose
         filter().removeIndex(6);
 
-        filter().type(Entity1_14Types.OCELOT).index(13).handler((event, meta) -> {
+        filter().type(EntityTypes1_14.OCELOT).index(13).handler((event, meta) -> {
             event.setIndex(15);
             meta.setTypeAndValue(Types1_13_2.META_TYPES.varIntType, 0);
         });
 
-        filter().type(Entity1_14Types.CAT).handler((event, meta) -> {
+        filter().type(EntityTypes1_14.CAT).handler((event, meta) -> {
             if (event.index() == 15) {
                 meta.setValue(1);
             } else if (event.index() == 13) {
@@ -510,6 +501,6 @@ public class EntityPackets1_14 extends LegacyEntityRewriter<ClientboundPackets1_
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_14Types.getTypeFromId(typeId);
+        return EntityTypes1_14.getTypeFromId(typeId);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java

@@ -38,7 +38,7 @@ public class PlayerPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
             @Override
             public void register() {
                 map(Type.UNSIGNED_BYTE);
-                map(Type.BOOLEAN, Type.NOTHING); // Locked
+                read(Type.BOOLEAN); // Locked
                 handler(wrapper -> {
                     byte difficulty = wrapper.get(Type.UNSIGNED_BYTE, 0).byteValue();
                     wrapper.user().get(DifficultyStorage.class).setDifficulty(difficulty);
@@ -49,21 +49,21 @@ public class PlayerPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
         protocol.registerClientbound(ClientboundPackets1_14.OPEN_SIGN_EDITOR, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION1_14, Type.POSITION);
+                map(Type.POSITION1_14, Type.POSITION1_8);
             }
         });
         protocol.registerServerbound(ServerboundPackets1_13.QUERY_BLOCK_NBT, new PacketHandlers() {
             @Override
             public void register() {
                 map(Type.VAR_INT);
-                map(Type.POSITION, Type.POSITION1_14);
+                map(Type.POSITION1_8, Type.POSITION1_14);
             }
         });
         protocol.registerServerbound(ServerboundPackets1_13.PLAYER_DIGGING, new PacketHandlers() {
             @Override
             public void register() {
                 map(Type.VAR_INT); // Action
-                map(Type.POSITION, Type.POSITION1_14); // Position
+                map(Type.POSITION1_8, Type.POSITION1_14); // Position
             }
         });
 
@@ -94,24 +94,24 @@ public class PlayerPackets1_14 extends RewriterBase<Protocol1_13_2To1_14> {
         protocol.registerServerbound(ServerboundPackets1_13.UPDATE_COMMAND_BLOCK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION, Type.POSITION1_14);
+                map(Type.POSITION1_8, Type.POSITION1_14);
             }
         });
         protocol.registerServerbound(ServerboundPackets1_13.UPDATE_STRUCTURE_BLOCK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION, Type.POSITION1_14);
+                map(Type.POSITION1_8, Type.POSITION1_14);
             }
         });
         protocol.registerServerbound(ServerboundPackets1_13.UPDATE_SIGN, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.POSITION, Type.POSITION1_14);
+                map(Type.POSITION1_8, Type.POSITION1_14);
             }
         });
 
         protocol.registerServerbound(ServerboundPackets1_13.PLAYER_BLOCK_PLACEMENT, wrapper -> {
-            Position position = wrapper.read(Type.POSITION);
+            Position position = wrapper.read(Type.POSITION1_8);
             int face = wrapper.read(Type.VAR_INT);
             int hand = wrapper.read(Type.VAR_INT);
             float x = wrapper.read(Type.FLOAT);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java

@@ -17,15 +17,14 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ChunkLightStorage extends StoredObject {
+public class ChunkLightStorage implements StorableObject {
     public static final byte[] FULL_LIGHT = new byte[2048];
     public static final byte[] EMPTY_LIGHT = new byte[2048];
     private static Constructor<?> fastUtilLongObjectHashMap;
@@ -41,10 +40,6 @@ public class ChunkLightStorage extends StoredObject {
         }
     }
 
-    public ChunkLightStorage(UserConnection user) {
-        super(user);
-    }
-
     public void setStoredLight(byte[][] skyLight, byte[][] blockLight, int x, int z) {
         storedLight.put(getChunkSectionIndex(x, z), new ChunkLight(skyLight, blockLight));
     }
@@ -85,11 +80,11 @@ public class ChunkLightStorage extends StoredObject {
             this.blockLight = blockLight;
         }
 
-        public byte[][] getSkyLight() {
+        public byte[][] skyLight() {
             return skyLight;
         }
 
-        public byte[][] getBlockLight() {
+        public byte[][] blockLight() {
             return blockLight;
         }
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/storage/DifficultyStorage.java

@@ -17,16 +17,11 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_13_2to1_14.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class DifficultyStorage extends StoredObject {
+public class DifficultyStorage implements StorableObject {
     private byte difficulty;
 
-    public DifficultyStorage(UserConnection user) {
-        super(user);
-    }
-
     public byte getDifficulty() {
         return difficulty;
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java

@@ -26,8 +26,9 @@ import com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.packets.EntityP
 import com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.packets.InventoryPackets1_13_1;
 import com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.packets.WorldPackets1_13_1;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -40,7 +41,7 @@ import com.viaversion.viaversion.protocols.protocol1_13_1to1_13.Protocol1_13_1To
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ServerboundPackets1_13;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 
@@ -49,6 +50,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.13.2", "1.13", Protocol1_13_1To1_13.class);
     private final EntityPackets1_13_1 entityRewriter = new EntityPackets1_13_1(this);
     private final InventoryPackets1_13_1 itemRewriter = new InventoryPackets1_13_1(this);
+    private final TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_13To1_13_1() {
         super(ClientboundPackets1_13.class, ClientboundPackets1_13.class, ServerboundPackets1_13.class, ServerboundPackets1_13.class);
@@ -60,10 +62,9 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
 
         WorldPackets1_13_1.register(this);
 
-        TranslatableRewriter<ClientboundPackets1_13> translatableRewriter = new TranslatableRewriter<>(this);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_13.CHAT_MESSAGE);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_13.COMBAT_EVENT);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_13.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_13.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_13.TAB_LIST);
         translatableRewriter.registerTitle(ClientboundPackets1_13.TITLE);
         translatableRewriter.registerPing();
@@ -87,10 +88,10 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
         registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.FLAT_ITEM);
+                map(Type.ITEM1_13);
                 map(Type.BOOLEAN);
                 handler(wrapper -> {
-                    itemRewriter.handleItemToServer(wrapper.get(Type.FLAT_ITEM, 0));
+                    itemRewriter.handleItemToServer(wrapper.get(Type.ITEM1_13, 0));
                     wrapper.write(Type.VAR_INT, 0);
                 });
             }
@@ -181,7 +182,7 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
                 if (wrapper.passthrough(Type.BOOLEAN)) {
                     wrapper.passthrough(Type.COMPONENT); // Title
                     wrapper.passthrough(Type.COMPONENT); // Description
-                    Item icon = wrapper.passthrough(Type.FLAT_ITEM);
+                    Item icon = wrapper.passthrough(Type.ITEM1_13);
                     itemRewriter.handleItemToClient(icon);
                     wrapper.passthrough(Type.VAR_INT); // Frame type
                     int flags = wrapper.passthrough(Type.INT); // Flags
@@ -206,10 +207,10 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     public void init(UserConnection user) {
-        user.addEntityTracker(getClass(), new EntityTrackerBase(user, Entity1_13Types.EntityType.PLAYER));
+        user.addEntityTracker(getClass(), new EntityTrackerBase(user, EntityTypes1_13.EntityType.PLAYER));
 
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
     }
 
@@ -227,4 +228,8 @@ public class Protocol1_13To1_13_1 extends BackwardsProtocol<ClientboundPackets1_
     public InventoryPackets1_13_1 getItemRewriter() {
         return itemRewriter;
     }
+
+    public TranslatableRewriter<ClientboundPackets1_13> translatableRewriter() {
+        return translatableRewriter;
+    }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java

@@ -20,14 +20,15 @@ package com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.packets;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.rewriters.LegacyEntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_13Types;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_13;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
 import java.util.List;
 
@@ -55,14 +56,14 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<ClientboundPackets
                 handler(wrapper -> {
                     int entityId = wrapper.get(Type.VAR_INT, 0);
                     byte type = wrapper.get(Type.BYTE, 0);
-                    Entity1_13Types.EntityType entType = Entity1_13Types.getTypeFromId(type, true);
+                    EntityTypes1_13.EntityType entType = EntityTypes1_13.getTypeFromId(type, true);
                     if (entType == null) {
                         ViaBackwards.getPlatform().getLogger().warning("Could not find 1.13 entity type " + type);
                         return;
                     }
 
                     // Rewrite falling block
-                    if (entType.is(Entity1_13Types.EntityType.FALLING_BLOCK)) {
+                    if (entType.is(EntityTypes1_13.EntityType.FALLING_BLOCK)) {
                         int data = wrapper.get(Type.INT, 0);
                         wrapper.set(Type.INT, 0, protocol.getMappingData().getNewBlockStateId(data));
                     }
@@ -73,8 +74,8 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<ClientboundPackets
             }
         });
 
-        registerTracker(ClientboundPackets1_13.SPAWN_EXPERIENCE_ORB, Entity1_13Types.EntityType.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_13.SPAWN_GLOBAL_ENTITY, Entity1_13Types.EntityType.LIGHTNING_BOLT);
+        registerTracker(ClientboundPackets1_13.SPAWN_EXPERIENCE_ORB, EntityTypes1_13.EntityType.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_13.SPAWN_GLOBAL_ENTITY, EntityTypes1_13.EntityType.LIGHTNING_BOLT);
 
         protocol.registerClientbound(ClientboundPackets1_13.SPAWN_MOB, new PacketHandlers() {
             @Override
@@ -116,12 +117,12 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<ClientboundPackets
                 map(Type.BYTE); // 6 - Pitch
                 map(Types1_13.METADATA_LIST); // 7 - Metadata
 
-                handler(getTrackerAndMetaHandler(Types1_13.METADATA_LIST, Entity1_13Types.EntityType.PLAYER));
+                handler(getTrackerAndMetaHandler(Types1_13.METADATA_LIST, EntityTypes1_13.EntityType.PLAYER));
             }
         });
 
-        registerTracker(ClientboundPackets1_13.SPAWN_PAINTING, Entity1_13Types.EntityType.PAINTING);
-        registerJoinGame(ClientboundPackets1_13.JOIN_GAME, Entity1_13Types.EntityType.PLAYER);
+        registerTracker(ClientboundPackets1_13.SPAWN_PAINTING, EntityTypes1_13.EntityType.PAINTING);
+        registerJoinGame(ClientboundPackets1_13.JOIN_GAME, EntityTypes1_13.EntityType.PLAYER);
         registerRespawn(ClientboundPackets1_13.RESPAWN);
         registerRemoveEntities(ClientboundPackets1_13.DESTROY_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_13.ENTITY_METADATA, Types1_13.METADATA_LIST);
@@ -139,20 +140,23 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<ClientboundPackets
                 meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
             } else if (meta.metaType() == Types1_13.META_TYPES.particleType) {
                 rewriteParticle((Particle) meta.getValue());
+            } else if (meta.metaType() == Types1_13.META_TYPES.optionalComponentType || meta.metaType() == Types1_13.META_TYPES.componentType) {
+                JsonElement element = meta.value();
+                protocol.translatableRewriter().processText(element);
             }
         });
 
         // Remove shooter UUID
-        filter().filterFamily(Entity1_13Types.EntityType.ABSTRACT_ARROW).cancel(7);
+        filter().filterFamily(EntityTypes1_13.EntityType.ABSTRACT_ARROW).cancel(7);
 
         // Move colors to old position
-        filter().type(Entity1_13Types.EntityType.SPECTRAL_ARROW).index(8).toIndex(7);
+        filter().type(EntityTypes1_13.EntityType.SPECTRAL_ARROW).index(8).toIndex(7);
 
         // Move loyalty level to old position
-        filter().type(Entity1_13Types.EntityType.TRIDENT).index(8).toIndex(7);
+        filter().type(EntityTypes1_13.EntityType.TRIDENT).index(8).toIndex(7);
 
         // Rewrite Minecart blocks
-        filter().filterFamily(Entity1_13Types.EntityType.MINECART_ABSTRACT).index(9).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_13.EntityType.MINECART_ABSTRACT).index(9).handler((event, meta) -> {
             int data = (int) meta.getValue();
             meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
         });
@@ -160,11 +164,11 @@ public class EntityPackets1_13_1 extends LegacyEntityRewriter<ClientboundPackets
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_13Types.getTypeFromId(typeId, false);
+        return EntityTypes1_13.getTypeFromId(typeId, false);
     }
 
     @Override
     protected EntityType getObjectTypeFromId(final int typeId) {
-        return Entity1_13Types.getTypeFromId(typeId, true);
+        return EntityTypes1_13.getTypeFromId(typeId, true);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java

@@ -33,8 +33,8 @@ public class InventoryPackets1_13_1 extends ItemRewriter<ClientboundPackets1_13,
     @Override
     public void registerPackets() {
         registerSetCooldown(ClientboundPackets1_13.COOLDOWN);
-        registerWindowItems(ClientboundPackets1_13.WINDOW_ITEMS, Type.FLAT_ITEM_ARRAY);
-        registerSetSlot(ClientboundPackets1_13.SET_SLOT, Type.FLAT_ITEM);
+        registerWindowItems(ClientboundPackets1_13.WINDOW_ITEMS, Type.ITEM1_13_ARRAY);
+        registerSetSlot(ClientboundPackets1_13.SET_SLOT, Type.ITEM1_13);
 
         protocol.registerClientbound(ClientboundPackets1_13.PLUGIN_MESSAGE, wrapper -> {
             String channel = wrapper.passthrough(Type.STRING);
@@ -44,16 +44,16 @@ public class InventoryPackets1_13_1 extends ItemRewriter<ClientboundPackets1_13,
                 int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
                 for (int i = 0; i < size; i++) {
                     //Input Item
-                    Item input = wrapper.passthrough(Type.FLAT_ITEM);
+                    Item input = wrapper.passthrough(Type.ITEM1_13);
                     handleItemToClient(input);
                     //Output Item
-                    Item output = wrapper.passthrough(Type.FLAT_ITEM);
+                    Item output = wrapper.passthrough(Type.ITEM1_13);
                     handleItemToClient(output);
 
                     boolean secondItem = wrapper.passthrough(Type.BOOLEAN); //Has second item
                     if (secondItem) {
                         //Second Item
-                        Item second = wrapper.passthrough(Type.FLAT_ITEM);
+                        Item second = wrapper.passthrough(Type.ITEM1_13);
                         handleItemToClient(second);
                     }
 
@@ -64,10 +64,10 @@ public class InventoryPackets1_13_1 extends ItemRewriter<ClientboundPackets1_13,
             }
         });
 
-        registerEntityEquipment(ClientboundPackets1_13.ENTITY_EQUIPMENT, Type.FLAT_ITEM);
-        registerClickWindow(ServerboundPackets1_13.CLICK_WINDOW, Type.FLAT_ITEM);
-        registerCreativeInvAction(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, Type.FLAT_ITEM);
+        registerEntityEquipment(ClientboundPackets1_13.ENTITY_EQUIPMENT, Type.ITEM1_13);
+        registerClickWindow(ServerboundPackets1_13.CLICK_WINDOW, Type.ITEM1_13);
+        registerCreativeInvAction(ServerboundPackets1_13.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13);
 
-        registerSpawnParticle(ClientboundPackets1_13.SPAWN_PARTICLE, Type.FLAT_ITEM, Type.FLOAT);
+        registerSpawnParticle(ClientboundPackets1_13.SPAWN_PARTICLE, Type.ITEM1_13, Type.FLOAT);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java

@@ -19,6 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.packets;
 
 import com.viaversion.viabackwards.protocol.protocol1_13to1_13_1.Protocol1_13To1_13_1;
 import com.viaversion.viaversion.api.minecraft.BlockFace;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
@@ -26,19 +27,18 @@ import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
 import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_13;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ClientboundPackets1_13;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.types.Chunk1_13Type;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 
 public class WorldPackets1_13_1 {
 
     public static void register(Protocol1_13To1_13_1 protocol) {
-        BlockRewriter<ClientboundPackets1_13> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION);
+        BlockRewriter<ClientboundPackets1_13> blockRewriter = BlockRewriter.legacy(protocol);
 
         protocol.registerClientbound(ClientboundPackets1_13.CHUNK_DATA, wrapper -> {
             ClientWorld clientWorld = wrapper.user().get(ClientWorld.class);
-            Chunk chunk = wrapper.passthrough(new Chunk1_13Type(clientWorld));
+            Chunk chunk = wrapper.passthrough(ChunkType1_13.forEnvironment(clientWorld.getEnvironment()));
 
             for (ChunkSection section : chunk.getSections()) {
                 if (section == null) {
@@ -60,7 +60,7 @@ public class WorldPackets1_13_1 {
             @Override
             public void register() {
                 map(Type.INT); // Effect Id
-                map(Type.POSITION); // Location
+                map(Type.POSITION1_8); // Location
                 map(Type.INT); // Data
                 handler(wrapper -> {
                     int id = wrapper.get(Type.INT, 0);
@@ -73,9 +73,9 @@ public class WorldPackets1_13_1 {
                         switch (data) {
                             case 0: // Down
                             case 1: // Up
-                                Position pos = wrapper.get(Type.POSITION, 0);
+                                Position pos = wrapper.get(Type.POSITION1_8, 0);
                                 BlockFace relative = data == 0 ? BlockFace.BOTTOM : BlockFace.TOP;
-                                wrapper.set(Type.POSITION, 0, pos.getRelative(relative)); // Y Offset
+                                wrapper.set(Type.POSITION1_8, 0, pos.getRelative(relative)); // Y Offset
                                 wrapper.set(Type.INT, 1, 4); // Self
                                 break;
                             case 2: // North

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java

@@ -22,6 +22,7 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
+import com.viaversion.viaversion.util.Key;
 
 public class Protocol1_14_2To1_14_3 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_14, ServerboundPackets1_14, ServerboundPackets1_14> {
 
@@ -35,10 +36,10 @@ public class Protocol1_14_2To1_14_3 extends BackwardsProtocol<ClientboundPackets
             wrapper.passthrough(Type.VAR_INT);
             int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
             for (int i = 0; i < size; i++) {
-                wrapper.passthrough(Type.FLAT_VAR_INT_ITEM);
-                wrapper.passthrough(Type.FLAT_VAR_INT_ITEM);
+                wrapper.passthrough(Type.ITEM1_13_2);
+                wrapper.passthrough(Type.ITEM1_13_2);
                 if (wrapper.passthrough(Type.BOOLEAN)) {
-                    wrapper.passthrough(Type.FLAT_VAR_INT_ITEM);
+                    wrapper.passthrough(Type.ITEM1_13_2);
                 }
                 wrapper.passthrough(Type.BOOLEAN);
                 wrapper.passthrough(Type.INT);
@@ -60,7 +61,7 @@ public class Protocol1_14_2To1_14_3 extends BackwardsProtocol<ClientboundPackets
             int deleted = 0;
             for (int i = 0; i < size; i++) {
                 String fullType = wrapper.read(Type.STRING);
-                String type = fullType.replace("minecraft:", "");
+                String type = Key.stripMinecraftNamespace(fullType);
                 String id = wrapper.read(Type.STRING); // id
 
                 if (type.equals("crafting_special_repairitem")) {

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java

@@ -20,19 +20,20 @@ package com.viaversion.viabackwards.protocol.protocol1_14_3to1_14_4;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
 
-public class Protocol1_14_3To1_14_4 extends BackwardsProtocol<ClientboundPackets1_14, ClientboundPackets1_14, ServerboundPackets1_14, ServerboundPackets1_14> {
+public class Protocol1_14_3To1_14_4 extends BackwardsProtocol<ClientboundPackets1_14_4, ClientboundPackets1_14, ServerboundPackets1_14, ServerboundPackets1_14> {
 
     public Protocol1_14_3To1_14_4() {
-        super(ClientboundPackets1_14.class, ClientboundPackets1_14.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
+        super(ClientboundPackets1_14_4.class, ClientboundPackets1_14.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
     }
 
     @Override
     protected void registerPackets() {
         // Acknowledge Player Digging - added in pre4
-        registerClientbound(ClientboundPackets1_14.ACKNOWLEDGE_PLAYER_DIGGING, ClientboundPackets1_14.BLOCK_CHANGE, new PacketHandlers() {
+        registerClientbound(ClientboundPackets1_14_4.ACKNOWLEDGE_PLAYER_DIGGING, ClientboundPackets1_14.BLOCK_CHANGE, new PacketHandlers() {
             @Override
             public void register() {
                 map(Type.POSITION1_14);
@@ -47,14 +48,14 @@ public class Protocol1_14_3To1_14_4 extends BackwardsProtocol<ClientboundPackets
             }
         });
 
-        registerClientbound(ClientboundPackets1_14.TRADE_LIST, wrapper -> {
+        registerClientbound(ClientboundPackets1_14_4.TRADE_LIST, wrapper -> {
             wrapper.passthrough(Type.VAR_INT);
             int size = wrapper.passthrough(Type.UNSIGNED_BYTE);
             for (int i = 0; i < size; i++) {
-                wrapper.passthrough(Type.FLAT_VAR_INT_ITEM);
-                wrapper.passthrough(Type.FLAT_VAR_INT_ITEM);
+                wrapper.passthrough(Type.ITEM1_13_2);
+                wrapper.passthrough(Type.ITEM1_13_2);
                 if (wrapper.passthrough(Type.BOOLEAN)) {
-                    wrapper.passthrough(Type.FLAT_VAR_INT_ITEM);
+                    wrapper.passthrough(Type.ITEM1_13_2);
                 }
                 wrapper.passthrough(Type.BOOLEAN);
                 wrapper.passthrough(Type.INT);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java

@@ -26,27 +26,28 @@ import com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.packets.BlockIt
 import com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.packets.EntityPackets1_15;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
-import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
+import com.viaversion.viaversion.protocols.protocol1_14_4to1_14_3.ClientboundPackets1_14_4;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 
-public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_15, ClientboundPackets1_14, ServerboundPackets1_14, ServerboundPackets1_14> {
+public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_15, ClientboundPackets1_14_4, ServerboundPackets1_14, ServerboundPackets1_14> {
 
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.15", "1.14", Protocol1_15To1_14_4.class);
     private final EntityPackets1_15 entityRewriter = new EntityPackets1_15(this);
     private final BlockItemPackets1_15 blockItemPackets = new BlockItemPackets1_15(this);
-    private final TranslatableRewriter<ClientboundPackets1_15> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_15> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_14_4To1_15() {
-        super(ClientboundPackets1_15.class, ClientboundPackets1_14.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
+        super(ClientboundPackets1_15.class, ClientboundPackets1_14_4.class, ServerboundPackets1_14.class, ServerboundPackets1_14.class);
     }
 
     @Override
@@ -56,7 +57,7 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_
         translatableRewriter.registerBossBar(ClientboundPackets1_15.BOSSBAR);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_15.CHAT_MESSAGE);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_15.COMBAT_EVENT);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_15.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_15.DISCONNECT);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_15.OPEN_WINDOW);
         translatableRewriter.registerTabList(ClientboundPackets1_15.TAB_LIST);
         translatableRewriter.registerTitle(ClientboundPackets1_15.TITLE);
@@ -76,7 +77,7 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_
                 map(Type.FLOAT); // y
                 map(Type.FLOAT); // z
                 handler(wrapper -> {
-                    PacketWrapper soundPacket = wrapper.create(ClientboundPackets1_14.SOUND);
+                    PacketWrapper soundPacket = wrapper.create(ClientboundPackets1_14_4.SOUND);
                     soundPacket.write(Type.VAR_INT, 243); // entity.generic.explode
                     soundPacket.write(Type.VAR_INT, 4); // blocks category
                     soundPacket.write(Type.INT, toEffectCoordinate(wrapper.get(Type.FLOAT, 0))); // x
@@ -101,7 +102,7 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_
     @Override
     public void init(UserConnection user) {
         user.put(new ImmediateRespawn());
-        user.addEntityTracker(getClass(), new EntityTrackerBase(user, Entity1_15Types.PLAYER));
+        user.addEntityTracker(getClass(), new EntityTrackerBase(user, EntityTypes1_15.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java

@@ -17,13 +17,13 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.data;
 
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 
 public class EntityTypeMapping {
 
     // There's only the bee, so not much to do here
     public static int getOldEntityId(int entityId) {
-        if (entityId == 4) return Entity1_14Types.PUFFERFISH.getId(); // Flying pufferfish!
+        if (entityId == 4) return EntityTypes1_14.PUFFERFISH.getId(); // Flying pufferfish!
         return entityId >= 5 ? entityId - 1 : entityId;
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java

@@ -25,10 +25,10 @@ import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_14;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_15;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
-import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.types.Chunk1_14Type;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
-import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 
@@ -40,20 +40,20 @@ public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewrit
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_15> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        BlockRewriter<ClientboundPackets1_15> blockRewriter = BlockRewriter.for1_14(protocol);
 
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_15.DECLARE_RECIPES);
 
-        protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+        protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2)));
 
         registerSetCooldown(ClientboundPackets1_15.COOLDOWN);
-        registerWindowItems(ClientboundPackets1_15.WINDOW_ITEMS, Type.FLAT_VAR_INT_ITEM_ARRAY);
-        registerSetSlot(ClientboundPackets1_15.SET_SLOT, Type.FLAT_VAR_INT_ITEM);
+        registerWindowItems(ClientboundPackets1_15.WINDOW_ITEMS, Type.ITEM1_13_2_SHORT_ARRAY);
+        registerSetSlot(ClientboundPackets1_15.SET_SLOT, Type.ITEM1_13_2);
         registerTradeList(ClientboundPackets1_15.TRADE_LIST);
-        registerEntityEquipment(ClientboundPackets1_15.ENTITY_EQUIPMENT, Type.FLAT_VAR_INT_ITEM);
-        registerAdvancements(ClientboundPackets1_15.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
-        registerClickWindow(ServerboundPackets1_14.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM);
-        registerCreativeInvAction(ServerboundPackets1_14.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerEntityEquipment(ClientboundPackets1_15.ENTITY_EQUIPMENT, Type.ITEM1_13_2);
+        registerAdvancements(ClientboundPackets1_15.ADVANCEMENTS, Type.ITEM1_13_2);
+        registerClickWindow(ServerboundPackets1_14.CLICK_WINDOW, Type.ITEM1_13_2);
+        registerCreativeInvAction(ServerboundPackets1_14.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
 
         blockRewriter.registerAcknowledgePlayerDigging(ClientboundPackets1_15.ACKNOWLEDGE_PLAYER_DIGGING);
         blockRewriter.registerBlockAction(ClientboundPackets1_15.BLOCK_ACTION);
@@ -61,8 +61,8 @@ public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewrit
         blockRewriter.registerMultiBlockChange(ClientboundPackets1_15.MULTI_BLOCK_CHANGE);
 
         protocol.registerClientbound(ClientboundPackets1_15.CHUNK_DATA, wrapper -> {
-            Chunk chunk = wrapper.read(new Chunk1_15Type());
-            wrapper.write(new Chunk1_14Type(), chunk);
+            Chunk chunk = wrapper.read(ChunkType1_15.TYPE);
+            wrapper.write(ChunkType1_14.TYPE, chunk);
 
             if (chunk.isFullChunk()) {
                 int[] biomeData = chunk.getBiomeData();
@@ -122,8 +122,8 @@ public class BlockItemPackets1_15 extends com.viaversion.viabackwards.api.rewrit
                         int data = wrapper.passthrough(Type.VAR_INT);
                         wrapper.set(Type.VAR_INT, 0, protocol.getMappingData().getNewBlockStateId(data));
                     } else if (id == 32) {
-                        Item item = handleItemToClient(wrapper.read(Type.FLAT_VAR_INT_ITEM));
-                        wrapper.write(Type.FLAT_VAR_INT_ITEM, item);
+                        Item item = handleItemToClient(wrapper.read(Type.ITEM1_13_2));
+                        wrapper.write(Type.ITEM1_13_2, item);
                     }
 
                     int mappedId = protocol.getMappingData().getNewParticleId(id);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java

@@ -21,7 +21,7 @@ import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.Protocol1_14_4To1_15;
 import com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.data.EntityTypeMapping;
 import com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.data.ImmediateRespawn;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@@ -64,7 +64,7 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
             }
         });
 
-        registerTrackerWithData(ClientboundPackets1_15.SPAWN_ENTITY, Entity1_15Types.FALLING_BLOCK);
+        registerTrackerWithData(ClientboundPackets1_15.SPAWN_ENTITY, EntityTypes1_15.FALLING_BLOCK);
 
         protocol.registerClientbound(ClientboundPackets1_15.SPAWN_MOB, new PacketHandlers() {
             @Override
@@ -85,7 +85,7 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
 
                 handler(wrapper -> {
                     int type = wrapper.get(Type.VAR_INT, 1);
-                    EntityType entityType = Entity1_15Types.getTypeFromId(type);
+                    EntityType entityType = EntityTypes1_15.getTypeFromId(type);
                     tracker(wrapper.user()).addEntity(wrapper.get(Type.VAR_INT, 0), entityType);
                     wrapper.set(Type.VAR_INT, 1, EntityTypeMapping.getOldEntityId(type));
                 });
@@ -96,7 +96,7 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
             @Override
             public void register() {
                 map(Type.INT);
-                map(Type.LONG, Type.NOTHING); // Seed
+                read(Type.LONG); // Seed
             }
         });
 
@@ -107,14 +107,14 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
                 map(Type.UNSIGNED_BYTE); // 1 - Gamemode
                 map(Type.INT); // 2 - Dimension
 
-                map(Type.LONG, Type.NOTHING); // Seed
+                read(Type.LONG); // Seed
 
                 map(Type.UNSIGNED_BYTE); // 3 - Max Players
                 map(Type.STRING); // 4 - Level Type
                 map(Type.VAR_INT); // 5 - View Distance
                 map(Type.BOOLEAN); // 6 - Reduce Debug Info
 
-                handler(getTrackerHandler(Entity1_15Types.PLAYER, Type.INT));
+                handler(getTrackerHandler(EntityTypes1_15.PLAYER, Type.INT));
 
                 handler(wrapper -> {
                     boolean immediateRespawn = !wrapper.read(Type.BOOLEAN); // Inverted
@@ -123,9 +123,9 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
             }
         });
 
-        registerTracker(ClientboundPackets1_15.SPAWN_EXPERIENCE_ORB, Entity1_15Types.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_15.SPAWN_GLOBAL_ENTITY, Entity1_15Types.LIGHTNING_BOLT);
-        registerTracker(ClientboundPackets1_15.SPAWN_PAINTING, Entity1_15Types.PAINTING);
+        registerTracker(ClientboundPackets1_15.SPAWN_EXPERIENCE_ORB, EntityTypes1_15.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_15.SPAWN_GLOBAL_ENTITY, EntityTypes1_15.LIGHTNING_BOLT);
+        registerTracker(ClientboundPackets1_15.SPAWN_PAINTING, EntityTypes1_15.PAINTING);
 
         protocol.registerClientbound(ClientboundPackets1_15.SPAWN_PLAYER, new PacketHandlers() {
             @Override
@@ -139,7 +139,7 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
                 map(Type.BYTE); // 6 - Pitch
                 handler(wrapper -> wrapper.write(Types1_14.METADATA_LIST, new ArrayList<>())); // Metadata is no longer sent in 1.15, so we have to send an empty one
 
-                handler(getTrackerHandler(Entity1_15Types.PLAYER, Type.VAR_INT));
+                handler(getTrackerHandler(EntityTypes1_15.PLAYER, Type.VAR_INT));
             }
         });
 
@@ -155,7 +155,7 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
                 handler(wrapper -> {
                     int entityId = wrapper.get(Type.VAR_INT, 0);
                     EntityType entityType = tracker(wrapper.user()).entityType(entityId);
-                    if (entityType != Entity1_15Types.BEE) return;
+                    if (entityType != EntityTypes1_15.BEE) return;
 
                     int size = wrapper.get(Type.INT, 0);
                     int newSize = size;
@@ -192,31 +192,32 @@ public class EntityPackets1_15 extends EntityRewriter<ClientboundPackets1_15, Pr
 
     @Override
     protected void registerRewrites() {
-        registerMetaTypeHandler(Types1_14.META_TYPES.itemType, Types1_14.META_TYPES.blockStateType, Types1_14.META_TYPES.particleType, null);
+        registerMetaTypeHandler(Types1_14.META_TYPES.itemType, Types1_14.META_TYPES.blockStateType, null, Types1_14.META_TYPES.particleType,
+                Types1_14.META_TYPES.componentType, Types1_14.META_TYPES.optionalComponentType);
 
-        filter().filterFamily(Entity1_15Types.LIVINGENTITY).removeIndex(12);
+        filter().filterFamily(EntityTypes1_15.LIVINGENTITY).removeIndex(12);
 
-        filter().type(Entity1_15Types.BEE).cancel(15);
-        filter().type(Entity1_15Types.BEE).cancel(16);
+        filter().type(EntityTypes1_15.BEE).cancel(15);
+        filter().type(EntityTypes1_15.BEE).cancel(16);
 
-        mapEntityTypeWithData(Entity1_15Types.BEE, Entity1_15Types.PUFFERFISH).jsonName().spawnMetadata(storage -> {
+        mapEntityTypeWithData(EntityTypes1_15.BEE, EntityTypes1_15.PUFFERFISH).jsonName().spawnMetadata(storage -> {
             storage.add(new Metadata(14, Types1_14.META_TYPES.booleanType, false));
             storage.add(new Metadata(15, Types1_14.META_TYPES.varIntType, 2));
         });
 
-        filter().type(Entity1_15Types.ENDERMAN).cancel(16);
-        filter().type(Entity1_15Types.TRIDENT).cancel(10);
+        filter().type(EntityTypes1_15.ENDERMAN).cancel(16);
+        filter().type(EntityTypes1_15.TRIDENT).cancel(10);
 
         // Redundant health removed in 1.15
-        filter().type(Entity1_15Types.WOLF).addIndex(17);
-        filter().type(Entity1_15Types.WOLF).index(8).handler((event, meta) -> {
+        filter().type(EntityTypes1_15.WOLF).addIndex(17);
+        filter().type(EntityTypes1_15.WOLF).index(8).handler((event, meta) -> {
             event.createExtraMeta(new Metadata(17/*WOLF_HEALTH*/, Types1_14.META_TYPES.floatType, event.meta().value()));
         });
     }
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_15Types.getTypeFromId(typeId);
+        return EntityTypes1_15.getTypeFromId(typeId);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java

@@ -20,7 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_14to1_14_1;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.protocol.protocol1_14to1_14_1.packets.EntityPackets1_14_1;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ClientboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
@@ -40,7 +40,7 @@ public class Protocol1_14To1_14_1 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     public void init(UserConnection user) {
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_15Types.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_15.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java

@@ -19,7 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_14to1_14_1.packets;
 
 import com.viaversion.viabackwards.api.rewriters.LegacyEntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_14to1_14_1.Protocol1_14To1_14_1;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_14Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -36,11 +36,11 @@ public class EntityPackets1_14_1 extends LegacyEntityRewriter<ClientboundPackets
 
     @Override
     protected void registerPackets() {
-        registerTracker(ClientboundPackets1_14.SPAWN_EXPERIENCE_ORB, Entity1_14Types.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_14.SPAWN_GLOBAL_ENTITY, Entity1_14Types.LIGHTNING_BOLT);
-        registerTracker(ClientboundPackets1_14.SPAWN_PAINTING, Entity1_14Types.PAINTING);
-        registerTracker(ClientboundPackets1_14.SPAWN_PLAYER, Entity1_14Types.PLAYER);
-        registerTracker(ClientboundPackets1_14.JOIN_GAME, Entity1_14Types.PLAYER, Type.INT);
+        registerTracker(ClientboundPackets1_14.SPAWN_EXPERIENCE_ORB, EntityTypes1_14.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_14.SPAWN_GLOBAL_ENTITY, EntityTypes1_14.LIGHTNING_BOLT);
+        registerTracker(ClientboundPackets1_14.SPAWN_PAINTING, EntityTypes1_14.PAINTING);
+        registerTracker(ClientboundPackets1_14.SPAWN_PLAYER, EntityTypes1_14.PLAYER);
+        registerTracker(ClientboundPackets1_14.JOIN_GAME, EntityTypes1_14.PLAYER, Type.INT);
         registerRemoveEntities(ClientboundPackets1_14.DESTROY_ENTITIES);
 
         protocol.registerClientbound(ClientboundPackets1_14.SPAWN_ENTITY, new PacketHandlers() {
@@ -76,7 +76,7 @@ public class EntityPackets1_14_1 extends LegacyEntityRewriter<ClientboundPackets
                     int type = wrapper.get(Type.VAR_INT, 1);
 
                     // Register Type ID
-                    tracker(wrapper.user()).addEntity(entityId, Entity1_14Types.getTypeFromId(type));
+                    tracker(wrapper.user()).addEntity(entityId, EntityTypes1_14.getTypeFromId(type));
 
                     List<Metadata> metadata = wrapper.get(Types1_14.METADATA_LIST, 0);
                     handleMetadata(entityId, metadata, wrapper.user());
@@ -90,13 +90,13 @@ public class EntityPackets1_14_1 extends LegacyEntityRewriter<ClientboundPackets
 
     @Override
     protected void registerRewrites() {
-        filter().type(Entity1_14Types.VILLAGER).cancel(15);
-        filter().type(Entity1_14Types.VILLAGER).index(16).toIndex(15);
-        filter().type(Entity1_14Types.WANDERING_TRADER).cancel(15);
+        filter().type(EntityTypes1_14.VILLAGER).cancel(15);
+        filter().type(EntityTypes1_14.VILLAGER).index(16).toIndex(15);
+        filter().type(EntityTypes1_14.WANDERING_TRADER).cancel(15);
     }
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_14Types.getTypeFromId(typeId);
+        return EntityTypes1_14.getTypeFromId(typeId);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java

@@ -27,8 +27,9 @@ import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.packets.BlockIt
 import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.packets.EntityPackets1_16;
 import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.storage.PlayerSneakStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -39,7 +40,6 @@ import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPacke
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.GsonUtil;
@@ -62,7 +62,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol<ClientboundPackets1_
 
         translatableRewriter.registerBossBar(ClientboundPackets1_16.BOSSBAR);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_16.COMBAT_EVENT);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_16.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_16.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_16.TAB_LIST);
         translatableRewriter.registerTitle(ClientboundPackets1_16.TITLE);
         translatableRewriter.registerPing();
@@ -84,7 +84,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol<ClientboundPackets1_
             public void register() {
                 handler(wrapper -> translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT)));
                 map(Type.BYTE);
-                map(Type.UUID, Type.NOTHING); // Sender
+                read(Type.UUID); // Sender
             }
         });
 
@@ -165,12 +165,12 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol<ClientboundPackets1_
     @Override
     public void init(UserConnection user) {
         if (!user.has(ClientWorld.class)) {
-            user.put(new ClientWorld(user));
+            user.put(new ClientWorld());
         }
 
         user.put(new PlayerSneakStorage());
         user.put(new WorldNameTracker());
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_16Types.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_16.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java

@@ -1,107 +0,0 @@
-/*
- * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
- * Copyright (C) 2016-2023 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.protocol.protocol1_15_2to1_16.chat;
-
-import com.google.common.base.Preconditions;
-import com.viaversion.viaversion.libs.gson.JsonArray;
-import com.viaversion.viaversion.libs.gson.JsonElement;
-import com.viaversion.viaversion.libs.gson.JsonObject;
-import com.viaversion.viaversion.libs.gson.JsonPrimitive;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * Utility class to serialize a JsonObject with Minecraft's CompoundTag serialization
- */
-@Deprecated
-public class TagSerializer {
-
-    private static final Pattern PLAIN_TEXT = Pattern.compile("[A-Za-z0-9._+-]+");
-
-    public static String toString(JsonObject object) {
-        StringBuilder builder = new StringBuilder("{");
-        for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-            Preconditions.checkArgument(entry.getValue().isJsonPrimitive());
-            if (builder.length() != 1) {
-                builder.append(',');
-            }
-
-            String escapedText = escape(entry.getValue().getAsString());
-            builder.append(entry.getKey()).append(':').append(escapedText);
-        }
-        return builder.append('}').toString();
-    }
-
-    /**
-     * Utility method to convert a CompoundTag to a JsonObject, helpful for debugging.
-     */
-    public static JsonObject toJson(CompoundTag tag) {
-        JsonObject object = new JsonObject();
-        for (Map.Entry<String, Tag> entry : tag.entrySet()) {
-            object.add(entry.getKey(), toJson(entry.getValue()));
-        }
-        return object;
-    }
-
-    private static JsonElement toJson(Tag tag) {
-        if (tag instanceof CompoundTag) {
-            return toJson((CompoundTag) tag);
-        } else if (tag instanceof ListTag) {
-            ListTag list = (ListTag) tag;
-            JsonArray array = new JsonArray();
-            for (Tag listEntry : list) {
-                array.add(toJson(listEntry));
-            }
-            return array;
-        } else {
-            return new JsonPrimitive(tag.getValue().toString());
-        }
-    }
-
-    public static String escape(String s) {
-        if (PLAIN_TEXT.matcher(s).matches()) return s;
-
-        StringBuilder builder = new StringBuilder(" ");
-        char currentQuote = '\0';
-        for (int i = 0; i < s.length(); ++i) {
-            char c = s.charAt(i);
-            if (c == '\\') {
-                builder.append('\\');
-            } else if (c == '\"' || c == '\'') {
-                if (currentQuote == '\0') {
-                    currentQuote = ((c == '\"') ? '\'' : '\"');
-                }
-                if (currentQuote == c) {
-                    builder.append('\\');
-                }
-            }
-            builder.append(c);
-        }
-
-        if (currentQuote == '\0') {
-            currentQuote = '\"';
-        }
-
-        builder.setCharAt(0, currentQuote);
-        builder.append(currentQuote);
-        return builder.toString();
-    }
-}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java

@@ -51,7 +51,7 @@ public class TranslatableRewriter1_16 extends TranslatableRewriter<ClientboundPa
     };
 
     public TranslatableRewriter1_16(Protocol1_15_2To1_16 protocol) {
-        super(protocol);
+        super(protocol, ReadType.JSON);
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java

@@ -33,17 +33,19 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.UUIDIntArrayType;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_15;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16;
+import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_14to1_13_2.ServerboundPackets1_14;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
-import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.types.Chunk1_15Type;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.InventoryPackets;
-import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.CompactArrayUtil;
@@ -63,7 +65,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_16> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        BlockRewriter<ClientboundPackets1_16> blockRewriter = BlockRewriter.for1_14(protocol);
 
         RecipeRewriter<ClientboundPackets1_16> recipeRewriter = new RecipeRewriter<>(protocol);
         // Remove new smithing type, only in this handler
@@ -77,9 +79,9 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
                     newSize--;
 
                     wrapper.read(Type.STRING);
-                    wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT);
-                    wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT);
-                    wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                    wrapper.read(Type.ITEM1_13_2_ARRAY);
+                    wrapper.read(Type.ITEM1_13_2_ARRAY);
+                    wrapper.read(Type.ITEM1_13_2);
                     continue;
                 }
 
@@ -92,10 +94,10 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
         });
 
         registerSetCooldown(ClientboundPackets1_16.COOLDOWN);
-        registerWindowItems(ClientboundPackets1_16.WINDOW_ITEMS, Type.FLAT_VAR_INT_ITEM_ARRAY);
-        registerSetSlot(ClientboundPackets1_16.SET_SLOT, Type.FLAT_VAR_INT_ITEM);
+        registerWindowItems(ClientboundPackets1_16.WINDOW_ITEMS, Type.ITEM1_13_2_SHORT_ARRAY);
+        registerSetSlot(ClientboundPackets1_16.SET_SLOT, Type.ITEM1_13_2);
         registerTradeList(ClientboundPackets1_16.TRADE_LIST);
-        registerAdvancements(ClientboundPackets1_16.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_16.ADVANCEMENTS, Type.ITEM1_13_2);
 
         blockRewriter.registerAcknowledgePlayerDigging(ClientboundPackets1_16.ACKNOWLEDGE_PLAYER_DIGGING);
         blockRewriter.registerBlockAction(ClientboundPackets1_16.BLOCK_ACTION);
@@ -109,7 +111,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
             byte slot;
             do {
                 slot = wrapper.read(Type.BYTE);
-                Item item = handleItemToClient(wrapper.read(Type.FLAT_VAR_INT_ITEM));
+                Item item = handleItemToClient(wrapper.read(Type.ITEM1_13_2));
                 int rawSlot = slot & 0x7F;
                 equipmentData.add(new EquipmentData(rawSlot, item));
             } while ((slot & 0xFFFFFF80) != 0);
@@ -117,7 +119,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
             // Send first data in the current packet
             EquipmentData firstData = equipmentData.get(0);
             wrapper.write(Type.VAR_INT, firstData.slot);
-            wrapper.write(Type.FLAT_VAR_INT_ITEM, firstData.item);
+            wrapper.write(Type.ITEM1_13_2, firstData.item);
 
             // If there are more items, send new packets for them
             for (int i = 1; i < equipmentData.size(); i++) {
@@ -125,7 +127,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
                 EquipmentData data = equipmentData.get(i);
                 equipmentPacket.write(Type.VAR_INT, entityId);
                 equipmentPacket.write(Type.VAR_INT, data.slot);
-                equipmentPacket.write(Type.FLAT_VAR_INT_ITEM, data.item);
+                equipmentPacket.write(Type.ITEM1_13_2, data.item);
                 equipmentPacket.send(Protocol1_15_2To1_16.class);
             }
         });
@@ -135,13 +137,13 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
             public void register() {
                 map(Type.VAR_INT); // x
                 map(Type.VAR_INT); // y
-                map(Type.BOOLEAN, Type.NOTHING);
+                read(Type.BOOLEAN);
             }
         });
 
         protocol.registerClientbound(ClientboundPackets1_16.CHUNK_DATA, wrapper -> {
-            Chunk chunk = wrapper.read(new Chunk1_16Type());
-            wrapper.write(new Chunk1_15Type(), chunk);
+            Chunk chunk = wrapper.read(ChunkType1_16.TYPE);
+            wrapper.write(ChunkType1_15.TYPE, chunk);
 
             for (int i = 0; i < chunk.getSections().length; i++) {
                 ChunkSection section = chunk.getSections()[i];
@@ -199,7 +201,7 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
 
         blockRewriter.registerEffect(ClientboundPackets1_16.EFFECT, 1010, 2001);
 
-        registerSpawnParticle(ClientboundPackets1_16.SPAWN_PARTICLE, Type.FLAT_VAR_INT_ITEM, Type.DOUBLE);
+        registerSpawnParticle(ClientboundPackets1_16.SPAWN_PARTICLE, Type.ITEM1_13_2, Type.DOUBLE);
 
         protocol.registerClientbound(ClientboundPackets1_16.WINDOW_PROPERTY, new PacketHandlers() {
             @Override
@@ -235,14 +237,14 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
         protocol.registerClientbound(ClientboundPackets1_16.BLOCK_ENTITY_DATA, wrapper -> {
             wrapper.passthrough(Type.POSITION1_14); // Position
             wrapper.passthrough(Type.UNSIGNED_BYTE); // Action
-            CompoundTag tag = wrapper.passthrough(Type.NBT);
+            CompoundTag tag = wrapper.passthrough(Type.NAMED_COMPOUND_TAG);
             handleBlockEntity(tag);
         });
 
-        registerClickWindow(ServerboundPackets1_14.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM);
-        registerCreativeInvAction(ServerboundPackets1_14.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerClickWindow(ServerboundPackets1_14.CLICK_WINDOW, Type.ITEM1_13_2);
+        registerCreativeInvAction(ServerboundPackets1_14.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
 
-        protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+        protocol.registerServerbound(ServerboundPackets1_14.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2)));
     }
 
     private void handleBlockEntity(CompoundTag tag) {
@@ -302,6 +304,22 @@ public class BlockItemPackets1_16 extends com.viaversion.viabackwards.api.rewrit
             }
         }
 
+        // Handle hover event changes in book pages
+        if ((item.identifier() == 758 || item.identifier() == 759) && tag != null) {
+            Tag pagesTag = tag.get("pages");
+            if (pagesTag instanceof ListTag) {
+                for (Tag page : ((ListTag) pagesTag)) {
+                    if (!(page instanceof StringTag)) {
+                        continue;
+                    }
+
+                    StringTag pageTag = (StringTag) page;
+                    JsonElement jsonElement = protocol.getTranslatableRewriter().processText(pageTag.getValue());
+                    pageTag.setValue(jsonElement.toString());
+                }
+            }
+        }
+
         InventoryPackets.newToOldAttributes(item);
         enchantmentRewriter.handleToClient(item);
         return item;

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java

@@ -23,9 +23,11 @@ import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.data.WorldNameT
 import com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.storage.WolfDataMaskStorage;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_15Types;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16;
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
@@ -34,13 +36,11 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_14;
 import com.viaversion.viaversion.api.type.types.version.Types1_16;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.protocol1_15to1_14_4.ClientboundPackets1_15;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
-import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.storage.ClientWorld;
 import com.viaversion.viaversion.util.Key;
 
 public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Protocol1_15_2To1_16> {
@@ -80,7 +80,7 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
                 map(Type.INT); // 8 - Data
                 handler(wrapper -> {
                     EntityType entityType = typeFromId(wrapper.get(Type.VAR_INT, 1));
-                    if (entityType == Entity1_16Types.LIGHTNING_BOLT) {
+                    if (entityType == EntityTypes1_16.LIGHTNING_BOLT) {
                         // Map to old weather entity packet
                         wrapper.cancel();
 
@@ -93,7 +93,7 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
                         spawnLightningPacket.send(Protocol1_15_2To1_16.class);
                     }
                 });
-                handler(getSpawnTrackerWithDataHandler(Entity1_16Types.FALLING_BLOCK));
+                handler(getSpawnTrackerWithDataHandler(EntityTypes1_16.FALLING_BLOCK));
             }
         });
 
@@ -149,9 +149,9 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
             public void register() {
                 map(Type.INT); //  Entity ID
                 map(Type.UNSIGNED_BYTE); // Gamemode
-                map(Type.BYTE, Type.NOTHING); // Previous gamemode
-                map(Type.STRING_ARRAY, Type.NOTHING); // World list
-                map(Type.NBT, Type.NOTHING); // whatever this is
+                read(Type.BYTE); // Previous gamemode
+                read(Type.STRING_ARRAY); // World list
+                read(Type.NAMED_COMPOUND_TAG); // whatever this is
                 map(dimensionTransformer); // Dimension Type
                 handler(wrapper -> {
                     WorldNameTracker worldNameTracker = wrapper.user().get(WorldNameTracker.class);
@@ -162,7 +162,7 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
                 handler(wrapper -> {
                     ClientWorld clientChunks = wrapper.user().get(ClientWorld.class);
                     clientChunks.setEnvironment(wrapper.get(Type.INT, 1));
-                    tracker(wrapper.user()).addEntity(wrapper.get(Type.INT, 0), Entity1_16Types.PLAYER);
+                    tracker(wrapper.user()).addEntity(wrapper.get(Type.INT, 0), EntityTypes1_16.PLAYER);
 
                     wrapper.write(Type.STRING, "default"); // Level type
 
@@ -178,10 +178,10 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
             }
         });
 
-        registerTracker(ClientboundPackets1_16.SPAWN_EXPERIENCE_ORB, Entity1_16Types.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_16.SPAWN_EXPERIENCE_ORB, EntityTypes1_16.EXPERIENCE_ORB);
         // F Spawn Global Object, it is no longer with us :(
-        registerTracker(ClientboundPackets1_16.SPAWN_PAINTING, Entity1_16Types.PAINTING);
-        registerTracker(ClientboundPackets1_16.SPAWN_PLAYER, Entity1_16Types.PLAYER);
+        registerTracker(ClientboundPackets1_16.SPAWN_PAINTING, EntityTypes1_16.PAINTING);
+        registerTracker(ClientboundPackets1_16.SPAWN_PLAYER, EntityTypes1_16.PLAYER);
         registerRemoveEntities(ClientboundPackets1_16.DESTROY_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_16.ENTITY_METADATA, Types1_16.METADATA_LIST, Types1_14.METADATA_LIST);
 
@@ -257,45 +257,45 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
             }
         });
 
-        mapEntityType(Entity1_16Types.ZOMBIFIED_PIGLIN, Entity1_15Types.ZOMBIE_PIGMAN);
-        mapTypes(Entity1_16Types.values(), Entity1_15Types.class);
+        mapEntityType(EntityTypes1_16.ZOMBIFIED_PIGLIN, EntityTypes1_15.ZOMBIE_PIGMAN);
+        mapTypes(EntityTypes1_16.values(), EntityTypes1_15.class);
 
-        mapEntityTypeWithData(Entity1_16Types.HOGLIN, Entity1_16Types.COW).jsonName();
-        mapEntityTypeWithData(Entity1_16Types.ZOGLIN, Entity1_16Types.COW).jsonName();
-        mapEntityTypeWithData(Entity1_16Types.PIGLIN, Entity1_16Types.ZOMBIFIED_PIGLIN).jsonName();
-        mapEntityTypeWithData(Entity1_16Types.STRIDER, Entity1_16Types.MAGMA_CUBE).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.HOGLIN, EntityTypes1_16.COW).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.ZOGLIN, EntityTypes1_16.COW).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.PIGLIN, EntityTypes1_16.ZOMBIFIED_PIGLIN).jsonName();
+        mapEntityTypeWithData(EntityTypes1_16.STRIDER, EntityTypes1_16.MAGMA_CUBE).jsonName();
 
-        filter().type(Entity1_16Types.ZOGLIN).cancel(16);
-        filter().type(Entity1_16Types.HOGLIN).cancel(15);
+        filter().type(EntityTypes1_16.ZOGLIN).cancel(16);
+        filter().type(EntityTypes1_16.HOGLIN).cancel(15);
 
-        filter().type(Entity1_16Types.PIGLIN).cancel(16);
-        filter().type(Entity1_16Types.PIGLIN).cancel(17);
-        filter().type(Entity1_16Types.PIGLIN).cancel(18);
+        filter().type(EntityTypes1_16.PIGLIN).cancel(16);
+        filter().type(EntityTypes1_16.PIGLIN).cancel(17);
+        filter().type(EntityTypes1_16.PIGLIN).cancel(18);
 
-        filter().type(Entity1_16Types.STRIDER).index(15).handler((event, meta) -> {
+        filter().type(EntityTypes1_16.STRIDER).index(15).handler((event, meta) -> {
             boolean baby = meta.value();
             meta.setTypeAndValue(Types1_14.META_TYPES.varIntType, baby ? 1 : 3);
         });
-        filter().type(Entity1_16Types.STRIDER).cancel(16);
-        filter().type(Entity1_16Types.STRIDER).cancel(17);
-        filter().type(Entity1_16Types.STRIDER).cancel(18);
+        filter().type(EntityTypes1_16.STRIDER).cancel(16);
+        filter().type(EntityTypes1_16.STRIDER).cancel(17);
+        filter().type(EntityTypes1_16.STRIDER).cancel(18);
 
-        filter().type(Entity1_16Types.FISHING_BOBBER).cancel(8);
+        filter().type(EntityTypes1_16.FISHING_BOBBER).cancel(8);
 
-        filter().filterFamily(Entity1_16Types.ABSTRACT_ARROW).cancel(8);
-        filter().filterFamily(Entity1_16Types.ABSTRACT_ARROW).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_16.ABSTRACT_ARROW).cancel(8);
+        filter().filterFamily(EntityTypes1_16.ABSTRACT_ARROW).handler((event, meta) -> {
             if (event.index() >= 8) {
                 event.setIndex(event.index() + 1);
             }
         });
 
-        filter().type(Entity1_16Types.WOLF).index(16).handler((event, meta) -> {
+        filter().type(EntityTypes1_16.WOLF).index(16).handler((event, meta) -> {
             byte mask = meta.value();
             StoredEntityData data = tracker(event.user()).entityData(event.entityId());
             data.put(new WolfDataMaskStorage(mask));
         });
 
-        filter().type(Entity1_16Types.WOLF).index(20).handler((event, meta) -> {
+        filter().type(EntityTypes1_16.WOLF).index(20).handler((event, meta) -> {
             StoredEntityData data = tracker(event.user()).entityDataIfPresent(event.entityId());
             byte previousMask = 0;
             if (data != null) {
@@ -314,6 +314,6 @@ public class EntityPackets1_16 extends EntityRewriter<ClientboundPackets1_16, Pr
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_16Types.getTypeFromId(typeId);
+        return EntityTypes1_16.getTypeFromId(typeId);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java

@@ -27,7 +27,7 @@ import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.packets.Entit
 import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.storage.BiomeStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -37,6 +37,7 @@ import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.Protocol1_16_2
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ClientboundPackets1_16;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 
@@ -45,7 +46,7 @@ public class Protocol1_16_1To1_16_2 extends BackwardsProtocol<ClientboundPackets
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.16.2", "1.16", Protocol1_16_2To1_16_1.class);
     private final EntityPackets1_16_2 entityRewriter = new EntityPackets1_16_2(this);
     private final BlockItemPackets1_16_2 blockItemPackets = new BlockItemPackets1_16_2(this);
-    private final TranslatableRewriter<ClientboundPackets1_16_2> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_16_2> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_16_1To1_16_2() {
         super(ClientboundPackets1_16_2.class, ClientboundPackets1_16.class, ServerboundPackets1_16_2.class, ServerboundPackets1_16.class);
@@ -57,7 +58,7 @@ public class Protocol1_16_1To1_16_2 extends BackwardsProtocol<ClientboundPackets
 
         translatableRewriter.registerBossBar(ClientboundPackets1_16_2.BOSSBAR);
         translatableRewriter.registerCombatEvent(ClientboundPackets1_16_2.COMBAT_EVENT);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_16_2.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_16_2.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_16_2.TAB_LIST);
         translatableRewriter.registerTitle(ClientboundPackets1_16_2.TITLE);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_16_2.OPEN_WINDOW);
@@ -119,7 +120,7 @@ public class Protocol1_16_1To1_16_2 extends BackwardsProtocol<ClientboundPackets
     @Override
     public void init(UserConnection user) {
         user.put(new BiomeStorage());
-        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_16_2Types.PLAYER));
+        user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, EntityTypes1_16_2.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java

@@ -26,15 +26,15 @@ import com.viaversion.viaversion.api.minecraft.chunks.DataPalette;
 import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16_2;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
-import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.ServerboundPackets1_16;
-import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.types.Chunk1_16Type;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 
@@ -46,16 +46,16 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_16_2> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        BlockRewriter<ClientboundPackets1_16_2> blockRewriter = BlockRewriter.for1_14(protocol);
 
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_16_2.DECLARE_RECIPES);
 
         registerSetCooldown(ClientboundPackets1_16_2.COOLDOWN);
-        registerWindowItems(ClientboundPackets1_16_2.WINDOW_ITEMS, Type.FLAT_VAR_INT_ITEM_ARRAY);
-        registerSetSlot(ClientboundPackets1_16_2.SET_SLOT, Type.FLAT_VAR_INT_ITEM);
+        registerWindowItems(ClientboundPackets1_16_2.WINDOW_ITEMS, Type.ITEM1_13_2_SHORT_ARRAY);
+        registerSetSlot(ClientboundPackets1_16_2.SET_SLOT, Type.ITEM1_13_2);
         registerEntityEquipmentArray(ClientboundPackets1_16_2.ENTITY_EQUIPMENT);
         registerTradeList(ClientboundPackets1_16_2.TRADE_LIST);
-        registerAdvancements(ClientboundPackets1_16_2.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_16_2.ADVANCEMENTS, Type.ITEM1_13_2);
 
         protocol.registerClientbound(ClientboundPackets1_16_2.UNLOCK_RECIPES, wrapper -> {
             wrapper.passthrough(Type.VAR_INT);
@@ -75,8 +75,8 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr
         blockRewriter.registerBlockChange(ClientboundPackets1_16_2.BLOCK_CHANGE);
 
         protocol.registerClientbound(ClientboundPackets1_16_2.CHUNK_DATA, wrapper -> {
-            Chunk chunk = wrapper.read(new Chunk1_16_2Type());
-            wrapper.write(new Chunk1_16Type(), chunk);
+            Chunk chunk = wrapper.read(ChunkType1_16_2.TYPE);
+            wrapper.write(ChunkType1_16.TYPE, chunk);
 
             chunk.setIgnoreOldLightData(true);
             for (int i = 0; i < chunk.getSections().length; i++) {
@@ -105,7 +105,7 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr
                 map(Type.POSITION1_14);
                 map(Type.UNSIGNED_BYTE);
                 handler(wrapper -> {
-                    handleBlockEntity(wrapper.passthrough(Type.NBT));
+                    handleBlockEntity(wrapper.passthrough(Type.NAMED_COMPOUND_TAG));
                 });
             }
         });
@@ -132,11 +132,11 @@ public class BlockItemPackets1_16_2 extends com.viaversion.viabackwards.api.rewr
 
         blockRewriter.registerEffect(ClientboundPackets1_16_2.EFFECT, 1010, 2001);
 
-        registerSpawnParticle(ClientboundPackets1_16_2.SPAWN_PARTICLE, Type.FLAT_VAR_INT_ITEM, Type.DOUBLE);
+        registerSpawnParticle(ClientboundPackets1_16_2.SPAWN_PARTICLE, Type.ITEM1_13_2, Type.DOUBLE);
 
-        registerClickWindow(ServerboundPackets1_16.CLICK_WINDOW, Type.FLAT_VAR_INT_ITEM);
-        registerCreativeInvAction(ServerboundPackets1_16.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
-        protocol.registerServerbound(ServerboundPackets1_16.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+        registerClickWindow(ServerboundPackets1_16.CLICK_WINDOW, Type.ITEM1_13_2);
+        registerCreativeInvAction(ServerboundPackets1_16.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
+        protocol.registerServerbound(ServerboundPackets1_16.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2)));
     }
 
     private void handleBlockEntity(CompoundTag tag) {

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java

@@ -22,20 +22,17 @@ import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.Protocol1_16_1To1_16_2;
 import com.viaversion.viabackwards.protocol.protocol1_16_1to1_16_2.storage.BiomeStorage;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_16;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16to1_15_2.packets.EntityPackets;
+
 import java.util.Set;
 
 public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2, Protocol1_16_1To1_16_2> {
@@ -49,11 +46,11 @@ public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2
 
     @Override
     protected void registerPackets() {
-        registerTrackerWithData(ClientboundPackets1_16_2.SPAWN_ENTITY, Entity1_16_2Types.FALLING_BLOCK);
+        registerTrackerWithData(ClientboundPackets1_16_2.SPAWN_ENTITY, EntityTypes1_16_2.FALLING_BLOCK);
         registerSpawnTracker(ClientboundPackets1_16_2.SPAWN_MOB);
-        registerTracker(ClientboundPackets1_16_2.SPAWN_EXPERIENCE_ORB, Entity1_16_2Types.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_16_2.SPAWN_PAINTING, Entity1_16_2Types.PAINTING);
-        registerTracker(ClientboundPackets1_16_2.SPAWN_PLAYER, Entity1_16_2Types.PLAYER);
+        registerTracker(ClientboundPackets1_16_2.SPAWN_EXPERIENCE_ORB, EntityTypes1_16_2.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_16_2.SPAWN_PAINTING, EntityTypes1_16_2.PAINTING);
+        registerTracker(ClientboundPackets1_16_2.SPAWN_PLAYER, EntityTypes1_16_2.PLAYER);
         registerRemoveEntities(ClientboundPackets1_16_2.DESTROY_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_16_2.ENTITY_METADATA, Types1_16.METADATA_LIST);
 
@@ -63,7 +60,7 @@ public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2
                 map(Type.INT); // Entity ID
                 handler(wrapper -> {
                     boolean hardcore = wrapper.read(Type.BOOLEAN);
-                    short gamemode = wrapper.read(Type.UNSIGNED_BYTE);
+                    short gamemode = wrapper.read(Type.BYTE);
                     if (hardcore) {
                         gamemode |= 0x08;
                     }
@@ -72,7 +69,7 @@ public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // World List
                 handler(wrapper -> {
-                    CompoundTag registry = wrapper.read(Type.NBT);
+                    CompoundTag registry = wrapper.read(Type.NAMED_COMPOUND_TAG);
                     if (wrapper.user().getProtocolInfo().getProtocolVersion() <= ProtocolVersion.v1_15_2.getVersion()) {
                         // Store biomes for <1.16 client handling
                         CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
@@ -91,24 +88,24 @@ public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2
                     }
 
                     // Just screw the registry and write the defaults for 1.16 and 1.16.1 clients
-                    wrapper.write(Type.NBT, EntityPackets.DIMENSIONS_TAG);
+                    wrapper.write(Type.NAMED_COMPOUND_TAG, EntityPackets.DIMENSIONS_TAG);
 
-                    CompoundTag dimensionData = wrapper.read(Type.NBT);
+                    CompoundTag dimensionData = wrapper.read(Type.NAMED_COMPOUND_TAG);
                     wrapper.write(Type.STRING, getDimensionFromData(dimensionData));
                 });
                 map(Type.STRING); // Dimension
                 map(Type.LONG); // Seed
                 handler(wrapper -> {
                     int maxPlayers = wrapper.read(Type.VAR_INT);
-                    wrapper.write(Type.UNSIGNED_BYTE, (short) Math.max(maxPlayers, 255));
+                    wrapper.write(Type.UNSIGNED_BYTE, (short) Math.min(maxPlayers, 255));
                 });
                 // ...
-                handler(getTrackerHandler(Entity1_16_2Types.PLAYER, Type.INT));
+                handler(getTrackerHandler(EntityTypes1_16_2.PLAYER, Type.INT));
             }
         });
 
         protocol.registerClientbound(ClientboundPackets1_16_2.RESPAWN, wrapper -> {
-            CompoundTag dimensionData = wrapper.read(Type.NBT);
+            CompoundTag dimensionData = wrapper.read(Type.NAMED_COMPOUND_TAG);
             wrapper.write(Type.STRING, getDimensionFromData(dimensionData));
         });
     }
@@ -122,18 +119,18 @@ public class EntityPackets1_16_2 extends EntityRewriter<ClientboundPackets1_16_2
 
     @Override
     protected void registerRewrites() {
-        registerMetaTypeHandler(Types1_16.META_TYPES.itemType, Types1_16.META_TYPES.blockStateType,
-                Types1_16.META_TYPES.particleType, Types1_16.META_TYPES.optionalComponentType);
+        registerMetaTypeHandler(Types1_16.META_TYPES.itemType, Types1_16.META_TYPES.blockStateType, null,
+                Types1_16.META_TYPES.particleType, Types1_16.META_TYPES.componentType, Types1_16.META_TYPES.optionalComponentType);
 
-        mapTypes(Entity1_16_2Types.values(), Entity1_16Types.class);
-        mapEntityTypeWithData(Entity1_16_2Types.PIGLIN_BRUTE, Entity1_16_2Types.PIGLIN).jsonName();
+        mapTypes(EntityTypes1_16_2.values(), EntityTypes1_16.class);
+        mapEntityTypeWithData(EntityTypes1_16_2.PIGLIN_BRUTE, EntityTypes1_16_2.PIGLIN).jsonName();
 
-        filter().filterFamily(Entity1_16_2Types.ABSTRACT_PIGLIN).index(15).toIndex(16);
-        filter().filterFamily(Entity1_16_2Types.ABSTRACT_PIGLIN).index(16).toIndex(15);
+        filter().filterFamily(EntityTypes1_16_2.ABSTRACT_PIGLIN).index(15).toIndex(16);
+        filter().filterFamily(EntityTypes1_16_2.ABSTRACT_PIGLIN).index(16).toIndex(15);
     }
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_16_2Types.getTypeFromId(typeId);
+        return EntityTypes1_16_2.getTypeFromId(typeId);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java

@@ -36,7 +36,7 @@ public class Protocol1_16_3To1_16_4 extends BackwardsProtocol<ClientboundPackets
         registerServerbound(ServerboundPackets1_16_2.EDIT_BOOK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.FLAT_VAR_INT_ITEM);
+                map(Type.ITEM1_13_2);
                 map(Type.BOOLEAN);
                 handler(wrapper -> {
                     int slot = wrapper.read(Type.VAR_INT);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java

@@ -29,7 +29,7 @@ import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.storage.PlayerL
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.TagData;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -41,6 +41,7 @@ import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPac
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.IdRewriteFunction;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
@@ -53,10 +54,11 @@ import java.util.Map;
 public final class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPackets1_17, ClientboundPackets1_16_2, ServerboundPackets1_17, ServerboundPackets1_16_2> {
 
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.17", "1.16.2", Protocol1_17To1_16_4.class);
+    private static final RegistryType[] TAG_REGISTRY_TYPES = {RegistryType.BLOCK, RegistryType.ITEM, RegistryType.FLUID, RegistryType.ENTITY};
     private static final int[] EMPTY_ARRAY = {};
     private final EntityPackets1_17 entityRewriter = new EntityPackets1_17(this);
     private final BlockItemPackets1_17 blockItemPackets = new BlockItemPackets1_17(this);
-    private final TranslatableRewriter<ClientboundPackets1_17> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_17> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_16_4To1_17() {
         super(ClientboundPackets1_17.class, ClientboundPackets1_16_2.class, ServerboundPackets1_17.class, ServerboundPackets1_16_2.class);
@@ -68,7 +70,7 @@ public final class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPac
 
         translatableRewriter.registerComponentPacket(ClientboundPackets1_17.CHAT_MESSAGE);
         translatableRewriter.registerBossBar(ClientboundPackets1_17.BOSSBAR);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_17.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_17.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_17.TAB_LIST);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_17.OPEN_WINDOW);
         translatableRewriter.registerPing();
@@ -98,8 +100,14 @@ public final class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPac
             }
 
             // Put them into the hardcoded order of Vanilla tags (and only those), rewrite ids
-            for (RegistryType type : RegistryType.getValues()) {
+            for (RegistryType type : TAG_REGISTRY_TYPES) {
                 List<TagData> tagList = tags.get(type.resourceLocation());
+                if (tagList == null) {
+                    // Higher versions may not send the otherwise expected tags
+                    wrapper.write(Type.VAR_INT, 0);
+                    continue;
+                }
+
                 IdRewriteFunction rewriter = tagRewriter.getRewriter(type);
 
                 wrapper.write(Type.VAR_INT, tagList.size());
@@ -120,11 +128,6 @@ public final class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPac
                     wrapper.write(Type.STRING, tagData.identifier());
                     wrapper.write(Type.VAR_INT_ARRAY_PRIMITIVE, entries);
                 }
-
-                // Stop after the entity types
-                if (type == RegistryType.ENTITY) {
-                    break;
-                }
             }
         });
 
@@ -217,7 +220,7 @@ public final class Protocol1_16_4To1_17 extends BackwardsProtocol<ClientboundPac
 
     @Override
     public void init(UserConnection user) {
-        addEntityTracker(user, new EntityTrackerBase(user, Entity1_17Types.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_17.PLAYER));
         user.put(new PingRequests());
         user.put(new PlayerLastCursorItem());
     }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java

@@ -34,16 +34,16 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_16_2;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.LongArrayTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2;
-import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.types.Chunk1_16_2Type;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
-import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.CompactArrayUtil;
@@ -61,23 +61,23 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
 
     @Override
     protected void registerPackets() {
-        BlockRewriter<ClientboundPackets1_17> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        BlockRewriter<ClientboundPackets1_17> blockRewriter = BlockRewriter.for1_14(protocol);
 
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_17.DECLARE_RECIPES);
 
         registerSetCooldown(ClientboundPackets1_17.COOLDOWN);
-        registerWindowItems(ClientboundPackets1_17.WINDOW_ITEMS, Type.FLAT_VAR_INT_ITEM_ARRAY);
+        registerWindowItems(ClientboundPackets1_17.WINDOW_ITEMS, Type.ITEM1_13_2_SHORT_ARRAY);
         registerEntityEquipmentArray(ClientboundPackets1_17.ENTITY_EQUIPMENT);
         registerTradeList(ClientboundPackets1_17.TRADE_LIST);
-        registerAdvancements(ClientboundPackets1_17.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_17.ADVANCEMENTS, Type.ITEM1_13_2);
 
         blockRewriter.registerAcknowledgePlayerDigging(ClientboundPackets1_17.ACKNOWLEDGE_PLAYER_DIGGING);
         blockRewriter.registerBlockAction(ClientboundPackets1_17.BLOCK_ACTION);
         blockRewriter.registerEffect(ClientboundPackets1_17.EFFECT, 1010, 2001);
 
 
-        registerCreativeInvAction(ServerboundPackets1_16_2.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
-        protocol.registerServerbound(ServerboundPackets1_16_2.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)));
+        registerCreativeInvAction(ServerboundPackets1_16_2.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
+        protocol.registerServerbound(ServerboundPackets1_16_2.EDIT_BOOK, wrapper -> handleItemToServer(wrapper.passthrough(Type.ITEM1_13_2)));
 
         // TODO Since the carried and modified items are typically set incorrectly, the server sends unnecessary
         // set slot packets after practically every window click, since it thinks the client and server
@@ -95,7 +95,7 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
                     byte button = wrapper.passthrough(Type.BYTE); // Button
                     wrapper.read(Type.SHORT); // Action id - removed
                     int mode = wrapper.passthrough(Type.VAR_INT); // Mode
-                    Item clicked = handleItemToServer(wrapper.read(Type.FLAT_VAR_INT_ITEM)); // Clicked item
+                    Item clicked = handleItemToServer(wrapper.read(Type.ITEM1_13_2)); // Clicked item
 
                     // The 1.17 client would check the entire inventory for changes before -> after a click and send the changed slots here
                     wrapper.write(Type.VAR_INT, 0); // Empty array of slot+item
@@ -128,9 +128,9 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
                     Item carried = state.getLastCursorItem();
                     if (carried == null) {
                         // Expected is the carried item after clicking, old clients send the clicked one (*mostly* being the same)
-                        wrapper.write(Type.FLAT_VAR_INT_ITEM, clicked);
+                        wrapper.write(Type.ITEM1_13_2, clicked);
                     } else {
-                        wrapper.write(Type.FLAT_VAR_INT_ITEM, carried);
+                        wrapper.write(Type.ITEM1_13_2, carried);
                     }
                 });
             }
@@ -140,7 +140,7 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
             short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE);
             short slot = wrapper.passthrough(Type.SHORT);
 
-            Item carried = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+            Item carried = wrapper.read(Type.ITEM1_13_2);
             if (carried != null && windowId == -1 && slot == -1) {
                 // This is related to the hack to fix click and drag ghost items above.
                 // After a completed drag, we have no idea how many items remain on the cursor,
@@ -152,7 +152,7 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
                 wrapper.user().get(PlayerLastCursorItem.class).setLastCursorItem(carried);
             }
 
-            wrapper.write(Type.FLAT_VAR_INT_ITEM, handleItemToClient(carried));
+            wrapper.write(Type.ITEM1_13_2, handleItemToClient(carried));
         });
 
         protocol.registerServerbound(ServerboundPackets1_16_2.WINDOW_CONFIRMATION, null, wrapper -> {
@@ -203,7 +203,7 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
                         wrapper.cancel();
                     }
                 });
-                handler(getSpawnParticleHandler(Type.FLAT_VAR_INT_ITEM));
+                handler(getSpawnParticleHandler());
             }
         });
 
@@ -324,8 +324,8 @@ public final class BlockItemPackets1_17 extends ItemRewriter<ClientboundPackets1
             EntityTracker tracker = wrapper.user().getEntityTracker(Protocol1_16_4To1_17.class);
             int currentWorldSectionHeight = tracker.currentWorldSectionHeight();
 
-            Chunk chunk = wrapper.read(new Chunk1_17Type(currentWorldSectionHeight));
-            wrapper.write(new Chunk1_16_2Type(), chunk);
+            Chunk chunk = wrapper.read(new ChunkType1_17(currentWorldSectionHeight));
+            wrapper.write(ChunkType1_16_2.TYPE, chunk);
 
             // Cut sections
             int startFromSection = Math.max(0, -(tracker.currentMinY() >> 4));

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java

@@ -20,20 +20,16 @@ package com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.packets;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_16_4to1_17.Protocol1_16_4To1_17;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_16_2Types;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16_2;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_16;
 import com.viaversion.viaversion.api.type.types.version.Types1_17;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ClientboundPackets1_17;
 
@@ -47,11 +43,11 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        registerTrackerWithData(ClientboundPackets1_17.SPAWN_ENTITY, Entity1_17Types.FALLING_BLOCK);
+        registerTrackerWithData(ClientboundPackets1_17.SPAWN_ENTITY, EntityTypes1_17.FALLING_BLOCK);
         registerSpawnTracker(ClientboundPackets1_17.SPAWN_MOB);
-        registerTracker(ClientboundPackets1_17.SPAWN_EXPERIENCE_ORB, Entity1_17Types.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_17.SPAWN_PAINTING, Entity1_17Types.PAINTING);
-        registerTracker(ClientboundPackets1_17.SPAWN_PLAYER, Entity1_17Types.PLAYER);
+        registerTracker(ClientboundPackets1_17.SPAWN_EXPERIENCE_ORB, EntityTypes1_17.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_17.SPAWN_PAINTING, EntityTypes1_17.PAINTING);
+        registerTracker(ClientboundPackets1_17.SPAWN_PLAYER, EntityTypes1_17.PLAYER);
         registerMetadataRewriter(ClientboundPackets1_17.ENTITY_METADATA, Types1_17.METADATA_LIST, Types1_16.METADATA_LIST);
 
         protocol.registerClientbound(ClientboundPackets1_17.REMOVE_ENTITY, ClientboundPackets1_16_2.DESTROY_ENTITIES, wrapper -> {
@@ -68,22 +64,22 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
             public void register() {
                 map(Type.INT); // Entity ID
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // Worlds
-                map(Type.NBT); // Dimension registry
-                map(Type.NBT); // Current dimension data
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
+                map(Type.NAMED_COMPOUND_TAG); // Current dimension data
                 map(Type.STRING); // World
                 handler(wrapper -> {
-                    byte previousGamemode = wrapper.get(Type.BYTE, 0);
+                    byte previousGamemode = wrapper.get(Type.BYTE, 1);
                     if (previousGamemode == -1) { // "Unset" gamemode removed
-                        wrapper.set(Type.BYTE, 0, (byte) 0);
+                        wrapper.set(Type.BYTE, 1, (byte) 0);
                     }
                 });
-                handler(getTrackerHandler(Entity1_17Types.PLAYER, Type.INT));
+                handler(getTrackerHandler(EntityTypes1_17.PLAYER, Type.INT));
                 handler(worldDataTrackerHandler(1));
                 handler(wrapper -> {
-                    CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
                     ListTag biomes = biomeRegistry.get("value");
                     for (Tag biome : biomes) {
@@ -101,7 +97,7 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
                         reduceExtendedHeight(dimensionCompound, false);
                     }
 
-                    reduceExtendedHeight(wrapper.get(Type.NBT, 1), true);
+                    reduceExtendedHeight(wrapper.get(Type.NAMED_COMPOUND_TAG, 1), true);
                 });
             }
         });
@@ -109,10 +105,10 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
         protocol.registerClientbound(ClientboundPackets1_17.RESPAWN, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.NBT); // Dimension data
+                map(Type.NAMED_COMPOUND_TAG); // Dimension data
                 map(Type.STRING); // World
                 handler(worldDataTrackerHandler(0));
-                handler(wrapper -> reduceExtendedHeight(wrapper.get(Type.NBT, 0), true));
+                handler(wrapper -> reduceExtendedHeight(wrapper.get(Type.NAMED_COMPOUND_TAG, 0), true));
             }
         });
 
@@ -180,31 +176,32 @@ public final class EntityPackets1_17 extends EntityRewriter<ClientboundPackets1_
         });
 
         // Particles have already been handled
-        registerMetaTypeHandler(Types1_16.META_TYPES.itemType, Types1_16.META_TYPES.blockStateType, null, Types1_16.META_TYPES.optionalComponentType);
+        registerMetaTypeHandler(Types1_16.META_TYPES.itemType, Types1_16.META_TYPES.blockStateType, null, null,
+                Types1_16.META_TYPES.componentType, Types1_16.META_TYPES.optionalComponentType);
 
-        mapTypes(Entity1_17Types.values(), Entity1_16_2Types.class);
-        filter().type(Entity1_17Types.AXOLOTL).cancel(17);
-        filter().type(Entity1_17Types.AXOLOTL).cancel(18);
-        filter().type(Entity1_17Types.AXOLOTL).cancel(19);
+        mapTypes(EntityTypes1_17.values(), EntityTypes1_16_2.class);
+        filter().type(EntityTypes1_17.AXOLOTL).cancel(17);
+        filter().type(EntityTypes1_17.AXOLOTL).cancel(18);
+        filter().type(EntityTypes1_17.AXOLOTL).cancel(19);
 
-        filter().type(Entity1_17Types.GLOW_SQUID).cancel(16);
+        filter().type(EntityTypes1_17.GLOW_SQUID).cancel(16);
 
-        filter().type(Entity1_17Types.GOAT).cancel(17);
+        filter().type(EntityTypes1_17.GOAT).cancel(17);
 
-        mapEntityTypeWithData(Entity1_17Types.AXOLOTL, Entity1_17Types.TROPICAL_FISH).jsonName();
-        mapEntityTypeWithData(Entity1_17Types.GOAT, Entity1_17Types.SHEEP).jsonName();
+        mapEntityTypeWithData(EntityTypes1_17.AXOLOTL, EntityTypes1_17.TROPICAL_FISH).jsonName();
+        mapEntityTypeWithData(EntityTypes1_17.GOAT, EntityTypes1_17.SHEEP).jsonName();
 
-        mapEntityTypeWithData(Entity1_17Types.GLOW_SQUID, Entity1_17Types.SQUID).jsonName();
-        mapEntityTypeWithData(Entity1_17Types.GLOW_ITEM_FRAME, Entity1_17Types.ITEM_FRAME);
+        mapEntityTypeWithData(EntityTypes1_17.GLOW_SQUID, EntityTypes1_17.SQUID).jsonName();
+        mapEntityTypeWithData(EntityTypes1_17.GLOW_ITEM_FRAME, EntityTypes1_17.ITEM_FRAME);
 
-        filter().type(Entity1_17Types.SHULKER).addIndex(17); // TODO Handle attachment pos?
+        filter().type(EntityTypes1_17.SHULKER).addIndex(17); // TODO Handle attachment pos?
 
         filter().removeIndex(7); // Ticks frozen
     }
 
     @Override
     public EntityType typeFromId(int typeId) {
-        return Entity1_17Types.getTypeFromId(typeId);
+        return EntityTypes1_17.getTypeFromId(typeId);
     }
 
     private void reduceExtendedHeight(CompoundTag tag, boolean warn) {

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/Protocol1_17_1To1_18.java

@@ -25,7 +25,7 @@ import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.packets.BlockIt
 import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.packets.EntityPackets1_18;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -33,6 +33,7 @@ import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 
 public final class Protocol1_17_1To1_18 extends BackwardsProtocol<ClientboundPackets1_18, ClientboundPackets1_17_1, ServerboundPackets1_17, ServerboundPackets1_17> {
@@ -40,7 +41,7 @@ public final class Protocol1_17_1To1_18 extends BackwardsProtocol<ClientboundPac
     private static final BackwardsMappings MAPPINGS = new BackwardsMappings();
     private final EntityPackets1_18 entityRewriter = new EntityPackets1_18(this);
     private final BlockItemPackets1_18 itemRewriter = new BlockItemPackets1_18(this);
-    private final TranslatableRewriter<ClientboundPackets1_18> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_18> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_17_1To1_18() {
         super(ClientboundPackets1_18.class, ClientboundPackets1_17_1.class, ServerboundPackets1_17.class, ServerboundPackets1_17.class);
@@ -55,7 +56,7 @@ public final class Protocol1_17_1To1_18 extends BackwardsProtocol<ClientboundPac
         translatableRewriter.registerComponentPacket(ClientboundPackets1_18.TITLE_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_18.TITLE_SUBTITLE);
         translatableRewriter.registerBossBar(ClientboundPackets1_18.BOSSBAR);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_18.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_18.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_18.TAB_LIST);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_18.OPEN_WINDOW);
         translatableRewriter.registerCombatKill(ClientboundPackets1_18.COMBAT_KILL);
@@ -131,7 +132,7 @@ public final class Protocol1_17_1To1_18 extends BackwardsProtocol<ClientboundPac
 
     @Override
     public void init(final UserConnection connection) {
-        addEntityTracker(connection, new EntityTrackerBase(connection, Entity1_17Types.PLAYER));
+        addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_17.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/BlockItemPackets1_18.java

@@ -32,14 +32,14 @@ import com.viaversion.viaversion.api.minecraft.chunks.PaletteType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_17;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.IntTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
 import com.viaversion.viaversion.protocols.protocol1_17_1to1_17.ClientboundPackets1_17_1;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
-import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.types.Chunk1_17Type;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
-import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types.Chunk1_18Type;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.MathUtil;
@@ -62,7 +62,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<ClientboundPackets1
         registerSetSlot1_17_1(ClientboundPackets1_18.SET_SLOT);
         registerEntityEquipmentArray(ClientboundPackets1_18.ENTITY_EQUIPMENT);
         registerTradeList(ClientboundPackets1_18.TRADE_LIST);
-        registerAdvancements(ClientboundPackets1_18.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_18.ADVANCEMENTS, Type.ITEM1_13_2);
         registerClickWindow1_17_1(ServerboundPackets1_17.CLICK_WINDOW);
 
         protocol.registerClientbound(ClientboundPackets1_18.EFFECT, new PacketHandlers() {
@@ -81,7 +81,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<ClientboundPackets1
             }
         });
 
-        registerCreativeInvAction(ServerboundPackets1_17.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerCreativeInvAction(ServerboundPackets1_17.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
 
         protocol.registerClientbound(ClientboundPackets1_18.SPAWN_PARTICLE, new PacketHandlers() {
             @Override
@@ -114,7 +114,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<ClientboundPackets1
                         int data = wrapper.passthrough(Type.VAR_INT);
                         wrapper.set(Type.VAR_INT, 0, protocol.getMappingData().getNewBlockStateId(data));
                     } else if (mappings.isItemParticle(id)) {
-                        handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM));
+                        handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2));
                     }
 
                     int newId = protocol.getMappingData().getNewParticleId(id);
@@ -131,7 +131,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<ClientboundPackets1
                 map(Type.POSITION1_14);
                 handler(wrapper -> {
                     final int id = wrapper.read(Type.VAR_INT);
-                    final CompoundTag tag = wrapper.read(Type.NBT);
+                    final CompoundTag tag = wrapper.read(Type.NAMED_COMPOUND_TAG);
 
                     final int mappedId = BlockEntityIds.mappedId(id);
                     if (mappedId == -1) {
@@ -162,14 +162,14 @@ public final class BlockItemPackets1_18 extends ItemRewriter<ClientboundPackets1
 
                     handleSpawner(id, newTag);
                     wrapper.write(Type.UNSIGNED_BYTE, (short) mappedId);
-                    wrapper.write(Type.NBT, newTag);
+                    wrapper.write(Type.NAMED_COMPOUND_TAG, newTag);
                 });
             }
         });
 
         protocol.registerClientbound(ClientboundPackets1_18.CHUNK_DATA, wrapper -> {
             final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
-            final Chunk1_18Type chunkType = new Chunk1_18Type(tracker.currentWorldSectionHeight(),
+            final ChunkType1_18 chunkType = new ChunkType1_18(tracker.currentWorldSectionHeight(),
                     MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().mappedSize()),
                     MathUtil.ceilLog2(tracker.biomesSent()));
             final Chunk oldChunk = wrapper.read(chunkType);
@@ -218,7 +218,7 @@ public final class BlockItemPackets1_18 extends ItemRewriter<ClientboundPackets1
 
             final Chunk chunk = new BaseChunk(oldChunk.getX(), oldChunk.getZ(), true, false, mask,
                     oldChunk.getSections(), biomeData, oldChunk.getHeightMap(), blockEntityTags);
-            wrapper.write(new Chunk1_17Type(tracker.currentWorldSectionHeight()), chunk);
+            wrapper.write(new ChunkType1_17(tracker.currentWorldSectionHeight()), chunk);
 
             // Create and send light packet first
             final PacketWrapper lightPacket = wrapper.create(ClientboundPackets1_17_1.UPDATE_LIGHT);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17_1to1_18/packets/EntityPackets1_18.java

@@ -19,19 +19,15 @@ package com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.packets;
 
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_17_1to1_18.Protocol1_17_1To1_18;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_17;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_17;
 import com.viaversion.viaversion.api.type.types.version.Types1_18;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.FloatTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
 
 public final class EntityPackets1_18 extends EntityRewriter<ClientboundPackets1_18, Protocol1_17_1To1_18> {
@@ -49,11 +45,11 @@ public final class EntityPackets1_18 extends EntityRewriter<ClientboundPackets1_
             public void register() {
                 map(Type.INT); // Entity ID
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // Worlds
-                map(Type.NBT); // Dimension registry
-                map(Type.NBT); // Current dimension data
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
+                map(Type.NAMED_COMPOUND_TAG); // Current dimension data
                 map(Type.STRING); // World
                 map(Type.LONG); // Seed
                 map(Type.VAR_INT); // Max players
@@ -61,7 +57,7 @@ public final class EntityPackets1_18 extends EntityRewriter<ClientboundPackets1_
                 read(Type.VAR_INT); // Read simulation distance
                 handler(worldDataTrackerHandler(1));
                 handler(wrapper -> {
-                    final CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final CompoundTag biomeRegistry = registry.get("minecraft:worldgen/biome");
                     final ListTag biomes = biomeRegistry.get("value");
                     for (final Tag biome : biomes.getValue()) {
@@ -85,7 +81,7 @@ public final class EntityPackets1_18 extends EntityRewriter<ClientboundPackets1_
         protocol.registerClientbound(ClientboundPackets1_18.RESPAWN, new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.NBT); // Dimension data
+                map(Type.NAMED_COMPOUND_TAG); // Dimension data
                 map(Type.STRING); // World
                 handler(worldDataTrackerHandler(0));
             }
@@ -99,9 +95,9 @@ public final class EntityPackets1_18 extends EntityRewriter<ClientboundPackets1_
 
             MetaType type = meta.metaType();
             if (type == Types1_17.META_TYPES.particleType) {
-                Particle particle = (Particle) meta.getValue();
+                Particle particle = meta.value();
                 if (particle.getId() == 3) { // Block marker
-                    Particle.ParticleData data = particle.getArguments().remove(0);
+                    Particle.ParticleData<?> data = particle.getArguments().remove(0);
                     int blockState = (int) data.getValue();
                     if (blockState == 7786) { // Light block
                         particle.setId(3);
@@ -117,11 +113,12 @@ public final class EntityPackets1_18 extends EntityRewriter<ClientboundPackets1_
         });
 
         // Particles have already been handled
-        registerMetaTypeHandler(Types1_17.META_TYPES.itemType, null, null, Types1_17.META_TYPES.optionalComponentType);
+        registerMetaTypeHandler(Types1_17.META_TYPES.itemType, null, null, null,
+                Types1_17.META_TYPES.componentType, Types1_17.META_TYPES.optionalComponentType);
     }
 
     @Override
     public EntityType typeFromId(final int typeId) {
-        return Entity1_17Types.getTypeFromId(typeId);
+        return EntityTypes1_17.getTypeFromId(typeId);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_17to1_17_1/Protocol1_17To1_17_1.java

@@ -70,10 +70,10 @@ public final class Protocol1_17To1_17_1 extends BackwardsProtocol<ClientboundPac
             wrapper.user().get(InventoryStateIds.class).setStateId(containerId, stateId);
 
             // Length is encoded as a var int in 1.17.1
-            wrapper.write(Type.FLAT_VAR_INT_ITEM_ARRAY, wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT));
+            wrapper.write(Type.ITEM1_13_2_SHORT_ARRAY, wrapper.read(Type.ITEM1_13_2_ARRAY));
 
             // Carried item - should work without adding it to the array above
-            Item carried = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+            Item carried = wrapper.read(Type.ITEM1_13_2);
 
             PlayerLastCursorItem lastCursorItem = wrapper.user().get(PlayerLastCursorItem.class);
             if (lastCursorItem != null) {
@@ -97,7 +97,7 @@ public final class Protocol1_17To1_17_1 extends BackwardsProtocol<ClientboundPac
         });
 
         registerServerbound(ServerboundPackets1_17.EDIT_BOOK, wrapper -> {
-            Item item = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+            Item item = wrapper.read(Type.ITEM1_13_2);
             boolean signing = wrapper.read(Type.BOOLEAN);
             wrapper.passthrough(Type.VAR_INT); // Slot comes first
 

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/Protocol1_18_2To1_19.java

@@ -17,6 +17,7 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_18_2to1_19;
 
+import com.google.common.primitives.Longs;
 import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.BackwardsProtocol;
 import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
@@ -26,10 +27,16 @@ import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.data.CommandRew
 import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.packets.BlockItemPackets1_19;
 import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.packets.EntityPackets1_19;
 import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.storage.DimensionRegistryStorage;
+import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.storage.NonceStorage;
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.Protocol1_19To1_19_1;
+import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
+import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
+import com.viaversion.viaversion.api.minecraft.signature.model.DecoratableMessage;
+import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
+import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_0;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -45,10 +52,15 @@ import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.Protocol1_19_1To
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ServerboundPackets1_19;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import com.viaversion.viaversion.util.Pair;
+
 import java.time.Instant;
+import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 
 public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPackets1_19, ClientboundPackets1_18, ServerboundPackets1_19, ServerboundPackets1_17> {
 
@@ -57,7 +69,7 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
     private static final byte[] EMPTY_BYTES = new byte[0];
     private final EntityPackets1_19 entityRewriter = new EntityPackets1_19(this);
     private final BlockItemPackets1_19 blockItemPackets = new BlockItemPackets1_19(this);
-    private final TranslatableRewriter<ClientboundPackets1_19> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_19> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_18_2To1_19() {
         super(ClientboundPackets1_19.class, ClientboundPackets1_18.class, ServerboundPackets1_19.class, ServerboundPackets1_17.class);
@@ -71,7 +83,7 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19.TITLE_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19.TITLE_SUBTITLE);
         translatableRewriter.registerBossBar(ClientboundPackets1_19.BOSSBAR);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_19.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_19.TAB_LIST);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_19.OPEN_WINDOW);
         translatableRewriter.registerCombatKill(ClientboundPackets1_19.COMBAT_KILL);
@@ -219,17 +231,50 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
             @Override
             public void register() {
                 map(Type.STRING); // Message
-                handler(wrapper -> wrapper.write(Type.LONG, Instant.now().toEpochMilli())); // Timestamp
-                create(Type.LONG, 0L); // Salt
                 handler(wrapper -> {
+                    final ChatSession1_19_0 chatSession = wrapper.user().get(ChatSession1_19_0.class);
+
+                    final UUID sender = wrapper.user().getProtocolInfo().getUuid();
+                    final Instant timestamp = Instant.now();
+                    final long salt = ThreadLocalRandom.current().nextLong();
+
+                    wrapper.write(Type.LONG, timestamp.toEpochMilli()); // Timestamp
+                    wrapper.write(Type.LONG, chatSession != null ? salt : 0L); // Salt
+
                     final String message = wrapper.get(Type.STRING, 0);
                     if (!message.isEmpty() && message.charAt(0) == '/') {
+                        final String command = message.substring(1);
+
                         wrapper.setPacketType(ServerboundPackets1_19.CHAT_COMMAND);
-                        wrapper.set(Type.STRING, 0, message.substring(1));
-                        wrapper.write(Type.VAR_INT, 0); // No signatures
+                        wrapper.set(Type.STRING, 0, command);
+
+                        final SignableCommandArgumentsProvider argumentsProvider = Via.getManager().getProviders().get(SignableCommandArgumentsProvider.class);
+                        if (chatSession != null && argumentsProvider != null) {
+                            final MessageMetadata metadata = new MessageMetadata(sender, timestamp, salt);
+
+                            final List<Pair<String, String>> arguments = argumentsProvider.getSignableArguments(command);
+                            wrapper.write(Type.VAR_INT, arguments.size());
+                            for (final Pair<String, String> argument : arguments) {
+                                final byte[] signature = chatSession.signChatMessage(metadata, new DecoratableMessage(argument.value()));
+
+                                wrapper.write(Type.STRING, argument.key());
+                                wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
+                            }
+                        } else {
+                            wrapper.write(Type.VAR_INT, 0); // No signatures
+                        }
                     } else {
-                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES); // Signature
+                        if (chatSession != null) {
+                            final MessageMetadata metadata = new MessageMetadata(sender, timestamp, salt);
+                            final DecoratableMessage decoratableMessage = new DecoratableMessage(message);
+                            final byte[] signature = chatSession.signChatMessage(metadata, decoratableMessage);
+
+                            wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature); // Signature
+                        } else {
+                            wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES); // Signature
+                        }
                     }
+
                     wrapper.write(Type.BOOLEAN, false); // No signed preview
                 });
             }
@@ -254,20 +299,50 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
             }
         });
 
+        registerClientbound(State.LOGIN, ClientboundLoginPackets.HELLO.getId(), ClientboundLoginPackets.HELLO.getId(), new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.STRING); // Server id
+                map(Type.BYTE_ARRAY_PRIMITIVE); // Public key
+                handler(wrapper -> {
+                    if (wrapper.user().has(ChatSession1_19_0.class)) {
+                        wrapper.user().put(new NonceStorage(wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE))); // Nonce
+                    }
+                });
+            }
+        });
         registerServerbound(State.LOGIN, ServerboundLoginPackets.HELLO.getId(), ServerboundLoginPackets.HELLO.getId(), new PacketHandlers() {
             @Override
             public void register() {
                 map(Type.STRING); // Name
-                // Write empty profile key - requires the enforce-secure-profiles option to be disabled on the server
-                create(Type.OPTIONAL_PROFILE_KEY, null);
+                handler(wrapper -> {
+                    final ChatSession1_19_0 chatSession = wrapper.user().get(ChatSession1_19_0.class);
+                    wrapper.write(Type.OPTIONAL_PROFILE_KEY, chatSession == null ? null : chatSession.getProfileKey()); // Profile Key
+                });
             }
         });
 
         registerServerbound(State.LOGIN, ServerboundLoginPackets.ENCRYPTION_KEY.getId(), ServerboundLoginPackets.ENCRYPTION_KEY.getId(), new PacketHandlers() {
             @Override
             public void register() {
-                map(Type.BYTE_ARRAY_PRIMITIVE); // Keys
-                create(Type.BOOLEAN, true); // Is nonce
+                map(Type.BYTE_ARRAY_PRIMITIVE); // Public key
+                handler(wrapper -> {
+                    final ChatSession1_19_0 chatSession = wrapper.user().get(ChatSession1_19_0.class);
+
+                    final byte[] verifyToken = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Verify token
+                    wrapper.write(Type.BOOLEAN, chatSession == null); // Is nonce
+                    if (chatSession != null) {
+                        final long salt = ThreadLocalRandom.current().nextLong();
+                        final byte[] signature = chatSession.sign(signer -> {
+                            signer.accept(wrapper.user().remove(NonceStorage.class).nonce());
+                            signer.accept(Longs.toByteArray(salt));
+                        });
+                        wrapper.write(Type.LONG, salt); // Salt
+                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature); // Signature
+                    } else {
+                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, verifyToken); // Nonce
+                    }
+                });
             }
         });
     }
@@ -275,7 +350,7 @@ public final class Protocol1_18_2To1_19 extends BackwardsProtocol<ClientboundPac
     @Override
     public void init(final UserConnection user) {
         user.put(new DimensionRegistryStorage());
-        addEntityTracker(user, new EntityTrackerBase(user, Entity1_19Types.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/data/BackwardsMappings.java

@@ -18,9 +18,9 @@
 package com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.data;
 
 import com.viaversion.viabackwards.api.data.VBMappingDataLoader;
-import com.viaversion.viaversion.api.minecraft.nbt.BinaryTagIO;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
 import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
+import com.viaversion.viaversion.libs.opennbt.NBTIO;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
@@ -42,7 +42,7 @@ public final class BackwardsMappings extends com.viaversion.viabackwards.api.dat
         super.loadExtras(data);
 
         try {
-            final ListTag chatTypes = BinaryTagIO.readCompressedInputStream(VBMappingDataLoader.getResource("chat-types-1.19.1.nbt")).get("values");
+            final ListTag chatTypes = NBTIO.readTag(VBMappingDataLoader.getResource("chat-types-1.19.1.nbt")).get("values");
             for (final Tag chatType : chatTypes) {
                 final CompoundTag chatTypeCompound = (CompoundTag) chatType;
                 final NumberTag idTag = chatTypeCompound.get("id");

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/BlockItemPackets1_19.java

@@ -29,8 +29,8 @@ import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
-import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types.Chunk1_18Type;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeRewriter;
@@ -44,7 +44,7 @@ public final class BlockItemPackets1_19 extends ItemRewriter<ClientboundPackets1
 
     @Override
     protected void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        final BlockRewriter<ClientboundPackets1_19> blockRewriter = BlockRewriter.for1_14(protocol);
 
         new RecipeRewriter<>(protocol).register(ClientboundPackets1_19.DECLARE_RECIPES);
 
@@ -52,7 +52,7 @@ public final class BlockItemPackets1_19 extends ItemRewriter<ClientboundPackets1
         registerWindowItems1_17_1(ClientboundPackets1_19.WINDOW_ITEMS);
         registerSetSlot1_17_1(ClientboundPackets1_19.SET_SLOT);
         registerEntityEquipmentArray(ClientboundPackets1_19.ENTITY_EQUIPMENT);
-        registerAdvancements(ClientboundPackets1_19.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_19.ADVANCEMENTS, Type.ITEM1_13_2);
         registerClickWindow1_17_1(ServerboundPackets1_17.CLICK_WINDOW);
 
         blockRewriter.registerBlockAction(ClientboundPackets1_19.BLOCK_ACTION);
@@ -60,7 +60,7 @@ public final class BlockItemPackets1_19 extends ItemRewriter<ClientboundPackets1
         blockRewriter.registerVarLongMultiBlockChange(ClientboundPackets1_19.MULTI_BLOCK_CHANGE);
         blockRewriter.registerEffect(ClientboundPackets1_19.EFFECT, 1010, 2001);
 
-        registerCreativeInvAction(ServerboundPackets1_17.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerCreativeInvAction(ServerboundPackets1_17.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
 
         protocol.registerClientbound(ClientboundPackets1_19.TRADE_LIST, new PacketHandlers() {
             @Override
@@ -70,14 +70,14 @@ public final class BlockItemPackets1_19 extends ItemRewriter<ClientboundPackets1
                     final int size = wrapper.read(Type.VAR_INT);
                     wrapper.write(Type.UNSIGNED_BYTE, (short) size);
                     for (int i = 0; i < size; i++) {
-                        handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // First item
-                        handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Result
+                        handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2)); // First item
+                        handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2)); // Result
 
-                        final Item secondItem = wrapper.read(Type.FLAT_VAR_INT_ITEM);
+                        final Item secondItem = wrapper.read(Type.ITEM1_13_2);
                         if (secondItem != null) {
                             handleItemToClient(secondItem);
                             wrapper.write(Type.BOOLEAN, true);
-                            wrapper.write(Type.FLAT_VAR_INT_ITEM, secondItem);
+                            wrapper.write(Type.ITEM1_13_2, secondItem);
                         } else {
                             wrapper.write(Type.BOOLEAN, false);
                         }
@@ -134,14 +134,14 @@ public final class BlockItemPackets1_19 extends ItemRewriter<ClientboundPackets1
                         wrapper.cancel();
                     }
                 });
-                handler(getSpawnParticleHandler(Type.FLAT_VAR_INT_ITEM));
+                handler(getSpawnParticleHandler());
             }
         });
 
 
         protocol.registerClientbound(ClientboundPackets1_19.CHUNK_DATA, wrapper -> {
             final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
-            final Chunk1_18Type chunkType = new Chunk1_18Type(tracker.currentWorldSectionHeight(),
+            final ChunkType1_18 chunkType = new ChunkType1_18(tracker.currentWorldSectionHeight(),
                     MathUtil.ceilLog2(protocol.getMappingData().getBlockStateMappings().mappedSize()),
                     MathUtil.ceilLog2(tracker.biomesSent()));
             final Chunk chunk = wrapper.passthrough(chunkType);

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java

@@ -23,21 +23,17 @@ import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.storage.Dimensi
 import com.viaversion.viabackwards.protocol.protocol1_18_2to1_19.storage.StoredPainting;
 import com.viaversion.viaversion.api.data.ParticleMappings;
 import com.viaversion.viaversion.api.data.entity.StoredEntityData;
+import com.viaversion.viaversion.api.minecraft.Particle;
 import com.viaversion.viaversion.api.minecraft.Position;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
 import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.api.type.types.Particle;
 import com.viaversion.viaversion.api.type.types.version.Types1_18;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19;
 
@@ -49,8 +45,8 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
 
     @Override
     protected void registerPackets() {
-        registerTracker(ClientboundPackets1_19.SPAWN_EXPERIENCE_ORB, Entity1_19Types.EXPERIENCE_ORB);
-        registerTracker(ClientboundPackets1_19.SPAWN_PLAYER, Entity1_19Types.PLAYER);
+        registerTracker(ClientboundPackets1_19.SPAWN_EXPERIENCE_ORB, EntityTypes1_19.EXPERIENCE_ORB);
+        registerTracker(ClientboundPackets1_19.SPAWN_PLAYER, EntityTypes1_19.PLAYER);
         registerMetadataRewriter(ClientboundPackets1_19.ENTITY_METADATA, Types1_19.METADATA_LIST, Types1_18.METADATA_LIST);
         registerRemoveEntities(ClientboundPackets1_19.REMOVE_ENTITIES);
 
@@ -69,7 +65,7 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
                     final byte headYaw = wrapper.read(Type.BYTE);
                     int data = wrapper.read(Type.VAR_INT);
                     final EntityType entityType = trackAndMapEntity(wrapper);
-                    if (entityType.isOrHasParent(Entity1_19Types.LIVINGENTITY)) {
+                    if (entityType.isOrHasParent(EntityTypes1_19.LIVINGENTITY)) {
                         wrapper.write(Type.BYTE, headYaw);
 
                         // Switch pitch and yaw position
@@ -80,7 +76,7 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
 
                         wrapper.setPacketType(ClientboundPackets1_18.SPAWN_MOB);
                         return;
-                    } else if (entityType == Entity1_19Types.PAINTING) {
+                    } else if (entityType == EntityTypes1_19.PAINTING) {
                         wrapper.cancel();
                         // The entity has been tracked, now we wait for the metadata packet
                         final int entityId = wrapper.get(Type.VAR_INT, 0);
@@ -90,7 +86,7 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
                         return;
                     }
 
-                    if (entityType == Entity1_19Types.FALLING_BLOCK) {
+                    if (entityType == EntityTypes1_19.FALLING_BLOCK) {
                         data = protocol.getMappingData().getNewBlockStateId(data);
                     }
                     wrapper.write(Type.INT, data);
@@ -109,7 +105,7 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
                 handler(wrapper -> {
                     // Remove factor data
                     if (wrapper.read(Type.BOOLEAN)) {
-                        wrapper.read(Type.NBT);
+                        wrapper.read(Type.NAMED_COMPOUND_TAG);
                     }
                 });
             }
@@ -120,17 +116,17 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
             public void register() {
                 map(Type.INT); // Entity ID
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // Worlds
-                map(Type.NBT); // Dimension registry
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
                 handler(wrapper -> {
                     final DimensionRegistryStorage dimensionRegistryStorage = wrapper.user().get(DimensionRegistryStorage.class);
                     dimensionRegistryStorage.clear();
 
                     // Cache dimensions and find current dimension
                     final String dimensionKey = wrapper.read(Type.STRING);
-                    final CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final ListTag dimensions = ((CompoundTag) registry.get("minecraft:dimension_type")).get("value");
                     boolean found = false;
                     for (final Tag dimension : dimensions) {
@@ -140,7 +136,7 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
                         dimensionRegistryStorage.addDimension(nameTag.getValue(), dimensionData.clone());
 
                         if (!found && nameTag.getValue().equals(dimensionKey)) {
-                            wrapper.write(Type.NBT, dimensionData);
+                            wrapper.write(Type.NAMED_COMPOUND_TAG, dimensionData);
                             found = true;
                         }
                     }
@@ -190,7 +186,7 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
                         throw new IllegalArgumentException("Could not find dimension " + dimensionKey + " in dimension registry");
                     }
 
-                    wrapper.write(Type.NBT, dimension);
+                    wrapper.write(Type.NAMED_COMPOUND_TAG, dimension);
                 });
                 map(Type.STRING); // World
                 map(Type.LONG); // Seed
@@ -269,14 +265,15 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
             }
         });
 
-        registerMetaTypeHandler(Types1_18.META_TYPES.itemType, Types1_18.META_TYPES.blockStateType, null, Types1_18.META_TYPES.optionalComponentType);
+        registerMetaTypeHandler(Types1_18.META_TYPES.itemType, Types1_18.META_TYPES.blockStateType, null, null,
+                Types1_18.META_TYPES.componentType, Types1_18.META_TYPES.optionalComponentType);
 
-        filter().filterFamily(Entity1_19Types.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_19.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
             final int data = (int) meta.getValue();
             meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
         });
 
-        filter().type(Entity1_19Types.PAINTING).index(8).handler((event, meta) -> {
+        filter().type(EntityTypes1_19.PAINTING).index(8).handler((event, meta) -> {
             event.cancel();
 
             final StoredEntityData entityData = tracker(event.user()).entityDataIfPresent(event.entityId());
@@ -297,30 +294,30 @@ public final class EntityPackets1_19 extends EntityRewriter<ClientboundPackets1_
             }
         });
 
-        filter().type(Entity1_19Types.CAT).index(19).handler((event, meta) -> meta.setMetaType(Types1_18.META_TYPES.varIntType));
+        filter().type(EntityTypes1_19.CAT).index(19).handler((event, meta) -> meta.setMetaType(Types1_18.META_TYPES.varIntType));
 
-        filter().type(Entity1_19Types.FROG).cancel(16); // Age
-        filter().type(Entity1_19Types.FROG).cancel(17); // Variant
-        filter().type(Entity1_19Types.FROG).cancel(18); // Tongue target
+        filter().type(EntityTypes1_19.FROG).cancel(16); // Age
+        filter().type(EntityTypes1_19.FROG).cancel(17); // Variant
+        filter().type(EntityTypes1_19.FROG).cancel(18); // Tongue target
 
-        filter().type(Entity1_19Types.WARDEN).cancel(16); // Anger
+        filter().type(EntityTypes1_19.WARDEN).cancel(16); // Anger
 
-        filter().type(Entity1_19Types.GOAT).cancel(18);
-        filter().type(Entity1_19Types.GOAT).cancel(19);
+        filter().type(EntityTypes1_19.GOAT).cancel(18);
+        filter().type(EntityTypes1_19.GOAT).cancel(19);
     }
 
     @Override
     public void onMappingDataLoaded() {
         mapTypes();
-        mapEntityTypeWithData(Entity1_19Types.FROG, Entity1_19Types.RABBIT).jsonName();
-        mapEntityTypeWithData(Entity1_19Types.TADPOLE, Entity1_19Types.PUFFERFISH).jsonName();
-        mapEntityTypeWithData(Entity1_19Types.CHEST_BOAT, Entity1_19Types.BOAT);
-        mapEntityTypeWithData(Entity1_19Types.WARDEN, Entity1_19Types.IRON_GOLEM).jsonName();
-        mapEntityTypeWithData(Entity1_19Types.ALLAY, Entity1_19Types.VEX).jsonName();
+        mapEntityTypeWithData(EntityTypes1_19.FROG, EntityTypes1_19.RABBIT).jsonName();
+        mapEntityTypeWithData(EntityTypes1_19.TADPOLE, EntityTypes1_19.PUFFERFISH).jsonName();
+        mapEntityTypeWithData(EntityTypes1_19.CHEST_BOAT, EntityTypes1_19.BOAT);
+        mapEntityTypeWithData(EntityTypes1_19.WARDEN, EntityTypes1_19.IRON_GOLEM).jsonName();
+        mapEntityTypeWithData(EntityTypes1_19.ALLAY, EntityTypes1_19.VEX).jsonName();
     }
 
     @Override
     public EntityType typeFromId(final int typeId) {
-        return Entity1_19Types.getTypeFromId(typeId);
+        return EntityTypes1_19.getTypeFromId(typeId);
     }
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/storage/NonceStorage.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2023 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.protocol.protocol1_18_2to1_19.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public final class NonceStorage implements StorableObject {
+
+    private final byte[] nonce;
+
+    public NonceStorage(final byte @Nullable [] nonce) {
+        this.nonce = nonce;
+    }
+
+    public byte @Nullable [] nonce() {
+        return nonce;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java

@@ -74,25 +74,25 @@ public final class Protocol1_18To1_18_2 extends BackwardsProtocol<ClientboundPac
             public void register() {
                 map(Type.INT); // Entity ID
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // World List
-                map(Type.NBT); // Registry
-                map(Type.NBT); // Current dimension data
+                map(Type.NAMED_COMPOUND_TAG); // Registry
+                map(Type.NAMED_COMPOUND_TAG); // Current dimension data
                 handler(wrapper -> {
-                    final CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final CompoundTag dimensionsHolder = registry.get("minecraft:dimension_type");
                     final ListTag dimensions = dimensionsHolder.get("value");
                     for (final Tag dimension : dimensions) {
                         removeTagPrefix(((CompoundTag) dimension).get("element"));
                     }
 
-                    removeTagPrefix(wrapper.get(Type.NBT, 1));
+                    removeTagPrefix(wrapper.get(Type.NAMED_COMPOUND_TAG, 1));
                 });
             }
         });
 
-        registerClientbound(ClientboundPackets1_18.RESPAWN, wrapper -> removeTagPrefix(wrapper.passthrough(Type.NBT)));
+        registerClientbound(ClientboundPackets1_18.RESPAWN, wrapper -> removeTagPrefix(wrapper.passthrough(Type.NAMED_COMPOUND_TAG)));
     }
 
     private void removeTagPrefix(CompoundTag tag) {

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/Protocol1_19_1To1_19_3.java

@@ -28,10 +28,15 @@ import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.storage.ChatS
 import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.storage.ChatTypeStorage1_19_3;
 import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.storage.NonceStorage;
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.Protocol1_19To1_19_1;
+import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
 import com.viaversion.viaversion.api.minecraft.ProfileKey;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_3Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_3;
+import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
+import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
+import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_3;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -48,10 +53,14 @@ import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ServerboundPacke
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import com.viaversion.viaversion.util.CipherUtil;
+import com.viaversion.viaversion.util.Pair;
+
 import java.util.BitSet;
+import java.util.List;
 
 public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundPackets1_19_3, ClientboundPackets1_19_1, ServerboundPackets1_19_3, ServerboundPackets1_19_1> {
 
@@ -60,7 +69,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
     public static final ByteArrayType SIGNATURE_BYTES_TYPE = new ByteArrayType(256);
     private final EntityPackets1_19_3 entityRewriter = new EntityPackets1_19_3(this);
     private final BlockItemPackets1_19_3 itemRewriter = new BlockItemPackets1_19_3(this);
-    private final TranslatableRewriter<ClientboundPackets1_19_3> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_19_3> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_19_1To1_19_3() {
         super(ClientboundPackets1_19_3.class, ClientboundPackets1_19_1.class, ServerboundPackets1_19_3.class, ServerboundPackets1_19_1.class);
@@ -75,7 +84,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.TITLE_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.TITLE_SUBTITLE);
         translatableRewriter.registerBossBar(ClientboundPackets1_19_3.BOSSBAR);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_19_3.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_3.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_19_3.TAB_LIST);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_19_3.OPEN_WINDOW);
         translatableRewriter.registerCombatKill(ClientboundPackets1_19_3.COMBAT_KILL);
@@ -121,6 +130,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
                 }
 
                 wrapper.write(Type.VAR_INT, mappedId);
+                return;
             }
 
             // Convert the resource location to the corresponding integer id
@@ -218,6 +228,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
                     if (wrapper.user().has(NonceStorage.class)) {
                         return;
                     }
+
                     final byte[] publicKey = wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE);
                     final byte[] nonce = wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE);
                     wrapper.user().put(new NonceStorage(CipherUtil.encryptNonce(publicKey, nonce)));
@@ -247,16 +258,28 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
                 map(Type.LONG); // Timestamp
                 map(Type.LONG); // Salt
                 read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
-                create(OPTIONAL_SIGNATURE_BYTES_TYPE, null); // No signature
                 read(Type.BOOLEAN); // Signed preview
                 read(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY); // Last seen messages
                 read(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE); // Last received message
                 handler(wrapper -> {
+                    final ChatSession1_19_3 chatSession = wrapper.user().get(ChatSession1_19_3.class);
+
+                    if (chatSession != null) {
+                        final String message = wrapper.get(Type.STRING, 0);
+                        final long timestamp = wrapper.get(Type.LONG, 0);
+                        final long salt = wrapper.get(Type.LONG, 1);
+
+                        final MessageMetadata metadata = new MessageMetadata(null, timestamp, salt);
+                        final byte[] signature = chatSession.signChatMessage(metadata, message, new PlayerMessageSignature[0]);
+
+                        wrapper.write(Protocol1_19_1To1_19_3.OPTIONAL_SIGNATURE_BYTES_TYPE, signature); // Signature
+                    } else {
+                        wrapper.write(Protocol1_19_1To1_19_3.OPTIONAL_SIGNATURE_BYTES_TYPE, null); // Signature
+                    }
+
                     //TODO is this fine (probably not)? same for chat_command
-                    final int offset = 0;
-                    final BitSet acknowledged = new BitSet(20);
-                    wrapper.write(Type.VAR_INT, offset);
-                    wrapper.write(new BitSetType(20), acknowledged);
+                    wrapper.write(Type.VAR_INT, 0); // Offset
+                    wrapper.write(new BitSetType(20), new BitSet(20)); // Acknowledged
                 });
             }
         });
@@ -267,14 +290,35 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
                 map(Type.LONG); // Timestamp
                 map(Type.LONG); // Salt
                 handler(wrapper -> {
+                    final ChatSession1_19_3 chatSession = wrapper.user().get(ChatSession1_19_3.class);
+                    final SignableCommandArgumentsProvider argumentsProvider = Via.getManager().getProviders().get(SignableCommandArgumentsProvider.class);
+
+                    final String command = wrapper.get(Type.STRING, 0);
+                    final long timestamp = wrapper.get(Type.LONG, 0);
+                    final long salt = wrapper.get(Type.LONG, 1);
+
                     final int signatures = wrapper.read(Type.VAR_INT);
-                    wrapper.write(Type.VAR_INT, 0);
                     for (int i = 0; i < signatures; i++) {
                         wrapper.read(Type.STRING); // Name
                         wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
                     }
                     wrapper.read(Type.BOOLEAN); // Signed preview
 
+                    if (chatSession != null && argumentsProvider != null) {
+                        final MessageMetadata metadata = new MessageMetadata(null, timestamp, salt);
+
+                        final List<Pair<String, String>> arguments = argumentsProvider.getSignableArguments(command);
+                        wrapper.write(Type.VAR_INT, arguments.size());
+                        for (final Pair<String, String> argument : arguments) {
+                            final byte[] signature = chatSession.signChatMessage(metadata, argument.value(), new PlayerMessageSignature[0]);
+
+                            wrapper.write(Type.STRING, argument.key());
+                            wrapper.write(Protocol1_19_1To1_19_3.SIGNATURE_BYTES_TYPE, signature);
+                        }
+                    } else {
+                        wrapper.write(Type.VAR_INT, 0); // No signatures
+                    }
+
                     final int offset = 0;
                     final BitSet acknowledged = new BitSet(20);
                     wrapper.write(Type.VAR_INT, offset);
@@ -349,7 +393,7 @@ public final class Protocol1_19_1To1_19_3 extends BackwardsProtocol<ClientboundP
     public void init(final UserConnection user) {
         user.put(new ChatSessionStorage());
         user.put(new ChatTypeStorage1_19_3());
-        addEntityTracker(user, new EntityTrackerBase(user, Entity1_19_3Types.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19_3.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/BlockItemPackets1_19_3.java

@@ -22,7 +22,7 @@ import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.Protocol1_19_
 import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types.Chunk1_18Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ServerboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
@@ -37,22 +37,22 @@ public final class BlockItemPackets1_19_3 extends ItemRewriter<ClientboundPacket
 
     @Override
     protected void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19_3> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        final BlockRewriter<ClientboundPackets1_19_3> blockRewriter = BlockRewriter.for1_14(protocol);
         blockRewriter.registerBlockAction(ClientboundPackets1_19_3.BLOCK_ACTION);
         blockRewriter.registerBlockChange(ClientboundPackets1_19_3.BLOCK_CHANGE);
         blockRewriter.registerVarLongMultiBlockChange(ClientboundPackets1_19_3.MULTI_BLOCK_CHANGE);
         blockRewriter.registerEffect(ClientboundPackets1_19_3.EFFECT, 1010, 2001);
-        blockRewriter.registerChunkData1_19(ClientboundPackets1_19_3.CHUNK_DATA, Chunk1_18Type::new);
+        blockRewriter.registerChunkData1_19(ClientboundPackets1_19_3.CHUNK_DATA, ChunkType1_18::new);
         blockRewriter.registerBlockEntityData(ClientboundPackets1_19_3.BLOCK_ENTITY_DATA);
 
         registerSetCooldown(ClientboundPackets1_19_3.COOLDOWN);
         registerWindowItems1_17_1(ClientboundPackets1_19_3.WINDOW_ITEMS);
         registerSetSlot1_17_1(ClientboundPackets1_19_3.SET_SLOT);
         registerEntityEquipmentArray(ClientboundPackets1_19_3.ENTITY_EQUIPMENT);
-        registerAdvancements(ClientboundPackets1_19_3.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_19_3.ADVANCEMENTS, Type.ITEM1_13_2);
         registerClickWindow1_17_1(ServerboundPackets1_19_1.CLICK_WINDOW);
         registerTradeList1_19(ClientboundPackets1_19_3.TRADE_LIST);
-        registerCreativeInvAction(ServerboundPackets1_19_1.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerCreativeInvAction(ServerboundPackets1_19_1.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
         registerWindowPropertyEnchantmentHandler(ClientboundPackets1_19_3.WINDOW_PROPERTY);
         registerSpawnParticle1_19(ClientboundPackets1_19_3.SPAWN_PARTICLE);
 
@@ -77,12 +77,12 @@ public final class BlockItemPackets1_19_3 extends ItemRewriter<ClientboundPacket
                         wrapper.read(Type.VAR_INT); // Crafting book category
                         final int ingredients = wrapper.passthrough(Type.VAR_INT);
                         for (int j = 0; j < ingredients; j++) {
-                            final Item[] items = wrapper.passthrough(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
+                            final Item[] items = wrapper.passthrough(Type.ITEM1_13_2_ARRAY); // Ingredients
                             for (final Item item : items) {
                                 handleItemToClient(item);
                             }
                         }
-                        handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Result
+                        handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2)); // Result
                         break;
                     }
                     case "crafting_shaped": {
@@ -90,12 +90,12 @@ public final class BlockItemPackets1_19_3 extends ItemRewriter<ClientboundPacket
                         wrapper.passthrough(Type.STRING); // Group
                         wrapper.read(Type.VAR_INT); // Crafting book category
                         for (int j = 0; j < ingredients; j++) {
-                            final Item[] items = wrapper.passthrough(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
+                            final Item[] items = wrapper.passthrough(Type.ITEM1_13_2_ARRAY); // Ingredients
                             for (final Item item : items) {
                                 handleItemToClient(item);
                             }
                         }
-                        handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Result
+                        handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2)); // Result
                         break;
                     }
                     case "smelting":
@@ -104,11 +104,11 @@ public final class BlockItemPackets1_19_3 extends ItemRewriter<ClientboundPacket
                     case "smoking":
                         wrapper.passthrough(Type.STRING); // Group
                         wrapper.read(Type.VAR_INT); // Crafting book category
-                        final Item[] items = wrapper.passthrough(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Ingredients
+                        final Item[] items = wrapper.passthrough(Type.ITEM1_13_2_ARRAY); // Ingredients
                         for (final Item item : items) {
                             handleItemToClient(item);
                         }
-                        handleItemToClient(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Result
+                        handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2)); // Result
                         wrapper.passthrough(Type.FLOAT); // EXP
                         wrapper.passthrough(Type.VAR_INT); // Cooking time
                         break;

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_1to1_19_3/packets/EntityPackets1_19_3.java

@@ -22,8 +22,9 @@ import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.Protocol1_19_
 import com.viaversion.viabackwards.protocol.protocol1_19_1to1_19_3.storage.ChatTypeStorage1_19_3;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.ProfileKey;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_3Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_3;
+import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_3;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
@@ -37,9 +38,11 @@ import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
+import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import java.util.BitSet;
 import java.util.UUID;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets1_19_3, Protocol1_19_1To1_19_3> {
 
@@ -60,17 +63,17 @@ public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets
     protected void registerPackets() {
         registerMetadataRewriter(ClientboundPackets1_19_3.ENTITY_METADATA, Types1_19_3.METADATA_LIST, Types1_19.METADATA_LIST);
         registerRemoveEntities(ClientboundPackets1_19_3.REMOVE_ENTITIES);
-        registerTrackerWithData1_19(ClientboundPackets1_19_3.SPAWN_ENTITY, Entity1_19_3Types.FALLING_BLOCK);
+        registerTrackerWithData1_19(ClientboundPackets1_19_3.SPAWN_ENTITY, EntityTypes1_19_3.FALLING_BLOCK);
 
         protocol.registerClientbound(ClientboundPackets1_19_3.JOIN_GAME, new PacketHandlers() {
             @Override
             public void register() {
                 map(Type.INT); // Entity id
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // World List
-                map(Type.NBT); // Dimension registry
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
                 map(Type.STRING); // Dimension key
                 map(Type.STRING); // World
                 handler(dimensionDataHandler());
@@ -79,7 +82,7 @@ public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets
                 handler(wrapper -> {
                     final ChatTypeStorage1_19_3 chatTypeStorage = wrapper.user().get(ChatTypeStorage1_19_3.class);
                     chatTypeStorage.clear();
-                    final CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final ListTag chatTypes = ((CompoundTag) registry.get("minecraft:chat_type")).get("value");
                     for (final Tag chatType : chatTypes) {
                         final CompoundTag chatTypeCompound = (CompoundTag) chatType;
@@ -87,6 +90,16 @@ public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets
                         chatTypeStorage.addChatType(idTag.asInt(), chatTypeCompound);
                     }
                 });
+                handler(wrapper -> {
+                    final ChatSession1_19_3 chatSession = wrapper.user().get(ChatSession1_19_3.class);
+
+                    if (chatSession != null) {
+                        final PacketWrapper chatSessionUpdate = wrapper.create(ServerboundPackets1_19_3.CHAT_SESSION_UPDATE);
+                        chatSessionUpdate.write(Type.UUID, chatSession.getSessionId());
+                        chatSessionUpdate.write(Type.PROFILE_KEY, chatSession.getProfileKey());
+                        chatSessionUpdate.sendToServer(Protocol1_19_1To1_19_3.class);
+                    }
+                });
             }
         });
 
@@ -230,7 +243,8 @@ public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets
                 meta.setMetaType(Types1_19.META_TYPES.byId(id));
             }
         });
-        registerMetaTypeHandler(Types1_19.META_TYPES.itemType, Types1_19.META_TYPES.blockStateType, Types1_19.META_TYPES.particleType, Types1_19.META_TYPES.optionalComponentType);
+        registerMetaTypeHandler(Types1_19.META_TYPES.itemType, Types1_19.META_TYPES.blockStateType, null, Types1_19.META_TYPES.particleType,
+                Types1_19.META_TYPES.componentType, Types1_19.META_TYPES.optionalComponentType);
 
         filter().index(6).handler((event, meta) -> {
             // Sitting pose added
@@ -241,24 +255,24 @@ public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets
                 meta.setValue(pose - 1);
             }
         });
-        filter().filterFamily(Entity1_19_3Types.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_19_3.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
             final int data = (int) meta.getValue();
             meta.setValue(protocol.getMappingData().getNewBlockStateId(data));
         });
 
-        filter().type(Entity1_19_3Types.CAMEL).cancel(19); // Dashing
-        filter().type(Entity1_19_3Types.CAMEL).cancel(20); // Last pose change time
+        filter().type(EntityTypes1_19_3.CAMEL).cancel(19); // Dashing
+        filter().type(EntityTypes1_19_3.CAMEL).cancel(20); // Last pose change time
     }
 
     @Override
     public void onMappingDataLoaded() {
         mapTypes();
-        mapEntityTypeWithData(Entity1_19_3Types.CAMEL, Entity1_19_3Types.DONKEY).jsonName();
+        mapEntityTypeWithData(EntityTypes1_19_3.CAMEL, EntityTypes1_19_3.DONKEY).jsonName();
     }
 
     @Override
     public EntityType typeFromId(final int typeId) {
-        return Entity1_19_3Types.getTypeFromId(typeId);
+        return EntityTypes1_19_3.getTypeFromId(typeId);
     }
 
     private static final class PlayerProfileUpdate {
@@ -290,4 +304,4 @@ public final class EntityPackets1_19_3 extends EntityRewriter<ClientboundPackets
             return displayName;
         }
     }
-}
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/Protocol1_19_3To1_19_4.java

@@ -1,5 +1,5 @@
 /*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
  * Copyright (C) 2023 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@ import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.packets.BlockItemPackets1_19_4;
 import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.packets.EntityPackets1_19_4;
 import com.viaversion.viaversion.api.connection.UserConnection;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
@@ -35,6 +35,8 @@ import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPac
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -44,7 +46,7 @@ public final class Protocol1_19_3To1_19_4 extends BackwardsProtocol<ClientboundP
     public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.19.4", "1.19.3", Protocol1_19_4To1_19_3.class);
     private final EntityPackets1_19_4 entityRewriter = new EntityPackets1_19_4(this);
     private final BlockItemPackets1_19_4 itemRewriter = new BlockItemPackets1_19_4(this);
-    private final TranslatableRewriter<ClientboundPackets1_19_4> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_19_4> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_19_3To1_19_4() {
         super(ClientboundPackets1_19_4.class, ClientboundPackets1_19_3.class, ServerboundPackets1_19_4.class, ServerboundPackets1_19_3.class);
@@ -64,7 +66,7 @@ public final class Protocol1_19_3To1_19_4 extends BackwardsProtocol<ClientboundP
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.TITLE_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.TITLE_SUBTITLE);
         translatableRewriter.registerBossBar(ClientboundPackets1_19_4.BOSSBAR);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_19_4.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_19_4.TAB_LIST);
         translatableRewriter.registerCombatKill(ClientboundPackets1_19_4.COMBAT_KILL);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SYSTEM_CHAT);
@@ -98,6 +100,8 @@ public final class Protocol1_19_3To1_19_4 extends BackwardsProtocol<ClientboundP
         tagRewriter.removeTags("minecraft:damage_type");
         tagRewriter.registerGeneric(ClientboundPackets1_19_4.TAGS);
 
+        new StatisticsRewriter<>(this).register(ClientboundPackets1_19_4.STATISTICS);
+
         registerClientbound(ClientboundPackets1_19_4.SERVER_DATA, wrapper -> {
             final JsonElement element = wrapper.read(Type.COMPONENT);
             wrapper.write(Type.OPTIONAL_COMPONENT, element);
@@ -113,7 +117,7 @@ public final class Protocol1_19_3To1_19_4 extends BackwardsProtocol<ClientboundP
 
     @Override
     public void init(final UserConnection user) {
-        addEntityTracker(user, new EntityTrackerBase(user, Entity1_19_4Types.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19_4.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/BlockItemPackets1_19_4.java

@@ -22,7 +22,7 @@ import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.Protocol1_19_
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
-import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types.Chunk1_18Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.rewriter.RecipeRewriter1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4;
@@ -37,12 +37,12 @@ public final class BlockItemPackets1_19_4 extends ItemRewriter<ClientboundPacket
 
     @Override
     public void registerPackets() {
-        final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = new BlockRewriter<>(protocol, Type.POSITION1_14);
+        final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = BlockRewriter.for1_14(protocol);
         blockRewriter.registerBlockAction(ClientboundPackets1_19_4.BLOCK_ACTION);
         blockRewriter.registerBlockChange(ClientboundPackets1_19_4.BLOCK_CHANGE);
         blockRewriter.registerVarLongMultiBlockChange(ClientboundPackets1_19_4.MULTI_BLOCK_CHANGE);
         blockRewriter.registerEffect(ClientboundPackets1_19_4.EFFECT, 1010, 2001);
-        blockRewriter.registerChunkData1_19(ClientboundPackets1_19_4.CHUNK_DATA, Chunk1_18Type::new);
+        blockRewriter.registerChunkData1_19(ClientboundPackets1_19_4.CHUNK_DATA, ChunkType1_18::new);
         blockRewriter.registerBlockEntityData(ClientboundPackets1_19_4.BLOCK_ENTITY_DATA);
 
         protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_WINDOW, new PacketHandlers() {
@@ -67,11 +67,11 @@ public final class BlockItemPackets1_19_4 extends ItemRewriter<ClientboundPacket
         registerSetCooldown(ClientboundPackets1_19_4.COOLDOWN);
         registerWindowItems1_17_1(ClientboundPackets1_19_4.WINDOW_ITEMS);
         registerSetSlot1_17_1(ClientboundPackets1_19_4.SET_SLOT);
-        registerAdvancements(ClientboundPackets1_19_4.ADVANCEMENTS, Type.FLAT_VAR_INT_ITEM);
+        registerAdvancements(ClientboundPackets1_19_4.ADVANCEMENTS, Type.ITEM1_13_2);
         registerEntityEquipmentArray(ClientboundPackets1_19_4.ENTITY_EQUIPMENT);
         registerClickWindow1_17_1(ServerboundPackets1_19_3.CLICK_WINDOW);
         registerTradeList1_19(ClientboundPackets1_19_4.TRADE_LIST);
-        registerCreativeInvAction(ServerboundPackets1_19_3.CREATIVE_INVENTORY_ACTION, Type.FLAT_VAR_INT_ITEM);
+        registerCreativeInvAction(ServerboundPackets1_19_3.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
         registerWindowPropertyEnchantmentHandler(ClientboundPackets1_19_4.WINDOW_PROPERTY);
         registerSpawnParticle1_19(ClientboundPackets1_19_4.SPAWN_PARTICLE);
 
@@ -84,7 +84,7 @@ public final class BlockItemPackets1_19_4 extends ItemRewriter<ClientboundPacket
                 for (int i = 0; i < ingredients; i++) {
                     handleIngredient(wrapper);
                 }
-                rewrite(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Result
+                rewrite(wrapper.passthrough(Type.ITEM1_13_2)); // Result
 
                 // Remove notification boolean
                 wrapper.read(Type.BOOLEAN);
@@ -99,11 +99,11 @@ public final class BlockItemPackets1_19_4 extends ItemRewriter<ClientboundPacket
                 if (cutType.equals("smithing_transform") || cutType.equals("smithing_trim")) {
                     newSize--;
                     wrapper.read(Type.STRING); // Recipe identifier
-                    wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Template
-                    wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Base
-                    wrapper.read(Type.FLAT_VAR_INT_ITEM_ARRAY_VAR_INT); // Additions
+                    wrapper.read(Type.ITEM1_13_2_ARRAY); // Template
+                    wrapper.read(Type.ITEM1_13_2_ARRAY); // Base
+                    wrapper.read(Type.ITEM1_13_2_ARRAY); // Additions
                     if (cutType.equals("smithing_transform")) {
-                        wrapper.read(Type.FLAT_VAR_INT_ITEM); // Result
+                        wrapper.read(Type.ITEM1_13_2); // Result
                     }
                     continue;
                 } else if (cutType.equals("crafting_decorated_pot")) {

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_3to1_19_4/packets/EntityPackets1_19_4.java

@@ -1,5 +1,5 @@
 /*
- * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
  * Copyright (C) 2023 ViaVersion and contributors
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,18 +20,15 @@ package com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.packets;
 import com.viaversion.viabackwards.api.entities.storage.EntityData;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_19_3to1_19_4.Protocol1_19_3To1_19_4;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4;
 import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_3;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_4;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.gson.JsonElement;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4;
 
@@ -43,7 +40,7 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
 
     @Override
     public void registerPackets() {
-        registerTrackerWithData1_19(ClientboundPackets1_19_4.SPAWN_ENTITY, Entity1_19_4Types.FALLING_BLOCK);
+        registerTrackerWithData1_19(ClientboundPackets1_19_4.SPAWN_ENTITY, EntityTypes1_19_4.FALLING_BLOCK);
         registerRemoveEntities(ClientboundPackets1_19_4.REMOVE_ENTITIES);
         registerMetadataRewriter(ClientboundPackets1_19_4.ENTITY_METADATA, Types1_19_4.METADATA_LIST, Types1_19_3.METADATA_LIST);
 
@@ -52,17 +49,17 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
             public void register() {
                 map(Type.INT); // Entity id
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // World List
-                map(Type.NBT); // Dimension registry
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
                 map(Type.STRING); // Dimension key
                 map(Type.STRING); // World
                 handler(dimensionDataHandler());
                 handler(biomeSizeTracker());
                 handler(worldDataTrackerHandlerByKey());
                 handler(wrapper -> {
-                    final CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     registry.remove("minecraft:trim_pattern");
                     registry.remove("minecraft:trim_material");
                     registry.remove("minecraft:damage_type");
@@ -71,7 +68,7 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
                     final ListTag biomes = biomeRegistry.get("value");
                     for (final Tag biomeTag : biomes) {
                         final CompoundTag biomeData = ((CompoundTag) biomeTag).get("element");
-                        final ByteTag hasPrecipitation = biomeData.get("has_precipitation");
+                        final NumberTag hasPrecipitation = biomeData.get("has_precipitation");
                         biomeData.put("precipitation", new StringTag(hasPrecipitation.asByte() == 1 ? "rain" : "none"));
                     }
                 });
@@ -86,7 +83,7 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
                 map(Type.DOUBLE); // Z
                 map(Type.FLOAT); // Yaw
                 map(Type.FLOAT); // Pitch
-                map(Type.UNSIGNED_BYTE); // Relative arguments
+                map(Type.BYTE); // Relative arguments
                 map(Type.VAR_INT); // Id
                 create(Type.BOOLEAN, false); // Dismount vehicle
             }
@@ -142,20 +139,31 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
 
             meta.setMetaType(Types1_19_3.META_TYPES.byId(id));
         });
-        registerMetaTypeHandler(Types1_19_3.META_TYPES.itemType, Types1_19_3.META_TYPES.blockStateType, Types1_19_3.META_TYPES.particleType, Types1_19_3.META_TYPES.optionalComponentType);
+        registerMetaTypeHandler(Types1_19_3.META_TYPES.itemType, Types1_19_3.META_TYPES.blockStateType, null, Types1_19_3.META_TYPES.particleType,
+                Types1_19_3.META_TYPES.componentType, Types1_19_3.META_TYPES.optionalComponentType);
 
-        filter().filterFamily(Entity1_19_4Types.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_19_4.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
             final int blockState = meta.value();
             meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState));
         });
 
-        filter().type(Entity1_19_4Types.TEXT_DISPLAY).index(22).handler(((event, meta) -> {
+        filter().filterFamily(EntityTypes1_19_4.BOAT).index(11).handler((event, meta) -> {
+            final int boatType = meta.value();
+            if (boatType > 4) { // Cherry
+                meta.setValue(boatType - 1);
+            }
+        });
+
+        filter().type(EntityTypes1_19_4.TEXT_DISPLAY).index(22).handler(((event, meta) -> {
             // Send as custom display name
             event.setIndex(2);
             meta.setMetaType(Types1_19_3.META_TYPES.optionalComponentType);
             event.createExtraMeta(new Metadata(3, Types1_19_3.META_TYPES.booleanType, true)); // Show custom name
+
+            final JsonElement element = meta.value();
+            protocol.getTranslatableRewriter().processText(element);
         }));
-        filter().filterFamily(Entity1_19_4Types.DISPLAY).handler((event, meta) -> {
+        filter().filterFamily(EntityTypes1_19_4.DISPLAY).handler((event, meta) -> {
             // TODO Maybe spawn an extra entity to ride the armor stand for blocks and items
             // Remove a large heap of display metadata
             if (event.index() > 7) {
@@ -163,14 +171,14 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
             }
         });
 
-        filter().type(Entity1_19_4Types.INTERACTION).removeIndex(8); // Width
-        filter().type(Entity1_19_4Types.INTERACTION).removeIndex(9); // Height
-        filter().type(Entity1_19_4Types.INTERACTION).removeIndex(10); // Response
+        filter().type(EntityTypes1_19_4.INTERACTION).removeIndex(8); // Width
+        filter().type(EntityTypes1_19_4.INTERACTION).removeIndex(9); // Height
+        filter().type(EntityTypes1_19_4.INTERACTION).removeIndex(10); // Response
 
-        filter().type(Entity1_19_4Types.SNIFFER).removeIndex(17); // State
-        filter().type(Entity1_19_4Types.SNIFFER).removeIndex(18); // Drop seed at tick
+        filter().type(EntityTypes1_19_4.SNIFFER).removeIndex(17); // State
+        filter().type(EntityTypes1_19_4.SNIFFER).removeIndex(18); // Drop seed at tick
 
-        filter().filterFamily(Entity1_19_4Types.ABSTRACT_HORSE).addIndex(18); // Owner UUID
+        filter().filterFamily(EntityTypes1_19_4.ABSTRACT_HORSE).addIndex(18); // Owner UUID
     }
 
     @Override
@@ -182,17 +190,17 @@ public final class EntityPackets1_19_4 extends EntityRewriter<ClientboundPackets
             storage.add(new Metadata(5, Types1_19_3.META_TYPES.booleanType, true)); // No gravity
             storage.add(new Metadata(15, Types1_19_3.META_TYPES.byteType, (byte) (0x01 | 0x10))); // Small marker
         };
-        mapEntityTypeWithData(Entity1_19_4Types.TEXT_DISPLAY, Entity1_19_4Types.ARMOR_STAND).spawnMetadata(displayMetaCreator);
-        mapEntityTypeWithData(Entity1_19_4Types.ITEM_DISPLAY, Entity1_19_4Types.ARMOR_STAND).spawnMetadata(displayMetaCreator);
-        mapEntityTypeWithData(Entity1_19_4Types.BLOCK_DISPLAY, Entity1_19_4Types.ARMOR_STAND).spawnMetadata(displayMetaCreator);
+        mapEntityTypeWithData(EntityTypes1_19_4.TEXT_DISPLAY, EntityTypes1_19_4.ARMOR_STAND).spawnMetadata(displayMetaCreator);
+        mapEntityTypeWithData(EntityTypes1_19_4.ITEM_DISPLAY, EntityTypes1_19_4.ARMOR_STAND).spawnMetadata(displayMetaCreator);
+        mapEntityTypeWithData(EntityTypes1_19_4.BLOCK_DISPLAY, EntityTypes1_19_4.ARMOR_STAND).spawnMetadata(displayMetaCreator);
 
-        mapEntityTypeWithData(Entity1_19_4Types.INTERACTION, Entity1_19_4Types.ARMOR_STAND).spawnMetadata(displayMetaCreator); // Not much we can do about this one
+        mapEntityTypeWithData(EntityTypes1_19_4.INTERACTION, EntityTypes1_19_4.ARMOR_STAND).spawnMetadata(displayMetaCreator); // Not much we can do about this one
 
-        mapEntityTypeWithData(Entity1_19_4Types.SNIFFER, Entity1_19_4Types.RAVAGER).jsonName();
+        mapEntityTypeWithData(EntityTypes1_19_4.SNIFFER, EntityTypes1_19_4.RAVAGER).jsonName();
     }
 
     @Override
     public EntityType typeFromId(final int type) {
-        return Entity1_19_4Types.getTypeFromId(type);
+        return EntityTypes1_19_4.getTypeFromId(type);
     }
-}
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/Protocol1_19_4To1_20.java

@@ -0,0 +1,118 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2023 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.protocol.protocol1_19_4to1_20;
+
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.data.BackwardsMappings;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.packets.BlockItemPackets1_20;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.packets.EntityPackets1_20;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.RegistryType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import com.viaversion.viaversion.rewriter.TagRewriter;
+import java.util.Arrays;
+
+public final class Protocol1_19_4To1_20 extends BackwardsProtocol<ClientboundPackets1_19_4, ClientboundPackets1_19_4, ServerboundPackets1_19_4, ServerboundPackets1_19_4> {
+
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings();
+    private final TranslatableRewriter<ClientboundPackets1_19_4> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
+    private final EntityPackets1_20 entityRewriter = new EntityPackets1_20(this);
+    private final BlockItemPackets1_20 itemRewriter = new BlockItemPackets1_20(this);
+
+    public Protocol1_19_4To1_20() {
+        super(ClientboundPackets1_19_4.class, ClientboundPackets1_19_4.class, ServerboundPackets1_19_4.class, ServerboundPackets1_19_4.class);
+    }
+
+    @Override
+    protected void registerPackets() {
+        super.registerPackets();
+
+        final TagRewriter<ClientboundPackets1_19_4> tagRewriter = new TagRewriter<>(this);
+        tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:replaceable_plants");
+        tagRewriter.registerGeneric(ClientboundPackets1_19_4.TAGS);
+
+        final SoundRewriter<ClientboundPackets1_19_4> soundRewriter = new SoundRewriter<>(this);
+        soundRewriter.registerStopSound(ClientboundPackets1_19_4.STOP_SOUND);
+        soundRewriter.register1_19_3Sound(ClientboundPackets1_19_4.SOUND);
+        soundRewriter.registerSound(ClientboundPackets1_19_4.ENTITY_SOUND);
+
+        new StatisticsRewriter<>(this).register(ClientboundPackets1_19_4.STATISTICS);
+
+        //TODO open window
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.ACTIONBAR);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.TITLE_TEXT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.TITLE_SUBTITLE);
+        translatableRewriter.registerBossBar(ClientboundPackets1_19_4.BOSSBAR);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISCONNECT);
+        translatableRewriter.registerTabList(ClientboundPackets1_19_4.TAB_LIST);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.SYSTEM_CHAT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_4.DISGUISED_CHAT);
+        translatableRewriter.registerPing();
+
+        registerClientbound(ClientboundPackets1_19_4.UPDATE_ENABLED_FEATURES, wrapper -> {
+            String[] enabledFeatures = wrapper.read(Type.STRING_ARRAY);
+            final int length = enabledFeatures.length;
+            enabledFeatures = Arrays.copyOf(enabledFeatures, length + 1);
+            enabledFeatures[length] = "minecraft:update_1_20";
+            wrapper.write(Type.STRING_ARRAY, enabledFeatures);
+        });
+
+        registerClientbound(ClientboundPackets1_19_4.COMBAT_END, wrapper -> {
+            wrapper.passthrough(Type.VAR_INT); // Duration
+            wrapper.write(Type.INT, -1); // Killer ID - unused (who knows for how long?)
+        });
+        registerClientbound(ClientboundPackets1_19_4.COMBAT_KILL, wrapper -> {
+            wrapper.passthrough(Type.VAR_INT); // Duration
+            wrapper.write(Type.INT, -1); // Killer ID - unused (who knows for how long?)
+            translatableRewriter.processText(wrapper.passthrough(Type.COMPONENT));
+        });
+    }
+
+    @Override
+    public void init(final UserConnection user) {
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19_4.PLAYER));
+    }
+
+    @Override
+    public BackwardsMappings getMappingData() {
+        return MAPPINGS;
+    }
+
+    @Override
+    public EntityPackets1_20 getEntityRewriter() {
+        return entityRewriter;
+    }
+
+    @Override
+    public BlockItemPackets1_20 getItemRewriter() {
+        return itemRewriter;
+    }
+
+    @Override
+    public TranslatableRewriter<ClientboundPackets1_19_4> getTranslatableRewriter() {
+        return translatableRewriter;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/data/BackwardsMappings.java

@@ -0,0 +1,48 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2023 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.protocol.protocol1_19_4to1_20.data;
+
+import com.viaversion.viabackwards.api.data.VBMappingDataLoader;
+import com.viaversion.viaversion.libs.opennbt.NBTIO;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.protocols.protocol1_20to1_19_4.Protocol1_20To1_19_4;
+import java.io.IOException;
+
+public class BackwardsMappings extends com.viaversion.viabackwards.api.data.BackwardsMappings {
+
+    private CompoundTag trimPatternRegistry;
+
+    public BackwardsMappings() {
+        super("1.20", "1.19.4", Protocol1_20To1_19_4.class);
+    }
+
+    @Override
+    protected void loadExtras(CompoundTag data) {
+        super.loadExtras(data);
+
+        try {
+            trimPatternRegistry = NBTIO.readTag(VBMappingDataLoader.getResource("trim_pattern-1.19.4.nbt"));
+        } catch (final IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public CompoundTag getTrimPatternRegistry() {
+        return trimPatternRegistry;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/BlockItemPackets1_20.java

@@ -0,0 +1,230 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2023 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.protocol.protocol1_19_4to1_20.packets;
+
+import com.viaversion.viabackwards.api.rewriters.ItemRewriter;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.Protocol1_19_4To1_20;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.storage.BackSignEditStorage;
+import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
+import com.viaversion.viaversion.api.minecraft.Position;
+import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
+import com.viaversion.viaversion.api.minecraft.item.Item;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_18;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ServerboundPackets1_19_4;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.RecipeRewriter1_19_4;
+import com.viaversion.viaversion.rewriter.BlockRewriter;
+import com.viaversion.viaversion.util.Key;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public final class BlockItemPackets1_20 extends ItemRewriter<ClientboundPackets1_19_4, ServerboundPackets1_19_4, Protocol1_19_4To1_20> {
+
+    private static final Set<String> NEW_TRIM_PATTERNS = new HashSet<>(Arrays.asList("host", "raiser", "shaper", "silence", "wayfinder"));
+
+    public BlockItemPackets1_20(final Protocol1_19_4To1_20 protocol) {
+        super(protocol);
+    }
+
+    @Override
+    public void registerPackets() {
+        final BlockRewriter<ClientboundPackets1_19_4> blockRewriter = BlockRewriter.for1_14(protocol);
+        blockRewriter.registerBlockAction(ClientboundPackets1_19_4.BLOCK_ACTION);
+        blockRewriter.registerBlockChange(ClientboundPackets1_19_4.BLOCK_CHANGE);
+        blockRewriter.registerEffect(ClientboundPackets1_19_4.EFFECT, 1010, 2001);
+        blockRewriter.registerBlockEntityData(ClientboundPackets1_19_4.BLOCK_ENTITY_DATA, this::handleBlockEntity);
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.CHUNK_DATA, new PacketHandlers() {
+            @Override
+            protected void register() {
+                handler(blockRewriter.chunkDataHandler1_19(ChunkType1_18::new, BlockItemPackets1_20.this::handleBlockEntity));
+                create(Type.BOOLEAN, true); // Trust edges
+            }
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.UPDATE_LIGHT, wrapper -> {
+            wrapper.passthrough(Type.VAR_INT); // X
+            wrapper.passthrough(Type.VAR_INT); // Y
+            wrapper.write(Type.BOOLEAN, true); // Trust edges
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.MULTI_BLOCK_CHANGE, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.LONG); // Chunk position
+                create(Type.BOOLEAN, false); // Suppress light updates
+                handler(wrapper -> {
+                    for (final BlockChangeRecord record : wrapper.passthrough(Type.VAR_LONG_BLOCK_CHANGE_RECORD_ARRAY)) {
+                        record.setBlockId(protocol.getMappingData().getNewBlockStateId(record.getBlockId()));
+                    }
+                });
+            }
+        });
+
+        registerOpenWindow(ClientboundPackets1_19_4.OPEN_WINDOW);
+        registerSetCooldown(ClientboundPackets1_19_4.COOLDOWN);
+        registerWindowItems1_17_1(ClientboundPackets1_19_4.WINDOW_ITEMS);
+        registerSetSlot1_17_1(ClientboundPackets1_19_4.SET_SLOT);
+        registerEntityEquipmentArray(ClientboundPackets1_19_4.ENTITY_EQUIPMENT);
+        registerClickWindow1_17_1(ServerboundPackets1_19_4.CLICK_WINDOW);
+        registerTradeList1_19(ClientboundPackets1_19_4.TRADE_LIST);
+        registerCreativeInvAction(ServerboundPackets1_19_4.CREATIVE_INVENTORY_ACTION, Type.ITEM1_13_2);
+        registerWindowPropertyEnchantmentHandler(ClientboundPackets1_19_4.WINDOW_PROPERTY);
+        registerSpawnParticle1_19(ClientboundPackets1_19_4.SPAWN_PARTICLE);
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.ADVANCEMENTS, wrapper -> {
+            wrapper.passthrough(Type.BOOLEAN); // Reset/clear
+            int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
+            for (int i = 0; i < size; i++) {
+                wrapper.passthrough(Type.STRING); // Identifier
+
+                // Parent
+                if (wrapper.passthrough(Type.BOOLEAN))
+                    wrapper.passthrough(Type.STRING);
+
+                // Display data
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    wrapper.passthrough(Type.COMPONENT); // Title
+                    wrapper.passthrough(Type.COMPONENT); // Description
+                    handleItemToClient(wrapper.passthrough(Type.ITEM1_13_2)); // Icon
+                    wrapper.passthrough(Type.VAR_INT); // Frame type
+                    int flags = wrapper.passthrough(Type.INT); // Flags
+                    if ((flags & 1) != 0) {
+                        wrapper.passthrough(Type.STRING); // Background texture
+                    }
+                    wrapper.passthrough(Type.FLOAT); // X
+                    wrapper.passthrough(Type.FLOAT); // Y
+                }
+
+                wrapper.passthrough(Type.STRING_ARRAY); // Criteria
+
+                int arrayLength = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < arrayLength; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY); // String array
+                }
+
+                wrapper.read(Type.BOOLEAN); // Sends telemetry
+            }
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_SIGN_EDITOR, wrapper -> {
+            final Position position = wrapper.passthrough(Type.POSITION1_14);
+            final boolean frontSide = wrapper.read(Type.BOOLEAN);
+            if (frontSide) {
+                wrapper.user().remove(BackSignEditStorage.class);
+            } else {
+                wrapper.user().put(new BackSignEditStorage(position));
+            }
+        });
+        protocol.registerServerbound(ServerboundPackets1_19_4.UPDATE_SIGN, wrapper -> {
+            final Position position = wrapper.passthrough(Type.POSITION1_14);
+            final BackSignEditStorage backSignEditStorage = wrapper.user().remove(BackSignEditStorage.class);
+            final boolean frontSide = backSignEditStorage == null || !backSignEditStorage.position().equals(position);
+            wrapper.write(Type.BOOLEAN, frontSide);
+        });
+
+        new RecipeRewriter1_19_4<>(protocol).register(ClientboundPackets1_19_4.DECLARE_RECIPES);
+    }
+
+    @Override
+    public @Nullable Item handleItemToClient(@Nullable final Item item) {
+        if (item == null) {
+            return null;
+        }
+
+        super.handleItemToClient(item);
+
+        // Remove new trim tags
+        final Tag trimTag;
+        if (item.tag() != null && (trimTag = item.tag().get("Trim")) instanceof CompoundTag) {
+            final Tag patternTag = ((CompoundTag) trimTag).get("pattern");
+            if (patternTag instanceof StringTag) {
+                final StringTag patternStringTag = (StringTag) patternTag;
+                final String pattern = Key.stripMinecraftNamespace(patternStringTag.getValue());
+                if (NEW_TRIM_PATTERNS.contains(pattern)) {
+                    item.tag().remove("Trim");
+                    item.tag().put(nbtTagName + "|Trim", trimTag);
+                }
+            }
+        }
+        return item;
+    }
+
+    @Override
+    public @Nullable Item handleItemToServer(@Nullable final Item item) {
+        if (item == null) {
+            return null;
+        }
+
+        super.handleItemToServer(item);
+
+        // Add back original trim tag
+        final Tag trimTag;
+        if (item.tag() != null && (trimTag = item.tag().remove(nbtTagName + "|Trim")) != null) {
+            item.tag().put("Trim", trimTag);
+        }
+        return item;
+    }
+
+    private void handleBlockEntity(final BlockEntity blockEntity) {
+        // Check for signs
+        if (blockEntity.typeId() != 7 && blockEntity.typeId() != 8) {
+            return;
+        }
+
+        final CompoundTag tag = blockEntity.tag();
+        final CompoundTag frontText = tag.remove("front_text");
+        tag.remove("back_text");
+
+        if (frontText != null) {
+            writeMessages(frontText, tag, false);
+            writeMessages(frontText, tag, true);
+
+            final Tag color = frontText.remove("color");
+            if (color != null) {
+                tag.put("Color", color);
+            }
+
+            final Tag glowing = frontText.remove("has_glowing_text");
+            if (glowing != null) {
+                tag.put("GlowingText", glowing);
+            }
+        }
+    }
+
+    private void writeMessages(final CompoundTag frontText, final CompoundTag tag, final boolean filtered) {
+        final ListTag messages = frontText.get(filtered ? "filtered_messages" : "messages");
+        if (messages == null) {
+            return;
+        }
+
+        int i = 0;
+        for (final Tag message : messages) {
+            tag.put((filtered ? "FilteredText" : "Text") + ++i, message);
+        }
+
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/packets/EntityPackets1_20.java

@@ -0,0 +1,158 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2023 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.protocol.protocol1_19_4to1_20.packets;
+
+import com.google.common.collect.Sets;
+import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
+import com.viaversion.viabackwards.protocol.protocol1_19_4to1_20.Protocol1_19_4To1_20;
+import com.viaversion.viaversion.api.minecraft.Quaternion;
+import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19_4;
+import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.api.type.types.version.Types1_19_4;
+import com.viaversion.viaversion.api.type.types.version.Types1_20;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4;
+import com.viaversion.viaversion.util.Key;
+
+import java.util.Set;
+
+public final class EntityPackets1_20 extends EntityRewriter<ClientboundPackets1_19_4, Protocol1_19_4To1_20> {
+
+    private final Set<String> newTrimPatterns = Sets.newHashSet("host_armor_trim_smithing_template", "raiser_armor_trim_smithing_template",
+            "silence_armor_trim_smithing_template", "shaper_armor_trim_smithing_template", "wayfinder_armor_trim_smithing_template");
+    private static final Quaternion Y_FLIPPED_ROTATION = new Quaternion(0, 1, 0, 0);
+
+    public EntityPackets1_20(final Protocol1_19_4To1_20 protocol) {
+        super(protocol, Types1_19_4.META_TYPES.optionalComponentType, Types1_19_4.META_TYPES.booleanType);
+    }
+
+    @Override
+    public void registerPackets() {
+        registerTrackerWithData1_19(ClientboundPackets1_19_4.SPAWN_ENTITY, EntityTypes1_19_4.FALLING_BLOCK);
+        registerMetadataRewriter(ClientboundPackets1_19_4.ENTITY_METADATA, Types1_20.METADATA_LIST, Types1_19_4.METADATA_LIST);
+        registerRemoveEntities(ClientboundPackets1_19_4.REMOVE_ENTITIES);
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.JOIN_GAME, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.INT); // Entity id
+                map(Type.BOOLEAN); // Hardcore
+                map(Type.BYTE); // Gamemode
+                map(Type.BYTE); // Previous Gamemode
+                map(Type.STRING_ARRAY); // World List
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
+                map(Type.STRING); // Dimension key
+                map(Type.STRING); // World
+                map(Type.LONG); // Seed
+                map(Type.VAR_INT); // Max players
+                map(Type.VAR_INT); // Chunk radius
+                map(Type.VAR_INT); // Simulation distance
+                map(Type.BOOLEAN); // Reduced debug info
+                map(Type.BOOLEAN); // Show death screen
+                map(Type.BOOLEAN); // Debug
+                map(Type.BOOLEAN); // Flat
+                map(Type.OPTIONAL_GLOBAL_POSITION); // Last death location
+                read(Type.VAR_INT); // Portal cooldown
+
+                handler(dimensionDataHandler()); // Caches dimensions to access data like height later
+                handler(biomeSizeTracker()); // Tracks the amount of biomes sent for chunk data
+                handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
+                handler(wrapper -> {
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
+
+                    ListTag values;
+                    // A 1.20 server can't send this element, and the 1.20 client still works, if the element is missing
+                    // on a 1.19.4 client there is an exception, so in case the 1.20 server doesn't send the element we put in an original 1.20 element
+                    if (registry.contains("minecraft:trim_pattern")) {
+                        values = ((CompoundTag) registry.get("minecraft:trim_pattern")).get("value");
+                    } else {
+                        final CompoundTag trimPatternRegistry = Protocol1_19_4To1_20.MAPPINGS.getTrimPatternRegistry().clone();
+                        registry.put("minecraft:trim_pattern", trimPatternRegistry);
+                        values = trimPatternRegistry.get("value");
+                    }
+                    for (final Tag entry : values) {
+                        final CompoundTag element = ((CompoundTag) entry).get("element");
+                        final StringTag templateItem = element.get("template_item");
+                        if (newTrimPatterns.contains(Key.stripMinecraftNamespace(templateItem.getValue()))) {
+                            templateItem.setValue("minecraft:spire_armor_trim_smithing_template");
+                        }
+                    }
+                });
+            }
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_19_4.RESPAWN, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.STRING); // Dimension
+                map(Type.STRING); // World
+                map(Type.LONG); // Seed
+                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Previous gamemode
+                map(Type.BOOLEAN); // Debug
+                map(Type.BOOLEAN); // Flat
+                map(Type.BYTE); // Data to keep
+                map(Type.OPTIONAL_GLOBAL_POSITION); // Last death location
+                read(Type.VAR_INT); // Portal cooldown
+                handler(worldDataTrackerHandlerByKey()); // Tracks world height and name for chunk data and entity (un)tracking
+            }
+        });
+    }
+
+    @Override
+    protected void registerRewrites() {
+        filter().handler((event, meta) -> meta.setMetaType(Types1_19_4.META_TYPES.byId(meta.metaType().typeId())));
+        registerMetaTypeHandler(Types1_19_4.META_TYPES.itemType, Types1_19_4.META_TYPES.blockStateType, Types1_19_4.META_TYPES.optionalBlockStateType,
+                Types1_19_4.META_TYPES.particleType, Types1_19_4.META_TYPES.componentType, Types1_19_4.META_TYPES.optionalComponentType);
+
+        filter().filterFamily(EntityTypes1_19_4.MINECART_ABSTRACT).index(11).handler((event, meta) -> {
+            final int blockState = meta.value();
+            meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState));
+        });
+
+        // Rotate item display by 180 degrees around the Y axis
+        filter().filterFamily(EntityTypes1_19_4.ITEM_DISPLAY).handler((event, meta) -> {
+            if (event.trackedEntity().hasSentMetadata() || event.hasExtraMeta()) {
+                return;
+            }
+
+            if (event.metaAtIndex(12) == null) {
+                event.createExtraMeta(new Metadata(12, Types1_19_4.META_TYPES.quaternionType, Y_FLIPPED_ROTATION));
+            }
+        });
+        filter().filterFamily(EntityTypes1_19_4.ITEM_DISPLAY).index(12).handler((event, meta) -> {
+            final Quaternion quaternion = meta.value();
+            meta.setValue(rotateY180(quaternion));
+        });
+    }
+
+    @Override
+    public EntityType typeFromId(final int type) {
+        return EntityTypes1_19_4.getTypeFromId(type);
+    }
+
+    private Quaternion rotateY180(final Quaternion quaternion) {
+        return new Quaternion(-quaternion.z(), quaternion.w(), quaternion.x(), -quaternion.y());
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19_4to1_20/storage/BackSignEditStorage.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2023 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.protocol.protocol1_19_4to1_20.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+import com.viaversion.viaversion.api.minecraft.Position;
+
+public final class BackSignEditStorage implements StorableObject {
+
+    private final Position position;
+
+    public BackSignEditStorage(final Position position) {
+        this.position = position;
+    }
+
+    public Position position() {
+        return position;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19to1_19_1/Protocol1_19To1_19_1.java

@@ -26,10 +26,15 @@ import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.storage.ChatReg
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.storage.ChatRegistryStorage1_19_1;
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.storage.NonceStorage;
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.storage.ReceivedMessagesStorage;
+import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.PlayerMessageSignature;
 import com.viaversion.viaversion.api.minecraft.ProfileKey;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
+import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
+import com.viaversion.viaversion.api.minecraft.signature.model.DecoratableMessage;
+import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
+import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19_1;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
@@ -42,12 +47,7 @@ import com.viaversion.viaversion.libs.kyori.adventure.text.format.NamedTextColor
 import com.viaversion.viaversion.libs.kyori.adventure.text.format.Style;
 import com.viaversion.viaversion.libs.kyori.adventure.text.format.TextDecoration;
 import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ByteTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.ListTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.NumberTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.StringTag;
-import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.*;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
@@ -55,11 +55,14 @@ import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ServerboundPacke
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ServerboundPackets1_19;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.packets.EntityPackets;
+import com.viaversion.viaversion.rewriter.ComponentRewriter;
 import com.viaversion.viaversion.util.CipherUtil;
+import com.viaversion.viaversion.util.Pair;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPackets1_19_1, ClientboundPackets1_19, ServerboundPackets1_19_1, ServerboundPackets1_19> {
 
@@ -68,7 +71,7 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
     private static final UUID ZERO_UUID = new UUID(0, 0);
     private static final byte[] EMPTY_BYTES = new byte[0];
     private final EntityPackets1_19_1 entityRewriter = new EntityPackets1_19_1(this);
-    private final TranslatableRewriter<ClientboundPackets1_19_1> translatableRewriter = new TranslatableRewriter<>(this);
+    private final TranslatableRewriter<ClientboundPackets1_19_1> translatableRewriter = new TranslatableRewriter<>(this, ComponentRewriter.ReadType.JSON);
 
     public Protocol1_19To1_19_1() {
         super(ClientboundPackets1_19_1.class, ClientboundPackets1_19.class, ServerboundPackets1_19_1.class, ServerboundPackets1_19.class);
@@ -80,7 +83,7 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.TITLE_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.TITLE_SUBTITLE);
         translatableRewriter.registerBossBar(ClientboundPackets1_19_1.BOSSBAR);
-        translatableRewriter.registerDisconnect(ClientboundPackets1_19_1.DISCONNECT);
+        translatableRewriter.registerComponentPacket(ClientboundPackets1_19_1.DISCONNECT);
         translatableRewriter.registerTabList(ClientboundPackets1_19_1.TAB_LIST);
         translatableRewriter.registerOpenWindow(ClientboundPackets1_19_1.OPEN_WINDOW);
         translatableRewriter.registerCombatKill(ClientboundPackets1_19_1.COMBAT_KILL);
@@ -93,17 +96,17 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
             public void register() {
                 map(Type.INT); // Entity ID
                 map(Type.BOOLEAN); // Hardcore
-                map(Type.UNSIGNED_BYTE); // Gamemode
+                map(Type.BYTE); // Gamemode
                 map(Type.BYTE); // Previous Gamemode
                 map(Type.STRING_ARRAY); // World List
-                map(Type.NBT); // Dimension registry
+                map(Type.NAMED_COMPOUND_TAG); // Dimension registry
                 map(Type.STRING); // Dimension key
                 map(Type.STRING); // World
                 handler(wrapper -> {
                     final ChatRegistryStorage chatTypeStorage = wrapper.user().get(ChatRegistryStorage1_19_1.class);
                     chatTypeStorage.clear();
 
-                    final CompoundTag registry = wrapper.get(Type.NBT, 0);
+                    final CompoundTag registry = wrapper.get(Type.NAMED_COMPOUND_TAG, 0);
                     final ListTag chatTypes = ((CompoundTag) registry.get("minecraft:chat_type")).get("value");
                     for (final Tag chatType : chatTypes) {
                         final CompoundTag chatTypeCompound = (CompoundTag) chatType;
@@ -193,12 +196,29 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
                 map(Type.STRING); // Message
                 map(Type.LONG); // Timestamp
                 map(Type.LONG); // Salt
-                // Set empty signature
-                read(Type.BYTE_ARRAY_PRIMITIVE);
-                create(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES);
-                map(Type.BOOLEAN); // Signed preview
+                read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
+                read(Type.BOOLEAN); // Signed preview
                 handler(wrapper -> {
+                    final ChatSession1_19_1 chatSession = wrapper.user().get(ChatSession1_19_1.class);
                     final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
+
+                    if (chatSession != null) {
+                        final UUID sender = wrapper.user().getProtocolInfo().getUuid();
+                        final String message = wrapper.get(Type.STRING, 0);
+                        final long timestamp = wrapper.get(Type.LONG, 0);
+                        final long salt = wrapper.get(Type.LONG, 1);
+
+                        final MessageMetadata metadata = new MessageMetadata(sender, timestamp, salt);
+                        final DecoratableMessage decoratableMessage = new DecoratableMessage(message);
+                        final byte[] signature = chatSession.signChatMessage(metadata, decoratableMessage, messagesStorage.lastSignatures());
+
+                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature); // Signature
+                        wrapper.write(Type.BOOLEAN, decoratableMessage.isDecorated()); // Signed preview
+                    } else {
+                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES); // Signature
+                        wrapper.write(Type.BOOLEAN, false); // Signed preview
+                    }
+
                     messagesStorage.resetUnacknowledgedCount();
                     wrapper.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
                     wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null); // No last unacknowledged
@@ -213,18 +233,45 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
                 map(Type.LONG); // Timestamp
                 map(Type.LONG); // Salt
                 handler(wrapper -> {
-                    final int signatures = wrapper.passthrough(Type.VAR_INT);
-                    for (int i = 0; i < signatures; i++) {
-                        wrapper.passthrough(Type.STRING); // Argument name
+                    final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
+                    final ChatSession1_19_1 chatSession = wrapper.user().get(ChatSession1_19_1.class);
+                    final SignableCommandArgumentsProvider argumentsProvider = Via.getManager().getProviders().get(SignableCommandArgumentsProvider.class);
 
-                        // Set empty signature
-                        wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
-                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES);
+                    if (chatSession != null && argumentsProvider != null) {
+                        final int signatures = wrapper.read(Type.VAR_INT);
+                        for (int i = 0; i < signatures; i++) {
+                            wrapper.read(Type.STRING); // Argument name
+                            wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
+                        }
+
+                        final UUID sender = wrapper.user().getProtocolInfo().getUuid();
+                        final String command = wrapper.get(Type.STRING, 0);
+                        final long timestamp = wrapper.get(Type.LONG, 0);
+                        final long salt = wrapper.get(Type.LONG, 1);
+
+                        final MessageMetadata metadata = new MessageMetadata(sender, timestamp, salt);
+
+                        final List<Pair<String, String>> arguments = argumentsProvider.getSignableArguments(command);
+                        wrapper.write(Type.VAR_INT, arguments.size());
+                        for (final Pair<String, String> argument : arguments) {
+                            final byte[] signature = chatSession.signChatMessage(metadata, new DecoratableMessage(argument.value()), messagesStorage.lastSignatures());
+
+                            wrapper.write(Type.STRING, argument.key());
+                            wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, signature);
+                        }
+                    } else {
+                        final int signatures = wrapper.passthrough(Type.VAR_INT);
+                        for (int i = 0; i < signatures; i++) {
+                            wrapper.passthrough(Type.STRING); // Argument name
+
+                            // Set empty signature
+                            wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
+                            wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, EMPTY_BYTES);
+                        }
                     }
 
                     wrapper.passthrough(Type.BOOLEAN); // Signed preview
 
-                    final ReceivedMessagesStorage messagesStorage = wrapper.user().get(ReceivedMessagesStorage.class);
                     messagesStorage.resetUnacknowledgedCount();
                     wrapper.write(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY, messagesStorage.lastSignatures());
                     wrapper.write(Type.OPTIONAL_PLAYER_MESSAGE_SIGNATURE, null); // No last unacknowledged
@@ -247,14 +294,16 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
             public void register() {
                 map(Type.STRING); // Name
                 handler(wrapper -> {
-                    final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY);
-                    if (profileKey == null) {
+                    final ProfileKey profileKey = wrapper.read(Type.OPTIONAL_PROFILE_KEY); // Profile Key
+
+                    final ChatSession1_19_1 chatSession = wrapper.user().get(ChatSession1_19_1.class);
+                    wrapper.write(Type.OPTIONAL_PROFILE_KEY, chatSession == null ? null : chatSession.getProfileKey()); // Profile Key
+                    wrapper.write(Type.OPTIONAL_UUID, chatSession == null ? null : chatSession.getUuid()); // Profile uuid
+
+                    if (profileKey == null || chatSession != null) {
                         wrapper.user().put(new NonceStorage(null));
                     }
                 });
-                // Write empty profile key and uuid (since keys are not compatible) - requires the enforce-secure-profiles option to be disabled on the server
-                create(Type.OPTIONAL_PROFILE_KEY, null);
-                create(Type.OPTIONAL_UUID, null);
             }
         });
 
@@ -263,8 +312,7 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
             public void register() {
                 map(Type.STRING); // Server id
                 handler(wrapper -> {
-                    if (wrapper.user().get(NonceStorage.class) != null) {
-                        // Is already using the encrypted nonce
+                    if (wrapper.user().has(NonceStorage.class)) {
                         return;
                     }
 
@@ -281,21 +329,17 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
                 map(Type.BYTE_ARRAY_PRIMITIVE); // Key
                 handler(wrapper -> {
                     final NonceStorage nonceStorage = wrapper.user().remove(NonceStorage.class);
-                    final boolean isNonce = wrapper.read(Type.BOOLEAN);
-                    wrapper.write(Type.BOOLEAN, true);
-                    if (isNonce) {
-                        // Nonce, just pass it through
-                        wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE);
+                    if (nonceStorage.nonce() == null) {
                         return;
                     }
 
-                    if (nonceStorage == null || nonceStorage.nonce() == null) {
-                        throw new IllegalArgumentException("Server sent nonce is missing");
+                    final boolean isNonce = wrapper.read(Type.BOOLEAN);
+                    wrapper.write(Type.BOOLEAN, true);
+                    if (!isNonce) { // Should never be true at this point, but /shrug otherwise
+                        wrapper.read(Type.LONG); // Salt
+                        wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
+                        wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, nonceStorage.nonce());
                     }
-
-                    wrapper.read(Type.LONG); // Salt
-                    wrapper.read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
-                    wrapper.write(Type.BYTE_ARRAY_PRIMITIVE, nonceStorage.nonce());
                 });
             }
         });
@@ -339,7 +383,7 @@ public final class Protocol1_19To1_19_1 extends BackwardsProtocol<ClientboundPac
     public void init(final UserConnection user) {
         user.put(new ChatRegistryStorage1_19_1());
         user.put(new ReceivedMessagesStorage());
-        addEntityTracker(user, new EntityTrackerBase(user, Entity1_19Types.PLAYER));
+        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19.PLAYER));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_19to1_19_1/packets/EntityPackets1_19_1.java

@@ -19,7 +19,7 @@ package com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.packets;
 
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.protocol1_19to1_19_1.Protocol1_19To1_19_1;
-import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
 import com.viaversion.viaversion.protocols.protocol1_19_1to1_19.ClientboundPackets1_19_1;
@@ -39,13 +39,13 @@ public final class EntityPackets1_19_1 extends EntityRewriter<ClientboundPackets
 
     @Override
     public void registerRewrites() {
-        filter().type(Entity1_19Types.ALLAY).cancel(16); // Dancing
-        filter().type(Entity1_19Types.ALLAY).cancel(17); // Can duplicate
+        filter().type(EntityTypes1_19.ALLAY).cancel(16); // Dancing
+        filter().type(EntityTypes1_19.ALLAY).cancel(17); // Can duplicate
     }
 
     @Override
     public EntityType typeFromId(final int typeId) {
-        return Entity1_19Types.getTypeFromId(typeId);
+        return EntityTypes1_19.getTypeFromId(typeId);
     }
 
 }

common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java

@@ -0,0 +1,388 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2023 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.protocol.protocol1_20_2to1_20_3;
+
+import com.viaversion.viabackwards.api.BackwardsProtocol;
+import com.viaversion.viabackwards.api.data.BackwardsMappings;
+import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
+import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
+import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter.BlockItemPacketRewriter1_20_3;
+import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter.EntityPacketRewriter1_20_3;
+import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.storage.ResourcepackIDStorage;
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_3;
+import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
+import com.viaversion.viaversion.api.protocol.packet.State;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandler;
+import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
+import com.viaversion.viaversion.api.type.Type;
+import com.viaversion.viaversion.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.rewriter.CommandRewriter1_19_4;
+import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundConfigurationPackets1_20_2;
+import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ClientboundPackets1_20_2;
+import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundConfigurationPackets1_20_2;
+import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.ServerboundPackets1_20_2;
+import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2;
+import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundConfigurationPackets1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3;
+import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3;
+import com.viaversion.viaversion.rewriter.ComponentRewriter.ReadType;
+import com.viaversion.viaversion.rewriter.StatisticsRewriter;
+import java.util.BitSet;
+import java.util.UUID;
+
+public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundPackets1_20_3, ClientboundPackets1_20_2, ServerboundPackets1_20_3, ServerboundPackets1_20_2> {
+
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.20.3", "1.20.2", Protocol1_20_3To1_20_2.class);
+    private final EntityPacketRewriter1_20_3 entityRewriter = new EntityPacketRewriter1_20_3(this);
+    private final BlockItemPacketRewriter1_20_3 itemRewriter = new BlockItemPacketRewriter1_20_3(this);
+    private final TranslatableRewriter<ClientboundPackets1_20_3> translatableRewriter = new TranslatableRewriter<>(this, ReadType.NBT);
+
+    public Protocol1_20_2To1_20_3() {
+        super(ClientboundPackets1_20_3.class, ClientboundPackets1_20_2.class, ServerboundPackets1_20_3.class, ServerboundPackets1_20_2.class);
+    }
+
+    @Override
+    protected void registerPackets() {
+        super.registerPackets();
+
+        final SoundRewriter<ClientboundPackets1_20_3> soundRewriter = new SoundRewriter<>(this);
+        soundRewriter.register1_19_3Sound(ClientboundPackets1_20_3.SOUND);
+        soundRewriter.registerEntitySound(ClientboundPackets1_20_3.ENTITY_SOUND);
+        soundRewriter.registerStopSound(ClientboundPackets1_20_3.STOP_SOUND);
+
+        new StatisticsRewriter<>(this).register(ClientboundPackets1_20_3.STATISTICS);
+        new CommandRewriter1_19_4<ClientboundPackets1_20_3>(this) {
+            @Override
+            public void handleArgument(final PacketWrapper wrapper, final String argumentType) throws Exception {
+                if (argumentType.equals("minecraft:style")) {
+                    wrapper.write(Type.VAR_INT, 1); // Phrase
+                } else {
+                    super.handleArgument(wrapper, argumentType);
+                }
+            }
+        }.registerDeclareCommands1_19(ClientboundPackets1_20_3.DECLARE_COMMANDS);
+
+        registerClientbound(ClientboundPackets1_20_3.RESET_SCORE, ClientboundPackets1_20_2.UPDATE_SCORE, wrapper -> {
+            wrapper.passthrough(Type.STRING); // Owner
+            wrapper.write(Type.BYTE, (byte) 1); // Reset score
+            wrapper.passthrough(Type.STRING); // Objective name
+        });
+        registerClientbound(ClientboundPackets1_20_3.UPDATE_SCORE, wrapper -> {
+            wrapper.passthrough(Type.STRING); // Owner
+            wrapper.write(Type.BYTE, (byte) 0); // Change score
+            wrapper.passthrough(Type.STRING); // Objective name
+            wrapper.passthrough(Type.VAR_INT); // Score
+
+            // Remove display and number format
+            wrapper.clearInputBuffer();
+        });
+        registerClientbound(ClientboundPackets1_20_3.SCOREBOARD_OBJECTIVE, wrapper -> {
+            wrapper.passthrough(Type.STRING); // Objective Name
+            final byte action = wrapper.passthrough(Type.BYTE); // Method
+            if (action == 0 || action == 2) {
+                convertComponent(wrapper); // Display Name
+                wrapper.passthrough(Type.VAR_INT); // Render type
+
+                // Remove number format
+                wrapper.clearInputBuffer();
+            }
+        });
+
+        cancelClientbound(ClientboundPackets1_20_3.TICKING_STATE);
+        cancelClientbound(ClientboundPackets1_20_3.TICKING_STEP);
+
+        registerServerbound(ServerboundPackets1_20_2.UPDATE_JIGSAW_BLOCK, wrapper -> {
+            wrapper.passthrough(Type.POSITION1_14); // Position
+            wrapper.passthrough(Type.STRING); // Name
+            wrapper.passthrough(Type.STRING); // Target
+            wrapper.passthrough(Type.STRING); // Pool
+            wrapper.passthrough(Type.STRING); // Final state
+            wrapper.passthrough(Type.STRING); // Joint type
+            wrapper.write(Type.VAR_INT, 0); // Selection priority
+            wrapper.write(Type.VAR_INT, 0); // Placement priority
+        });
+
+        // Components are now (mostly) written as nbt instead of json strings
+        registerClientbound(ClientboundPackets1_20_3.ADVANCEMENTS, wrapper -> {
+            wrapper.passthrough(Type.BOOLEAN); // Reset/clear
+            final int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
+            for (int i = 0; i < size; i++) {
+                wrapper.passthrough(Type.STRING); // Identifier
+
+                // Parent
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    wrapper.passthrough(Type.STRING);
+                }
+
+                // Display data
+                if (wrapper.passthrough(Type.BOOLEAN)) {
+                    convertComponent(wrapper); // Title
+                    convertComponent(wrapper); // Description
+                    itemRewriter.handleItemToClient(wrapper.passthrough(Type.ITEM1_20_2)); // Icon
+                    wrapper.passthrough(Type.VAR_INT); // Frame type
+                    final int flags = wrapper.passthrough(Type.INT);
+                    if ((flags & 1) != 0) {
+                        wrapper.passthrough(Type.STRING); // Background texture
+                    }
+                    wrapper.passthrough(Type.FLOAT); // X
+                    wrapper.passthrough(Type.FLOAT); // Y
+                }
+
+                final int requirements = wrapper.passthrough(Type.VAR_INT);
+                for (int array = 0; array < requirements; array++) {
+                    wrapper.passthrough(Type.STRING_ARRAY);
+                }
+
+                wrapper.passthrough(Type.BOOLEAN); // Send telemetry
+            }
+        });
+        registerClientbound(ClientboundPackets1_20_3.TAB_COMPLETE, wrapper -> {
+            wrapper.passthrough(Type.VAR_INT); // Transaction id
+            wrapper.passthrough(Type.VAR_INT); // Start
+            wrapper.passthrough(Type.VAR_INT); // Length
+
+            final int suggestions = wrapper.passthrough(Type.VAR_INT);
+            for (int i = 0; i < suggestions; i++) {
+                wrapper.passthrough(Type.STRING); // Suggestion
+                convertOptionalComponent(wrapper); // Tooltip
+            }
+        });
+        registerClientbound(ClientboundPackets1_20_3.MAP_DATA, wrapper -> {
+            wrapper.passthrough(Type.VAR_INT); // Map id
+            wrapper.passthrough(Type.BYTE); // Scale
+            wrapper.passthrough(Type.BOOLEAN); // Locked
+            if (wrapper.passthrough(Type.BOOLEAN)) {
+                final int icons = wrapper.passthrough(Type.VAR_INT);
+                for (int i = 0; i < icons; i++) {
+                    wrapper.passthrough(Type.BYTE); // Type
+                    wrapper.passthrough(Type.BYTE); // X
+                    wrapper.passthrough(Type.BYTE); // Y
+                    wrapper.passthrough(Type.BYTE); // Rotation
+                    convertOptionalComponent(wrapper); // Display name
+                }
+            }
+        });
+        registerClientbound(ClientboundPackets1_20_3.BOSSBAR, wrapper -> {
+            wrapper.passthrough(Type.UUID); // Id
+
+            final int action = wrapper.passthrough(Type.VAR_INT);
+            if (action == 0 || action == 3) {
+                convertComponent(wrapper);
+            }
+        });
+        registerClientbound(ClientboundPackets1_20_3.PLAYER_CHAT, wrapper -> {
+            wrapper.passthrough(Type.UUID); // Sender
+            wrapper.passthrough(Type.VAR_INT); // Index
+            wrapper.passthrough(Type.OPTIONAL_SIGNATURE_BYTES); // Signature
+            wrapper.passthrough(Type.STRING); // Plain content
+            wrapper.passthrough(Type.LONG); // Timestamp
+            wrapper.passthrough(Type.LONG); // Salt
+
+            final int lastSeen = wrapper.passthrough(Type.VAR_INT);
+            for (int i = 0; i < lastSeen; i++) {
+                final int index = wrapper.passthrough(Type.VAR_INT);
+                if (index == 0) {
+                    wrapper.passthrough(Type.SIGNATURE_BYTES);
+                }
+            }
+
+            convertOptionalComponent(wrapper); // Unsigned content
+
+            final int filterMaskType = wrapper.passthrough(Type.VAR_INT);
+            if (filterMaskType == 2) {
+                wrapper.passthrough(Type.LONG_ARRAY_PRIMITIVE); // Mask
+            }
+
+            wrapper.passthrough(Type.VAR_INT); // Chat type
+            convertComponent(wrapper); // Sender
+            convertOptionalComponent(wrapper); // Target
+        });
+        registerClientbound(ClientboundPackets1_20_3.TEAMS, wrapper -> {
+            wrapper.passthrough(Type.STRING); // Team Name
+            final byte action = wrapper.passthrough(Type.BYTE); // Mode
+            if (action == 0 || action == 2) {
+                convertComponent(wrapper); // Display Name
+                wrapper.passthrough(Type.BYTE); // Flags
+                wrapper.passthrough(Type.STRING); // Name Tag Visibility
+                wrapper.passthrough(Type.STRING); // Collision rule
+                wrapper.passthrough(Type.VAR_INT); // Color
+                convertComponent(wrapper); // Prefix
+                convertComponent(wrapper); // Suffix
+            }
+        });
+
+        registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_2.DISCONNECT.getId(), ClientboundConfigurationPackets1_20_2.DISCONNECT.getId(), this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.DISCONNECT, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.RESOURCE_PACK_PUSH, ClientboundPackets1_20_2.RESOURCE_PACK, resourcePackHandler());
+        registerClientbound(ClientboundPackets1_20_3.SERVER_DATA, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.ACTIONBAR, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.TITLE_TEXT, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.TITLE_SUBTITLE, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.DISGUISED_CHAT, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.SYSTEM_CHAT, this::convertComponent);
+        registerClientbound(ClientboundPackets1_20_3.OPEN_WINDOW, wrapper -> {
+            wrapper.passthrough(Type.VAR_INT); // Container id
+
+            final int containerTypeId = wrapper.read(Type.VAR_INT);
+            final int mappedContainerTypeId = MAPPINGS.getMenuMappings().getNewId(containerTypeId);
+            if (mappedContainerTypeId == -1) {
+                wrapper.cancel();
+                return;
+            }
+
+            wrapper.write(Type.VAR_INT, mappedContainerTypeId);
+
+            convertComponent(wrapper);
+        });
+        registerClientbound(ClientboundPackets1_20_3.TAB_LIST, wrapper -> {
+            convertComponent(wrapper);
+            convertComponent(wrapper);
+        });
+
+        registerClientbound(ClientboundPackets1_20_3.COMBAT_KILL, new PacketHandlers() {
+            @Override
+            public void register() {
+                map(Type.VAR_INT); // Duration
+                handler(wrapper -> convertComponent(wrapper));
+            }
+        });
+        registerClientbound(ClientboundPackets1_20_3.PLAYER_INFO_UPDATE, wrapper -> {
+            final BitSet actions = wrapper.passthrough(Type.PROFILE_ACTIONS_ENUM);
+            final int entries = wrapper.passthrough(Type.VAR_INT);
+            for (int i = 0; i < entries; i++) {
+                wrapper.passthrough(Type.UUID);
+                if (actions.get(0)) {
+                    wrapper.passthrough(Type.STRING); // Player Name
+
+                    final int properties = wrapper.passthrough(Type.VAR_INT);
+                    for (int j = 0; j < properties; j++) {
+                        wrapper.passthrough(Type.STRING); // Name
+                        wrapper.passthrough(Type.STRING); // Value
+                        wrapper.passthrough(Type.OPTIONAL_STRING); // Signature
+                    }
+                }
+                if (actions.get(1) && wrapper.passthrough(Type.BOOLEAN)) {
+                    wrapper.passthrough(Type.UUID); // Session UUID
+                    wrapper.passthrough(Type.PROFILE_KEY);
+                }
+                if (actions.get(2)) {
+                    wrapper.passthrough(Type.VAR_INT); // Gamemode
+                }
+                if (actions.get(3)) {
+                    wrapper.passthrough(Type.BOOLEAN); // Listed
+                }
+                if (actions.get(4)) {
+                    wrapper.passthrough(Type.VAR_INT); // Latency
+                }
+                if (actions.get(5)) {
+                    convertOptionalComponent(wrapper); // Display name
+                }
+            }
+        });
+
+        cancelClientbound(ClientboundPackets1_20_3.RESOURCE_PACK_POP);
+        registerServerbound(ServerboundPackets1_20_2.RESOURCE_PACK_STATUS, resourcePackStatusHandler());
+
+        cancelClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.RESOURCE_PACK_POP.getId());
+        registerServerbound(State.CONFIGURATION, ServerboundConfigurationPackets1_20_2.RESOURCE_PACK, resourcePackStatusHandler());
+        registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.RESOURCE_PACK_PUSH.getId(), ServerboundConfigurationPackets1_20_2.RESOURCE_PACK.getId(), resourcePackHandler());
+        // TODO Auto map via packet types provider
+        registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.UPDATE_ENABLED_FEATURES.getId(), ClientboundConfigurationPackets1_20_2.UPDATE_ENABLED_FEATURES.getId());
+        registerClientbound(State.CONFIGURATION, ClientboundConfigurationPackets1_20_3.UPDATE_TAGS.getId(), ClientboundConfigurationPackets1_20_2.UPDATE_TAGS.getId());
+    }
+
+    private PacketHandler resourcePackStatusHandler() {
+        return wrapper -> {
+            final ResourcepackIDStorage storage = wrapper.user().get(ResourcepackIDStorage.class);
+            wrapper.write(Type.UUID, storage != null ? storage.uuid() : UUID.randomUUID());
+
+            final int action = wrapper.read(Type.VAR_INT);
+            if (action == 4) { // Downloaded
+                wrapper.cancel();
+            } else if (action > 4) { // Invalid url, failed reload, and discarded
+                wrapper.write(Type.VAR_INT, 2); // Failed download
+            } else {
+                wrapper.write(Type.VAR_INT, action);
+            }
+        };
+    }
+
+
+    private PacketHandler resourcePackHandler() {
+        return wrapper -> {
+            final UUID uuid = wrapper.read(Type.UUID);
+            wrapper.user().put(new ResourcepackIDStorage(uuid));
+
+            wrapper.passthrough(Type.STRING); // Url
+            wrapper.passthrough(Type.STRING); // Hash
+            wrapper.passthrough(Type.BOOLEAN); // Required
+            convertOptionalComponent(wrapper);
+        };
+    }
+
+    private void convertComponent(final PacketWrapper wrapper) throws Exception {
+        final Tag tag = wrapper.read(Type.TAG);
+        translatableRewriter.processTag(tag);
+        wrapper.write(Type.COMPONENT, Protocol1_20_3To1_20_2.tagComponentToJson(tag));
+    }
+
+    private void convertOptionalComponent(final PacketWrapper wrapper) throws Exception {
+        final Tag tag = wrapper.read(Type.OPTIONAL_TAG);
+        translatableRewriter.processTag(tag);
+        wrapper.write(Type.OPTIONAL_COMPONENT, Protocol1_20_3To1_20_2.tagComponentToJson(tag));
+    }
+
+    @Override
+    public void init(final UserConnection connection) {
+        addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_20_3.PLAYER));
+    }
+
+    @Override
+    protected ServerboundPacketType serverboundFinishConfigurationPacket() {
+        return ServerboundConfigurationPackets1_20_2.FINISH_CONFIGURATION;
+    }
+
+    @Override
+    protected ClientboundPacketType clientboundFinishConfigurationPacket() {
+        return ClientboundConfigurationPackets1_20_3.FINISH_CONFIGURATION;
+    }
+
+    @Override
+    public BackwardsMappings getMappingData() {
+        return MAPPINGS;
+    }
+
+    @Override
+    public BlockItemPacketRewriter1_20_3 getItemRewriter() {
+        return itemRewriter;
+    }
+
+    @Override
+    public EntityPacketRewriter1_20_3 getEntityRewriter() {
+        return entityRewriter;
+    }
+
+    @Override
+    public TranslatableRewriter<ClientboundPackets1_20_3> getTranslatableRewriter() {
+        return translatableRewriter;
+    }
+}